From 041fc1f56618b18923f23a27a6e482ed81a98fe2 Mon Sep 17 00:00:00 2001
From: Ivan Timofeev <timofeev.i.s@gmail.com>
Date: Wed, 30 Nov 2011 21:59:13 +0400
Subject: [PATCH] fdo#34641: move initial focus to printer selection

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

diff --git a/vcl/inc/printdlg.hxx b/vcl/inc/printdlg.hxx
index d162bc07ea8a..4afe1c0134a6 100644
--- a/vcl/inc/printdlg.hxx
+++ b/vcl/inc/printdlg.hxx
@@ -212,9 +212,6 @@ namespace vcl
             void setupLayout();
         };
 
-        OKButton                                maOKButton;
-        CancelButton                            maCancelButton;
-        HelpButton                              maHelpButton;
         PrintPreviewWindow                      maPreviewWindow;
         NumericField                            maPageEdit;
         FixedText                               maNumPagesText;
@@ -228,6 +225,10 @@ namespace vcl
 
         FixedLine                               maButtonLine;
 
+        OKButton                                maOKButton;
+        CancelButton                            maCancelButton;
+        HelpButton                              maHelpButton;
+
         boost::shared_ptr< PrinterController >  maPController;
 
         rtl::OUString                           maPageStr;
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index dc11b255eb6c..546fa49fab70 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -718,9 +718,6 @@ void PrintDialog::OutputOptPage::storeToSettings()
 
 PrintDialog::PrintDialog( Window* i_pParent, const boost::shared_ptr<PrinterController>& i_rController )
     : ModalDialog( i_pParent, VclResId( SV_DLG_PRINT ) )
-    , maOKButton( this, VclResId( SV_PRINT_OK ) )
-    , maCancelButton( this, VclResId( SV_PRINT_CANCEL ) )
-    , maHelpButton( this, VclResId( SV_PRINT_HELP ) )
     , maPreviewWindow( this, VclResId( SV_PRINT_PAGE_PREVIEW ) )
     , maPageEdit( this, VclResId( SV_PRINT_PAGE_EDIT ) )
     , maNumPagesText( this, VclResId( SV_PRINT_PAGE_TXT ) )
@@ -731,6 +728,9 @@ PrintDialog::PrintDialog( Window* i_pParent, const boost::shared_ptr<PrinterCont
     , 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 ) )
+    , maHelpButton( this, VclResId( SV_PRINT_HELP ) )
     , maPController( i_rController )
     , maNoPageStr( String( VclResId( SV_PRINT_NOPAGES ) ) )
     , mnCurPage( 0 )