diff options
| author | Ivan Timofeev <timofeev.i.s@gmail.com> | 2011-11-30 21:59:13 +0400 |
|---|---|---|
| committer | Ivan Timofeev <timofeev.i.s@gmail.com> | 2011-11-30 22:13:12 +0400 |
| commit | 041fc1f56618b18923f23a27a6e482ed81a98fe2 (patch) | |
| tree | 4acb26dfb0cd12196ab9bd947c2d81bc9a89abcd /vcl | |
| parent | dont read gbuild definitions on distclean (diff) | |
| download | core-041fc1f56618b18923f23a27a6e482ed81a98fe2.tar.gz core-041fc1f56618b18923f23a27a6e482ed81a98fe2.zip | |
fdo#34641: move initial focus to printer selection
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/inc/printdlg.hxx | 7 | ||||
| -rw-r--r-- | 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 ) |