vcl119: rebase to DEV300_m101

1 files changed, 25 insertions, 7 deletions

diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index 208e7cacb96d..98e93e748737 100755
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -310,6 +310,7 @@ void PrintDialog::PrintPreviewWindow::Command( const CommandEvent& rEvt )
 
 void PrintDialog::PrintPreviewWindow::setPreview( const GDIMetaFile& i_rNewPreview,
                                                   const Size& i_rOrigSize,
+                                                  const rtl::OUString& i_rPaperName,
                                                   const rtl::OUString& i_rReplacement,
                                                   sal_Int32 i_nDPIX,
                                                   sal_Int32 i_nDPIY,
@@ -344,6 +345,12 @@ void PrintDialog::PrintPreviewWindow::setPreview( const GDIMetaFile& i_rNewPrevi
     String aNumText( rLocWrap.getNum( aLogicPaperSize.Width(), nDigits ) );
     aBuf.append( aNumText );
     aBuf.appendAscii( eUnit == MAP_MM ? "mm" : "in" );
+    if( i_rPaperName.getLength() )
+    {
+        aBuf.appendAscii( " (" );
+        aBuf.append( i_rPaperName );
+        aBuf.append( sal_Unicode(')') );
+    }
     maHorzDim.SetText( aBuf.makeStringAndClear() );
 
     aNumText = rLocWrap.getNum( aLogicPaperSize.Height(), nDigits );
@@ -613,6 +620,7 @@ PrintDialog::JobTabPage::JobTabPage( Window* i_pParent, const ResId& rResId )
     , maCopyCountField( this, VclResId( SV_PRINT_COPYCOUNT_FIELD ) )
     , maCollateBox( this, VclResId( SV_PRINT_COLLATE ) )
     , maCollateImage( this, VclResId( SV_PRINT_COLLATE_IMAGE ) )
+    , maReverseOrderBox( this, VclResId( SV_PRINT_OPT_REVERSE ) )
     , maCollateImg( VclResId( SV_PRINT_COLLATE_IMG ) )
     , maCollateHCImg( VclResId( SV_PRINT_COLLATE_HC_IMG ) )
     , maNoCollateImg( VclResId( SV_PRINT_NOCOLLATE_IMG ) )
@@ -741,7 +749,6 @@ PrintDialog::OutputOptPage::OutputOptPage( Window* i_pParent, const ResId& i_rRe
     , maOptionsLine( this, VclResId( SV_PRINT_OPT_PRINT_FL ) )
     , maToFileBox( this, VclResId( SV_PRINT_OPT_TOFILE ) )
     , maCollateSingleJobsBox( this, VclResId( SV_PRINT_OPT_SINGLEJOBS ) )
-    , maReverseOrderBox( this, VclResId( SV_PRINT_OPT_REVERSE ) )
 {
     FreeResource();
 
@@ -765,7 +772,6 @@ void PrintDialog::OutputOptPage::setupLayout()
     mxOptGroup = xCol;
     xCol->addWindow( &maToFileBox );
     xCol->addWindow( &maCollateSingleJobsBox );
-    xCol->addWindow( &maReverseOrderBox );
 }
 
 void PrintDialog::OutputOptPage::readFromSettings()
@@ -833,7 +839,7 @@ PrintDialog::PrintDialog( Window* i_pParent, const boost::shared_ptr<PrinterCont
     maPageStr = maNumPagesText.GetText();
 
     // init reverse print
-    maOptionsPage.maReverseOrderBox.Check( maPController->getReversePrint() );
+    maJobPage.maReverseOrderBox.Check( maPController->getReversePrint() );
 
     // fill printer listbox
     const std::vector< rtl::OUString >& rQueues( Printer::GetPrinterQueues() );
@@ -906,7 +912,7 @@ PrintDialog::PrintDialog( Window* i_pParent, const boost::shared_ptr<PrinterCont
     maJobPage.maDetailsBtn.SetToggleHdl( LINK( this, PrintDialog, ClickHdl ) );
     maNUpPage.maBorderCB.SetClickHdl( LINK( this, PrintDialog, ClickHdl ) );
     maOptionsPage.maToFileBox.SetToggleHdl( LINK( this, PrintDialog, ClickHdl ) );
-    maOptionsPage.maReverseOrderBox.SetToggleHdl( LINK( this, PrintDialog, ClickHdl ) );
+    maJobPage.maReverseOrderBox.SetToggleHdl( LINK( this, PrintDialog, ClickHdl ) );
     maOptionsPage.maCollateSingleJobsBox.SetToggleHdl( LINK( this, PrintDialog, ClickHdl ) );
     maNUpPage.maPagesBtn.SetToggleHdl( LINK( this, PrintDialog, ClickHdl ) );
 
@@ -1648,6 +1654,16 @@ void PrintDialog::setupOptionalUI()
     {
         maJobPage.mxPrintRange->show( false, false );
         maJobPage.maCopySpacer.Show( sal_False );
+        maJobPage.maReverseOrderBox.Show( sal_False );
+    }
+    else
+    {
+        // add an indent to the current column
+        vcl::Indenter* pIndent = new vcl::Indenter( maJobPage.mxPrintRange.get(), -1 );
+        maJobPage.mxPrintRange->addChild( pIndent );
+        // and create a column inside the indent
+        pIndent->setWindow( &maJobPage.maReverseOrderBox );
+        maJobPage.maReverseOrderBox.Show( sal_True );
     }
 
 #ifdef WNT
@@ -1893,7 +1909,9 @@ void PrintDialog::preparePreview( bool i_bNewPage, bool i_bMayUseCache )
         }
 
         Size aCurPageSize = aPrt->PixelToLogic( aPrt->GetPaperSizePixel(), MapMode( MAP_100TH_MM ) );
-        maPreviewWindow.setPreview( aMtf, aCurPageSize, nPages > 0 ? rtl::OUString() : maNoPageStr,
+        maPreviewWindow.setPreview( aMtf, aCurPageSize,
+                                    aPrt->GetPaperName( false ),
+                                    nPages > 0 ? rtl::OUString() : maNoPageStr,
                                     aPrt->ImplGetDPIX(), aPrt->ImplGetDPIY(),
                                     aPrt->GetPrinterOptions().IsConvertToGreyscales()
                                    );
@@ -2198,9 +2216,9 @@ IMPL_LINK( PrintDialog, ClickHdl, Button*, pButton )
                                  makeAny( sal_Bool(isCollate()) ) );
         checkControlDependencies();
     }
-    else if( pButton == &maOptionsPage.maReverseOrderBox )
+    else if( pButton == &maJobPage.maReverseOrderBox )
     {
-        sal_Bool bChecked = maOptionsPage.maReverseOrderBox.IsChecked();
+        sal_Bool bChecked = maJobPage.maReverseOrderBox.IsChecked();
         maPController->setReversePrint( bChecked );
         maPController->setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintReverse" ) ),
                                  makeAny( bChecked ) );