fix crash - clone the columns

3nids · 3nids · commit e7fe141b2568 · 2020-05-06T14:46:45.000+02:00
diff --git a/src/core/layout/qgscompositionconverter.cpp b/src/core/layout/qgscompositionconverter.cpp
@@ -1469,7 +1469,9 @@ bool QgsCompositionConverter::readTableXml( QgsLayoutItemAttributeTable *layoutI
 
       // sorting columns are now (QGIS 3.14+) handled in a dedicated list
       Q_NOWARN_DEPRECATED_PUSH
-      std::copy_if( layoutItem->mColumns.begin(), layoutItem->mColumns.end(), std::back_inserter( layoutItem->mSortColumns ), []( QgsLayoutTableColumn * col ) {return col->sortByRank() > 0;} );
+      for ( QgsLayoutTableColumn *col : qgis::as_const( layoutItem->mColumns ) )
+        if ( col->sortByRank() > 0 )
+          layoutItem->mSortColumns.append( col->clone() );
       std::sort( layoutItem->mSortColumns.begin(), layoutItem->mSortColumns.end(), []( QgsLayoutTableColumn * a, QgsLayoutTableColumn * b ) {return a->sortByRank() < b->sortByRank();} );
       Q_NOWARN_DEPRECATED_POP
     }
diff --git a/src/core/layout/qgslayouttable.cpp b/src/core/layout/qgslayouttable.cpp
@@ -196,7 +196,9 @@ bool QgsLayoutTable::readPropertiesFromElement( const QDomElement &itemElem, con
   {
     // backward compatibility for QGIS < 3.14
     Q_NOWARN_DEPRECATED_PUSH
-    std::copy_if( mColumns.begin(), mColumns.end(), std::back_inserter( mSortColumns ), []( QgsLayoutTableColumn * col ) {return col->sortByRank() > 0;} );
+    for ( QgsLayoutTableColumn *col : qgis::as_const( mColumns ) )
+      if ( col->sortByRank() > 0 )
+        mSortColumns.append( col->clone() );
     std::sort( mSortColumns.begin(), mSortColumns.end(), []( QgsLayoutTableColumn * a, QgsLayoutTableColumn * b ) {return a->sortByRank() < b->sortByRank();} );
     Q_NOWARN_DEPRECATED_POP
   }

Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,9 @@ bool QgsLayoutTable::readPropertiesFromElement( const QDomElement &itemElem, con`
`196`	`196`	`{`
`197`	`197`	`// backward compatibility for QGIS < 3.14`
`198`	`198`	`Q_NOWARN_DEPRECATED_PUSH`
`199`		`- std::copy_if( mColumns.begin(), mColumns.end(), std::back_inserter( mSortColumns ), []( QgsLayoutTableColumn * col ) {return col->sortByRank() > 0;} );`
	`199`	`+ for ( QgsLayoutTableColumn *col : qgis::as_const( mColumns ) )`
	`200`	`+ if ( col->sortByRank() > 0 )`
	`201`	`+ mSortColumns.append( col->clone() );`
`200`	`202`	`std::sort( mSortColumns.begin(), mSortColumns.end(), []( QgsLayoutTableColumn * a, QgsLayoutTableColumn * b ) {return a->sortByRank() < b->sortByRank();} );`
`201`	`203`	`Q_NOWARN_DEPRECATED_POP`
`202`	`204`	`}`