[composer] Fix crash on extend mode for multiframes (Sponsored by

City of Uster, Switzerland)
qgis · Sep 17, 2014 · a0db663 · a0db663
1 parent 3ca416a
commit a0db663
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 2 deletions.
diff --git a/src/app/composer/qgscomposer.cpp b/src/app/composer/qgscomposer.cpp
@@ -3261,7 +3261,7 @@ void QgsComposer::deleteItem( QgsComposerItem* item )
   }
 
   //the item itself is not deleted here (usually, this is done in the destructor of QgsAddRemoveItemCommand)
-  delete( it.value() );
+  it.value()->deleteLater();
   mItemWidgetMap.remove( it.key() );
 
   QgsComposerMap* map = dynamic_cast<QgsComposerMap*>( item );

diff --git a/src/app/composer/qgscomposerattributetablewidget.cpp b/src/app/composer/qgscomposerattributetablewidget.cpp
@@ -43,7 +43,6 @@ QgsComposerAttributeTableWidget::QgsComposerAttributeTableWidget( QgsComposerAtt
 
   mResizeModeComboBox->addItem( tr( "Use existing frames" ), QgsComposerMultiFrame::UseExistingFrames );
   mResizeModeComboBox->addItem( tr( "Extend to next page" ), QgsComposerMultiFrame::ExtendToNextPage );
-  mResizeModeComboBox->addItem( tr( "Repeat on every page" ), QgsComposerMultiFrame::RepeatOnEveryPage );
   mResizeModeComboBox->addItem( tr( "Repeat until finished" ), QgsComposerMultiFrame::RepeatUntilFinished );
 
   mLayerComboBox->setFilters( QgsMapLayerProxyModel::VectorLayer );

diff --git a/src/core/composer/qgscomposermultiframe.cpp b/src/core/composer/qgscomposermultiframe.cpp
@@ -233,6 +233,7 @@ void QgsComposerMultiFrame::handleFrameRemoval( QgsComposerItem* item )
   {
     return;
   }
+
   mFrameItems.removeAt( index );
   if ( mFrameItems.size() > 0 )
   {

diff --git a/src/core/composer/qgscomposertablev2.cpp b/src/core/composer/qgscomposertablev2.cpp
@@ -32,6 +32,12 @@ QgsComposerTableV2::QgsComposerTableV2( QgsComposition *composition, bool create
     , mGridStrokeWidth( 0.5 )
     , mGridColor( Qt::black )
 {
+
+  if ( mComposition )
+  {
+    QObject::connect( mComposition, SIGNAL( itemRemoved( QgsComposerItem* ) ), this, SLOT( handleFrameRemoval( QgsComposerItem* ) ) );
+  }
+
   //get default composer font from settings
   QSettings settings;
   QString defaultFontString = settings.value( "/Composer/defaultFont" ).toString();

diff --git a/tests/src/core/testqgscomposertablev2.cpp b/tests/src/core/testqgscomposertablev2.cpp
@@ -46,6 +46,8 @@ class TestQgsComposerTableV2: public QObject
     void attributeTableVisibleOnly(); //test displaying only visible attributes
     void attributeTableRender(); //test rendering attribute table
 
+    void attributeTableExtend();
+
   private:
     QgsComposition* mComposition;
     QgsComposerMap* mComposerMap;
@@ -298,6 +300,23 @@ void TestQgsComposerTableV2::attributeTableRender()
   QVERIFY( result );
 }
 
+void TestQgsComposerTableV2::attributeTableExtend()
+{
+  mComposerAttributeTable->removeFrame( 1 );
+
+  //force auto creation of some new frames
+  mComposerAttributeTable->setResizeMode( QgsComposerMultiFrame::ExtendToNextPage );
+
+  mComposition->setSelectedItem( mComposerAttributeTable->frame( 1 ) );
+
+  QgsCompositionChecker checker( "composerattributetable_render", mComposition );
+
+  //now auto remove extra created frames
+  mComposerAttributeTable->setMaximumNumberOfFeatures( 1 );
+  bool result = checker.testComposition( mReport, 1 );
+
+}
+
 QTEST_MAIN( TestQgsComposerTableV2 )
 #include "moc_testqgscomposertablev2.cxx"