[Libreoffice-commits] .: vcl/inc vcl/source

[Ivan Timofeev]

 vcl/inc/printdlg.hxx           |   10 +++++-----
 vcl/source/window/printdlg.cxx |    8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 858def93c81ab4c94fdf191b7495eeb01a9c3d2f
Author: Ivan Timofeev <timofeev.i.s at gmail.com>
Date:   Wed Nov 30 22:27:50 2011 +0400

    fix previous commit, really move initial focus to printer selection

diff --git a/vcl/inc/printdlg.hxx b/vcl/inc/printdlg.hxx
index 4afe1c0..7aea96b 100644
--- a/vcl/inc/printdlg.hxx
+++ b/vcl/inc/printdlg.hxx
@@ -212,17 +212,17 @@ namespace vcl
             void setupLayout();
         };
 
+        TabControl                              maTabCtrl;
+        NUpTabPage                              maNUpPage;
+        JobTabPage                              maJobPage;
+        OutputOptPage                           maOptionsPage;
+
         PrintPreviewWindow                      maPreviewWindow;
         NumericField                            maPageEdit;
         FixedText                               maNumPagesText;
         PushButton                              maBackwardBtn;
         PushButton                              maForwardBtn;
 
-        TabControl                              maTabCtrl;
-        NUpTabPage                              maNUpPage;
-        JobTabPage                              maJobPage;
-        OutputOptPage                           maOptionsPage;
-
         FixedLine                               maButtonLine;
 
         OKButton                                maOKButton;
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index 546fa49..6119555 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -718,15 +718,15 @@ void PrintDialog::OutputOptPage::storeToSettings()
 
 PrintDialog::PrintDialog( Window* i_pParent, const boost::shared_ptr<PrinterController>& i_rController )
     : ModalDialog( i_pParent, VclResId( SV_DLG_PRINT ) )
+    , maTabCtrl( this, VclResId( SV_PRINT_TABCTRL ) )
+    , maNUpPage( &maTabCtrl, VclResId( SV_PRINT_TAB_NUP ) )
+    , maJobPage( &maTabCtrl, VclResId( SV_PRINT_TAB_JOB ) )
+    , maOptionsPage( &maTabCtrl, VclResId( SV_PRINT_TAB_OPT ) )
     , maPreviewWindow( this, VclResId( SV_PRINT_PAGE_PREVIEW ) )
     , maPageEdit( this, VclResId( SV_PRINT_PAGE_EDIT ) )
     , maNumPagesText( this, VclResId( SV_PRINT_PAGE_TXT ) )
     , maBackwardBtn( this, VclResId( SV_PRINT_PAGE_BACKWARD ) )
     , maForwardBtn( this, VclResId( SV_PRINT_PAGE_FORWARD ) )
-    , maTabCtrl( this, VclResId( SV_PRINT_TABCTRL ) )
-    , maNUpPage( &maTabCtrl, VclResId( SV_PRINT_TAB_NUP ) )
-    , maJobPage( &maTabCtrl, VclResId( SV_PRINT_TAB_JOB ) )
-    , maOptionsPage( &maTabCtrl, VclResId( SV_PRINT_TAB_OPT ) )
     , maButtonLine( this, VclResId( SV_PRINT_BUTTONLINE ) )
     , maOKButton( this, VclResId( SV_PRINT_OK ) )
     , maCancelButton( this, VclResId( SV_PRINT_CANCEL ) )