Cleanup

Author: mhugent

src/app/composer/qgscomposer.cpp

@@ -1185,7 +1185,7 @@ void QgsComposer::writeXML( QDomNode& parentNode, QDomDocument& doc )
   QDomElement composerElem = doc.createElement( "Composer" );
   composerElem.setAttribute( "title", mTitle );
 
-  //change preview mode of minimised / hidden maps (show contents only on demand)
+  //change preview mode of minimised / hidden maps before saving XML (show contents only on demand)
   QMap< QgsComposerMap*, QgsComposerMap::PreviewMode >::iterator mapIt = mMapsToRestore.begin();
   for ( ; mapIt != mMapsToRestore.end(); ++mapIt )
   {

src/core/composer/qgscomposermap.cpp

@@ -390,10 +390,7 @@ void QgsComposerMap::resize( double dx, double dy )
   QRectF currentRect = rect();
   QRectF newSceneRect = QRectF( transform().dx(), transform().dy(), currentRect.width() + dx, currentRect.height() + dy );
   setSceneRect( newSceneRect );
-  if ( mPreviewMode != QgsComposerMap::Rectangle )
-  {
-    cache();
-  }
+  updateItem();
 }
 
 void QgsComposerMap::moveContent( double dx, double dy )
@@ -513,10 +510,7 @@ void QgsComposerMap::setNewExtent( const QgsRectangle& extent )
   double newHeight = currentRect.width() * extent.height() / extent.width();
 
   setSceneRect( QRectF( transform().dx(), transform().dy(), currentRect.width(), newHeight ) );
-  if ( mPreviewMode != QgsComposerMap::Rectangle )
-  {
-    cache();
-  }
+  updateItem();
 }
 
 void QgsComposerMap::setNewScale( double scaleDenominator )