Fix for #8705, duplication of composer should inherit custom paper size

dakcarto · dakcarto · commit 121d76e2a7ff · 2013-09-28T10:26:40.000-06:00
diff --git a/src/app/composer/qgscompositionwidget.cpp b/src/app/composer/qgscompositionwidget.cpp
@@ -369,6 +369,7 @@ void QgsCompositionWidget::displayCompositionWidthHeight()
   setSize( mPaperHeightDoubleSpinBox, paperHeight );
 
   //set orientation
+  mPaperOrientationComboBox->blockSignals( true );
   if ( paperWidth > paperHeight )
   {
     mPaperOrientationComboBox->setCurrentIndex( mPaperOrientationComboBox->findText( tr( "Landscape" ) ) );
@@ -377,6 +378,7 @@ void QgsCompositionWidget::displayCompositionWidthHeight()
   {
     mPaperOrientationComboBox->setCurrentIndex( mPaperOrientationComboBox->findText( tr( "Portrait" ) ) );
   }
+  mPaperOrientationComboBox->blockSignals( false );
 
   //set paper name
   bool found = false;

Original file line number	Diff line number	Diff line change
`@@ -369,6 +369,7 @@ void QgsCompositionWidget::displayCompositionWidthHeight()`
`369`	`369`	`setSize( mPaperHeightDoubleSpinBox, paperHeight );`
`370`	`370`
`371`	`371`	`//set orientation`
	`372`	`+ mPaperOrientationComboBox->blockSignals( true );`
`372`	`373`	`if ( paperWidth > paperHeight )`
`373`	`374`	`{`
`374`	`375`	`mPaperOrientationComboBox->setCurrentIndex( mPaperOrientationComboBox->findText( tr( "Landscape" ) ) );`
`@@ -377,6 +378,7 @@ void QgsCompositionWidget::displayCompositionWidthHeight()`
`377`	`378`	`{`
`378`	`379`	`mPaperOrientationComboBox->setCurrentIndex( mPaperOrientationComboBox->findText( tr( "Portrait" ) ) );`
`379`	`380`	`}`
	`381`	`+ mPaperOrientationComboBox->blockSignals( false );`
`380`	`382`
`381`	`383`	`//set paper name`
`382`	`384`	`bool found = false;`