[QGIS Commit] r10543 - branches/Version-1_0/src/core/composer

[svn_qgis at osgeo.org]

Author: mhugent
Date: 2009-04-12 05:37:23 -0400 (Sun, 12 Apr 2009)
New Revision: 10543

Modified:
   branches/Version-1_0/src/core/composer/qgscomposeritem.cpp
Log:
Backport for 1.0: make sure all the rubber band frames are deleted in composer. Fixes bug #1573

Modified: branches/Version-1_0/src/core/composer/qgscomposeritem.cpp
===================================================================
--- branches/Version-1_0/src/core/composer/qgscomposeritem.cpp	2009-04-12 07:27:45 UTC (rev 10542)
+++ branches/Version-1_0/src/core/composer/qgscomposeritem.cpp	2009-04-12 09:37:23 UTC (rev 10543)
@@ -252,6 +252,13 @@
   mLastMouseEventPos = event->lastPos();
   mCurrentMouseMoveAction = mouseMoveActionForPosition( event->pos() );
 
+  //remove the old rubber band item if it is still there
+  if ( mBoundingResizeRectangle )
+  {
+    scene()->removeItem( mBoundingResizeRectangle );
+    delete mBoundingResizeRectangle;
+    mBoundingResizeRectangle = 0;
+  }
   //create and show bounding rectangle
   mBoundingResizeRectangle = new QGraphicsRectItem( 0 );
   scene()->addItem( mBoundingResizeRectangle );