Fix bug in case of embeding from other projects with relative path

mhugent · mhugent · commit 16e872f79fc9 · 2011-06-20T09:19:42.000+02:00
diff --git a/src/app/legend/qgslegend.cpp b/src/app/legend/qgslegend.cpp
@@ -1055,7 +1055,7 @@ bool QgsLegend::writeXML( QList<QTreeWidgetItem *> items, QDomNode &node, QDomDo
       if ( embedIt != mEmbeddedGroups.constEnd() )
       {
         legendgroupnode.setAttribute( "embedded", 1 );
-        legendgroupnode.setAttribute( "project", embedIt.value() );
+        legendgroupnode.setAttribute( "project", QgsProject::instance()->writePath( embedIt.value() ) );
       }
       else
       {
@@ -1174,7 +1174,7 @@ bool QgsLegend::readXML( QgsLegendGroup *parent, const QDomNode &node )
       QgsLegendGroup* theGroup = 0;
       if ( childelem.attribute( "embedded" ) == "1" )
       {
-        theGroup = addEmbeddedGroup( name, childelem.attribute( "project" ) );
+        theGroup = addEmbeddedGroup( name, QgsProject::instance()->readPath( childelem.attribute( "project" ) ) );
       }
       else
       {

Original file line number	Diff line number	Diff line change
`@@ -1055,7 +1055,7 @@ bool QgsLegend::writeXML( QList<QTreeWidgetItem *> items, QDomNode &node, QDomDo`
`1055`	`1055`	`if ( embedIt != mEmbeddedGroups.constEnd() )`
`1056`	`1056`	`{`
`1057`	`1057`	`legendgroupnode.setAttribute( "embedded", 1 );`
`1058`		`- legendgroupnode.setAttribute( "project", embedIt.value() );`
	`1058`	`+ legendgroupnode.setAttribute( "project", QgsProject::instance()->writePath( embedIt.value() ) );`
`1059`	`1059`	`}`
`1060`	`1060`	`else`
`1061`	`1061`	`{`
`@@ -1174,7 +1174,7 @@ bool QgsLegend::readXML( QgsLegendGroup *parent, const QDomNode &node )`
`1174`	`1174`	`QgsLegendGroup* theGroup = 0;`
`1175`	`1175`	`if ( childelem.attribute( "embedded" ) == "1" )`
`1176`	`1176`	`{`
`1177`		`- theGroup = addEmbeddedGroup( name, childelem.attribute( "project" ) );`
	`1177`	`+ theGroup = addEmbeddedGroup( name, QgsProject::instance()->readPath( childelem.attribute( "project" ) ) );`
`1178`	`1178`	`}`
`1179`	`1179`	`else`
`1180`	`1180`	`{`