[layouts] Handle duplicated composer names when upgrading 2.x

nyalldawson · nyalldawson · commit b8880d46cd96 · 2018-01-24T17:50:31.000+11:00
projects Somehow 2.x projects could end up with compositions with duplicate names. This is strictly forbidden in 3.x, so we autogenerate a new unique name if we encounter any duplicate composer names when upgrading a 2.x project. Fixes #17924
diff --git a/src/core/layout/qgslayoutmanager.cpp b/src/core/layout/qgslayoutmanager.cpp
@@ -158,6 +158,31 @@ bool QgsLayoutManager::readXml( const QDomElement &element, const QDomDocument &
       {
         if ( l->name().isEmpty() )
           l->setName( legacyTitle );
+
+        // some 2.x projects could end in a state where they had duplicated layout names. This is strictly forbidden in 3.x
+        // so check for duplicate name in layouts already added
+        int id = 2;
+        bool isDuplicateName = false;
+        QString originalName = l->name();
+        do
+        {
+          isDuplicateName = false;
+          for ( QgsMasterLayoutInterface *layout : qgis::as_const( mLayouts ) )
+          {
+            if ( l->name() == layout->name() )
+            {
+              isDuplicateName = true;
+              break;
+            }
+          }
+          if ( isDuplicateName )
+          {
+            l->setName( QStringLiteral( "%1 %2" ).arg( originalName ).arg( id ) );
+            id++;
+          }
+        }
+        while ( isDuplicateName );
+
         bool added = addLayout( l.release() );
         result = added && result;
       }
