[QGIS Commit] r14082 - trunk/qgis/src/app/composer

[svn_qgis at osgeo.org]

Author: mhugent
Date: 2010-08-14 18:50:01 +0000 (Sat, 14 Aug 2010)
New Revision: 14082

Modified:
   trunk/qgis/src/app/composer/qgscomposer.cpp
Log:
Avoid overwriting of printing page with width/height from composition

Modified: trunk/qgis/src/app/composer/qgscomposer.cpp
===================================================================
--- trunk/qgis/src/app/composer/qgscomposer.cpp	2010-08-14 14:47:48 UTC (rev 14081)
+++ trunk/qgis/src/app/composer/qgscomposer.cpp	2010-08-14 18:50:01 UTC (rev 14082)
@@ -495,19 +495,7 @@
 
 void QgsComposer::on_mActionPrint_triggered()
 {
-  //QPrinter printer;
-  if ( mComposition )
-  {
-    if ( mComposition->paperWidth() >= mComposition->paperHeight() )
-    {
-      mPrinter.setOrientation( QPrinter::Landscape );
-    }
-    else
-    {
-      mPrinter.setOrientation( QPrinter::Portrait );
-    }
-  }
-  mPrinter.setPaperSize( QSizeF( mComposition->paperWidth(), mComposition->paperHeight() ), QPrinter::Millimeter );
+  //orientation and page size are already set to QPrinter in the page setup dialog
   QPrintDialog printDialog( &mPrinter, 0 );
   if ( printDialog.exec() != QDialog::Accepted )
   {