Safer generation of ids for composer map

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@15040 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Jan 14, 2011 · ee85b86 · ee85b86
1 parent 5153c85
commit ee85b86
Showing 1 changed file with 14 additions and 1 deletion.
diff --git a/src/core/composer/qgscomposermap.cpp b/src/core/composer/qgscomposermap.cpp
@@ -47,7 +47,20 @@ QgsComposerMap::QgsComposerMap( QgsComposition *composition, int x, int y, int w
     mCrossLength( 3 ), mMapCanvas( 0 ), mDrawCanvasItems( true )
 {
   mComposition = composition;
-  mId = mComposition->composerMapItems().size();
+
+  //mId = mComposition->composerMapItems().size();
+  int maxId = -1;
+  QList<const QgsComposerMap*> mapList = mComposition->composerMapItems();
+  QList<const QgsComposerMap*>::const_iterator mapIt = mapList.constBegin();
+  for ( ; mapIt != mapList.constEnd(); ++mapIt )
+  {
+    if (( *mapIt )->id() > maxId )
+    {
+      maxId = ( *mapIt )->id();
+    }
+  }
+  mId = maxId + 1;
+
   mMapRenderer = mComposition->mapRenderer();
   mPreviewMode = QgsComposerMap::Rectangle;
   mCurrentRectangle = rect();