[QGIS Commit] r11733 - trunk/qgis/src/core/composer

[svn_qgis at osgeo.org]

Author: mhugent
Date: 2009-09-29 10:01:59 -0400 (Tue, 29 Sep 2009)
New Revision: 11733

Modified:
   trunk/qgis/src/core/composer/qgscomposerpicture.cpp
Log:
Save composer pictures absolute / relative depending on project setting

Modified: trunk/qgis/src/core/composer/qgscomposerpicture.cpp
===================================================================
--- trunk/qgis/src/core/composer/qgscomposerpicture.cpp	2009-09-29 09:06:32 UTC (rev 11732)
+++ trunk/qgis/src/core/composer/qgscomposerpicture.cpp	2009-09-29 14:01:59 UTC (rev 11733)
@@ -17,6 +17,7 @@
 /* $Id$ */
 
 #include "qgscomposerpicture.h"
+#include "qgsproject.h"
 #include <QDomDocument>
 #include <QDomElement>
 #include <QFileInfo>
@@ -209,7 +210,7 @@
     return false;
   }
   QDomElement composerPictureElem = doc.createElement( "ComposerPicture" );
-  composerPictureElem.setAttribute( "file", mSourceFile.fileName() );
+  composerPictureElem.setAttribute( "file", QgsProject::instance()->writePath( mSourceFile.fileName() ) );
   composerPictureElem.setAttribute( "rotation", QString::number( mRotation ) );
   _writeXML( composerPictureElem, doc );
   elem.appendChild( composerPictureElem );
@@ -233,7 +234,7 @@
   mDefaultSvgSize = QSize( 0, 0 );
   mCachedDpi = 0;
 
-  QString fileName = itemElem.attribute( "file" );
+  QString fileName = QgsProject::instance()->readPath( itemElem.attribute( "file" ) );
   setPictureFile( fileName );
 
   mRotation = itemElem.attribute( "rotation" ).toDouble();