From e5cc306522942293b823e331a7544b568afba91f Mon Sep 17 00:00:00 2001 From: "Philipp Lohmann [pl]" Date: Tue, 2 Nov 2010 17:03:34 +0100 Subject: vcl117: #i115056# change direct help texts to help ids to allow for proper help content --- sd/source/ui/view/DocumentRenderer.cxx | 48 ++++++++++++----- sd/source/ui/view/DocumentRenderer.hrc | 15 ------ sd/source/ui/view/DocumentRenderer.src | 94 ---------------------------------- 3 files changed, 34 insertions(+), 123 deletions(-) mode change 100644 => 100755 sd/source/ui/view/DocumentRenderer.hrc (limited to 'sd') diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx index ddbf5cfc4388..5b47bd699054 100755 --- a/sd/source/ui/view/DocumentRenderer.cxx +++ b/sd/source/ui/view/DocumentRenderer.cxx @@ -439,6 +439,7 @@ namespace { rtl::OUString() ) ); + uno::Sequence< rtl::OUString > aHelpIds; if( mbImpress ) { vcl::PrinterOptionsHelper::UIControlOptions aPrintOpt; @@ -449,9 +450,11 @@ namespace { aPrintOpt ) ); + aHelpIds.realloc( 1 ); + aHelpIds[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PageContentType:ListBox" ) ); AddDialogControl( vcl::PrinterOptionsHelper::getChoiceControlOpt( String( SdResId( _STR_IMPRESS_PRINT_UI_CONTENT ) ), - CreateChoice(_STR_IMPRESS_PRINT_UI_CONTENT_HELP), + aHelpIds, OUString( RTL_CONSTASCII_USTRINGPARAM( "PageContentType" ) ), CreateChoice(_STR_IMPRESS_PRINT_UI_CONTENT_CHOICES), 0, @@ -459,11 +462,12 @@ namespace { ) ); + aHelpIds[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:SlidesPerPage:ListBox" ) ); vcl::PrinterOptionsHelper::UIControlOptions aContentOpt( OUString( RTL_CONSTASCII_USTRINGPARAM( "PageContentType" ) ), 1 ); AddDialogControl( vcl::PrinterOptionsHelper::getChoiceControlOpt( String( SdResId( _STR_IMPRESS_PRINT_UI_SLIDESPERPAGE ) ), - CreateChoice(_STR_IMPRESS_PRINT_UI_SLIDESPERPAGE_CHOICES_HELP), + aHelpIds, OUString( RTL_CONSTASCII_USTRINGPARAM( "SlidesPerPage" ) ), GetSlidesPerPageSequence(), 0, @@ -473,11 +477,12 @@ namespace { ) ); + aHelpIds[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:SlidesPerPageOrder:ListBox" ) ); vcl::PrinterOptionsHelper::UIControlOptions aSlidesPerPageOpt( OUString( RTL_CONSTASCII_USTRINGPARAM( "SlidesPerPage" ) ), -1, sal_True ); AddDialogControl( vcl::PrinterOptionsHelper::getChoiceControlOpt( String( SdResId( _STR_IMPRESS_PRINT_UI_ORDER ) ), - CreateChoice(_STR_IMPRESS_PRINT_UI_ORDER_CHOICES_HELP), + aHelpIds, OUString( RTL_CONSTASCII_USTRINGPARAM( "SlidesPerPageOrder" ) ), CreateChoice(_STR_IMPRESS_PRINT_UI_ORDER_CHOICES), 0, @@ -495,7 +500,7 @@ namespace { { AddDialogControl( vcl::PrinterOptionsHelper::getBoolControlOpt( String( SdResId(_STR_IMPRESS_PRINT_UI_IS_PRINT_NAME) ), - String( SdResId(_STR_IMPRESS_PRINT_UI_IS_PRINT_NAME_HELP) ), + OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:IsPrintName:CheckBox" ) ), OUString( RTL_CONSTASCII_USTRINGPARAM( "IsPrintName" ) ), sal_False ) @@ -505,7 +510,7 @@ namespace { { AddDialogControl( vcl::PrinterOptionsHelper::getBoolControlOpt( String( SdResId(_STR_DRAW_PRINT_UI_IS_PRINT_NAME) ), - String( SdResId(_STR_DRAW_PRINT_UI_IS_PRINT_NAME_HELP) ), + OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:IsPrintName:CheckBox" ) ), OUString( RTL_CONSTASCII_USTRINGPARAM( "IsPrintName" ) ), sal_False ) @@ -514,7 +519,7 @@ namespace { AddDialogControl( vcl::PrinterOptionsHelper::getBoolControlOpt( String( SdResId(_STR_IMPRESS_PRINT_UI_IS_PRINT_DATE) ), - String( SdResId(_STR_IMPRESS_PRINT_UI_IS_PRINT_DATE_HELP) ), + OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:IsPrintDateTime:CheckBox" ) ), OUString( RTL_CONSTASCII_USTRINGPARAM( "IsPrintDateTime" ) ), sal_False ) @@ -524,7 +529,7 @@ namespace { { AddDialogControl( vcl::PrinterOptionsHelper::getBoolControlOpt( String( SdResId(_STR_IMPRESS_PRINT_UI_IS_PRINT_HIDDEN) ), - String( SdResId(_STR_IMPRESS_PRINT_UI_IS_PRINT_HIDDEN_HELP) ), + OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:IsPrintHidden:CheckBox" ) ), OUString( RTL_CONSTASCII_USTRINGPARAM( "IsPrintHidden" ) ), sal_False ) @@ -534,9 +539,13 @@ namespace { AddDialogControl( vcl::PrinterOptionsHelper::getSubgroupControlOpt( String( SdResId(_STR_IMPRESS_PRINT_UI_QUALITY) ), rtl::OUString() ) ); + aHelpIds.realloc( 3 ); + aHelpIds[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:Quality:RadioButton:0" ) ); + aHelpIds[1] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:Quality:RadioButton:1" ) ); + aHelpIds[2] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:Quality:RadioButton:2" ) ); AddDialogControl( vcl::PrinterOptionsHelper::getChoiceControlOpt( rtl::OUString(), - CreateChoice(_STR_IMPRESS_PRINT_UI_QUALITY_CHOICES_HELP), + aHelpIds, OUString( RTL_CONSTASCII_USTRINGPARAM( "Quality" ) ), CreateChoice(_STR_IMPRESS_PRINT_UI_QUALITY_CHOICES), 0 @@ -546,6 +555,11 @@ namespace { AddDialogControl( vcl::PrinterOptionsHelper::getSubgroupControlOpt( String( SdResId(_STR_IMPRESS_PRINT_UI_PAGE_OPTIONS) ), rtl::OUString() ) ); + aHelpIds.realloc( 4 ); + aHelpIds[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PageOptions:RadioButton:0" ) ); + aHelpIds[1] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PageOptions:RadioButton:1" ) ); + aHelpIds[2] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PageOptions:RadioButton:2" ) ); + aHelpIds[3] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PageOptions:RadioButton:3" ) ); if( mbImpress ) { // FIXME: additional dependency on PrintProspect = false @@ -553,7 +567,7 @@ namespace { aPageOptionsOpt( OUString( RTL_CONSTASCII_USTRINGPARAM( "PageContentType" ) ), 0 ); AddDialogControl( vcl::PrinterOptionsHelper::getChoiceControlOpt( rtl::OUString(), - CreateChoice(_STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES_HELP), + aHelpIds, OUString( RTL_CONSTASCII_USTRINGPARAM( "PageOptions" ) ), CreateChoice(_STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES), 0, @@ -569,7 +583,7 @@ namespace { aPageOptionsOpt( OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintProspect" ) ), sal_False ); AddDialogControl( vcl::PrinterOptionsHelper::getChoiceControlOpt( rtl::OUString(), - CreateChoice(_STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES_HELP), + aHelpIds, OUString( RTL_CONSTASCII_USTRINGPARAM( "PageOptions" ) ), CreateChoice(_STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES_DRAW), 0, @@ -589,7 +603,7 @@ namespace { // brochure printing AddDialogControl( vcl::PrinterOptionsHelper::getBoolControlOpt( String( SdResId(_STR_IMPRESS_PRINT_UI_BROCHURE) ), - String( SdResId(_STR_IMPRESS_PRINT_UI_BROCHURE_HELP) ), + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PrintProspect:CheckBox" ) ), OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintProspect" ) ), sal_False, aBrochureOpt @@ -599,9 +613,11 @@ namespace { vcl::PrinterOptionsHelper::UIControlOptions aIncludeOpt( OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintProspect" ) ), -1, sal_False ); aIncludeOpt.maGroupHint = OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutPage" ) ); + aHelpIds.realloc( 1 ); + aHelpIds[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PrintProspectInclude:ListBox" ) ); AddDialogControl( vcl::PrinterOptionsHelper::getChoiceControlOpt( String( SdResId(_STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE) ), - CreateChoice(_STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE_LIST_HELP), + aHelpIds, OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintProspectInclude" ) ), CreateChoice(_STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE_LIST), 0, @@ -616,7 +632,7 @@ namespace { aPaperTrayOpt.maGroupHint = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OptionsPageOptGroup" ) ); AddDialogControl( vcl::PrinterOptionsHelper::getBoolControlOpt( String( SdResId(_STR_IMPRESS_PRINT_UI_PAPER_TRAY) ), - String( SdResId(_STR_IMPRESS_PRINT_UI_PAPER_TRAY_HELP) ), + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PrintPaperFromSetup:CheckBox" ) ), OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintPaperFromSetup" ) ), sal_False, aPaperTrayOpt @@ -634,8 +650,12 @@ namespace { // create a choice for the content to create rtl::OUString aPrintRangeName( RTL_CONSTASCII_USTRINGPARAM( "PrintContent" ) ); + aHelpIds.realloc( 3 ); + aHelpIds[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:0" ) ); + aHelpIds[1] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:1" ) ); + aHelpIds[2] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:2" ) ); AddDialogControl( vcl::PrinterOptionsHelper::getChoiceControlOpt( rtl::OUString(), - CreateChoice(_STR_IMPRESS_PRINT_UI_PAGE_RANGE_CHOICE_HELP), + aHelpIds, aPrintRangeName, CreateChoice(mbImpress ? _STR_IMPRESS_PRINT_UI_PAGE_RANGE_CHOICE diff --git a/sd/source/ui/view/DocumentRenderer.hrc b/sd/source/ui/view/DocumentRenderer.hrc old mode 100644 new mode 100755 index 3dd57429dd13..aad07d909def --- a/sd/source/ui/view/DocumentRenderer.hrc +++ b/sd/source/ui/view/DocumentRenderer.hrc @@ -30,48 +30,33 @@ #define _STR_IMPRESS_PRINT_UI_PRINT_CONTENT 2 #define _STR_IMPRESS_PRINT_UI_PRINT_GROUP 3 #define _STR_IMPRESS_PRINT_UI_CONTENT 4 -#define _STR_IMPRESS_PRINT_UI_CONTENT_HELP 5 #define _STR_IMPRESS_PRINT_UI_CONTENT_CHOICES 6 #define _STR_IMPRESS_PRINT_UI_SLIDESPERPAGE 7 #define _STR_IMPRESS_PRINT_UI_SLIDESPERPAGE_CHOICES 8 -#define _STR_IMPRESS_PRINT_UI_SLIDESPERPAGE_CHOICES_HELP 9 #define _STR_IMPRESS_PRINT_UI_ORDER 10 #define _STR_IMPRESS_PRINT_UI_ORDER_CHOICES 11 -#define _STR_IMPRESS_PRINT_UI_ORDER_CHOICES_HELP 12 #define _STR_IMPRESS_PRINT_UI_INCLUDE_CONTENT 13 #define _STR_IMPRESS_PRINT_UI_IS_PRINT_NAME 14 -#define _STR_IMPRESS_PRINT_UI_IS_PRINT_NAME_HELP 15 #define _STR_IMPRESS_PRINT_UI_IS_PRINT_DATE 16 -#define _STR_IMPRESS_PRINT_UI_IS_PRINT_DATE_HELP 17 #define _STR_IMPRESS_PRINT_UI_IS_PRINT_TIME 18 -#define _STR_IMPRESS_PRINT_UI_IS_PRINT_TIME_HELP 19 #define _STR_IMPRESS_PRINT_UI_IS_PRINT_HIDDEN 20 -#define _STR_IMPRESS_PRINT_UI_IS_PRINT_HIDDEN_HELP 21 #define _STR_IMPRESS_PRINT_UI_OUTPUT_OPTIONS_GROUP 22 #define _STR_IMPRESS_PRINT_UI_QUALITY 23 #define _STR_IMPRESS_PRINT_UI_QUALITY_CHOICES 24 -#define _STR_IMPRESS_PRINT_UI_QUALITY_CHOICES_HELP 25 #define _STR_IMPRESS_PRINT_UI_PAGE_OPTIONS 26 #define _STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES 27 #define _STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES_DRAW 28 -#define _STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES_HELP 29 #define _STR_IMPRESS_PRINT_UI_BROCHURE 30 -#define _STR_IMPRESS_PRINT_UI_BROCHURE_HELP 31 #define _STR_IMPRESS_PRINT_UI_PAGE_SIDES 32 #define _STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE 33 -#define _STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE_HELP 34 #define _STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE_LIST 35 -#define _STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE_LIST_HELP 36 #define _STR_IMPRESS_PRINT_UI_PAPER_TRAY_GROUP 37 #define _STR_IMPRESS_PRINT_UI_PAPER_TRAY 38 -#define _STR_IMPRESS_PRINT_UI_PAPER_TRAY_HELP 39 #define _STR_IMPRESS_PRINT_UI_PAGE_RANGE 40 #define _STR_IMPRESS_PRINT_UI_PAGE_RANGE_CHOICE 41 -#define _STR_IMPRESS_PRINT_UI_PAGE_RANGE_CHOICE_HELP 42 #define _STR_DRAW_PRINT_UI_PAGE_RANGE_CHOICE 43 #define _STR_DRAW_PRINT_UI_IS_PRINT_NAME 44 -#define _STR_DRAW_PRINT_UI_IS_PRINT_NAME_HELP 45 diff --git a/sd/source/ui/view/DocumentRenderer.src b/sd/source/ui/view/DocumentRenderer.src index abd82ea0d397..df4e2a30de02 100755 --- a/sd/source/ui/view/DocumentRenderer.src +++ b/sd/source/ui/view/DocumentRenderer.src @@ -46,14 +46,6 @@ Resource _STR_IMPRESS_PRINT_UI_OPTIONS { Text [ en-US ] = "Document"; }; - StringArray _STR_IMPRESS_PRINT_UI_CONTENT_HELP - { - ItemList [ en-US ] = - { - < "Select which parts of the document should be printed"; >; - < "Select which parts of the document should be printed"; >; - }; - }; StringArray _STR_IMPRESS_PRINT_UI_CONTENT_CHOICES { ItemList [ en-US ] = @@ -81,14 +73,6 @@ Resource _STR_IMPRESS_PRINT_UI_OPTIONS < "9" ; > ; }; }; - StringArray _STR_IMPRESS_PRINT_UI_SLIDESPERPAGE_CHOICES_HELP - { - ItemList [ en-US ] = - { - < "Select how many slides to print per page." ; >; - < "Select how many slides to print per page." ; >; - }; - }; String _STR_IMPRESS_PRINT_UI_ORDER { Text [ en-US ] = "Order" ; @@ -101,15 +85,6 @@ Resource _STR_IMPRESS_PRINT_UI_OPTIONS < "Top to bottom, then right" ; > ; }; }; - StringArray _STR_IMPRESS_PRINT_UI_ORDER_CHOICES_HELP - { - ItemList [ en-US ] = - { - < "Specify how to arrange slides on the printed page." ; > ; - < "Arrange slides horizontally" ; > ; - < "Arrange slides vertically" ; > ; - }; - }; String _STR_IMPRESS_PRINT_UI_INCLUDE_CONTENT { Text [ en-US ] = "~Contents"; @@ -118,35 +93,18 @@ Resource _STR_IMPRESS_PRINT_UI_OPTIONS { Text [ en-US ] = "~Slide name"; }; - String _STR_IMPRESS_PRINT_UI_IS_PRINT_NAME_HELP - { - Text [ en-US ] = "Specifies whether to print the page name of a document."; - }; String _STR_DRAW_PRINT_UI_IS_PRINT_NAME { Text [ en-US ] = "P~age name"; }; - String _STR_DRAW_PRINT_UI_IS_PRINT_NAME_HELP - { - Text [ en-US ] = "Specifies whether to print the page name of a document."; - }; String _STR_IMPRESS_PRINT_UI_IS_PRINT_DATE { Text [ en-US ] = "~Date and time"; }; - String _STR_IMPRESS_PRINT_UI_IS_PRINT_DATE_HELP - { - Text [ en-US ] = "Specifies whether to print the current date and time."; - }; String _STR_IMPRESS_PRINT_UI_IS_PRINT_HIDDEN { Text [ en-US ] = "Hidden pages"; }; - String _STR_IMPRESS_PRINT_UI_IS_PRINT_HIDDEN_HELP - { - Text [ en-US ] = "Specifies whether to print the pages that are currently hidden from the application."; - }; - String _STR_IMPRESS_PRINT_UI_OUTPUT_OPTIONS_GROUP { Text [ en-US ] = "Output options"; @@ -164,17 +122,6 @@ Resource _STR_IMPRESS_PRINT_UI_OPTIONS < "Black & white" ; > ; }; }; - StringArray _STR_IMPRESS_PRINT_UI_QUALITY_CHOICES_HELP - { - ItemList [ en-US ] = - { - < "Specify how to treat colors in the printout."; >; - < "Specifies that you want to print in original colors." ; > ; - < "Specifies that you want to print colors as grayscale." ; > ; - < "Specifies that you want to print in black and white." ; > ; - }; - }; - String _STR_IMPRESS_PRINT_UI_PAGE_OPTIONS { Text [ en-US ] = "~Size"; @@ -199,24 +146,10 @@ Resource _STR_IMPRESS_PRINT_UI_OPTIONS < "Tile sheet of paper with repeated pages" ; > ; }; }; - StringArray _STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES_HELP - { - ItemList [ en-US ] = - { - < "Specify how to scale slides in the printout."; >; - < "Specifies that you do not want to further scale pages when printing." ; > ; - < "Specifies whether to scale down objects that are beyond the margins of the current printer so they fit on the paper in the printer." ; > ; - < "Specifies that pages are to be printed in tiled format. If the pages or slides are smaller than the paper, several pages or slides will be printed on one page of paper." ; > ; - }; - }; String _STR_IMPRESS_PRINT_UI_BROCHURE { Text [en-US] = "Brochure"; }; - String _STR_IMPRESS_PRINT_UI_BROCHURE_HELP - { - Text [en-US] = "Select the \"Brochure\" option to print the document in brochure format."; - }; String _STR_IMPRESS_PRINT_UI_PAGE_SIDES { Text [ en-US ] = "Page sides"; @@ -225,10 +158,6 @@ Resource _STR_IMPRESS_PRINT_UI_OPTIONS { Text [ en-US ] = "Include"; }; - String _STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE_HELP - { - Text [ en-US ] = "Select which pages of a brochure to print."; - }; StringArray _STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE_LIST { ItemList [ en-US ] = @@ -238,15 +167,6 @@ Resource _STR_IMPRESS_PRINT_UI_OPTIONS < "Back sides / left pages" ; > ; }; }; - StringArray _STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE_LIST_HELP - { - ItemList [ en-US ] = - { - < "Print all pages of a brochure." ; > ; - < "Print only front pages of a brochure." ; > ; - < "Print only back pages of a brochure." ; > ; - }; - }; String _STR_IMPRESS_PRINT_UI_PAPER_TRAY_GROUP { @@ -256,10 +176,6 @@ Resource _STR_IMPRESS_PRINT_UI_OPTIONS { Text [ en-US ] = "~Use only paper tray from printer preferences"; }; - String _STR_IMPRESS_PRINT_UI_PAPER_TRAY_HELP - { - Text [ en-US ] = "Determines that the paper tray to be used is the one defined in the printer setup."; - }; String _STR_IMPRESS_PRINT_UI_PAGE_RANGE { Text [en-US] = "Print range"; @@ -274,16 +190,6 @@ Resource _STR_IMPRESS_PRINT_UI_OPTIONS }; }; - StringArray _STR_IMPRESS_PRINT_UI_PAGE_RANGE_CHOICE_HELP - { - ItemList [ en-US ] = - { - < "Print the whole document."; >; - < "Print a specified range of the document."; >; - < "Print only the currently selected content."; >; - }; - }; - StringArray _STR_DRAW_PRINT_UI_PAGE_RANGE_CHOICE { ItemList [ en-US ] = -- cgit v1.2.3 From cb2c8f642352c47c2c1c151bc7eb08c04c45c852 Mon Sep 17 00:00:00 2001 From: "Philipp Lohmann [pl]" Date: Thu, 4 Nov 2010 18:49:17 +0100 Subject: vcl117: #i115056# remove now unused svtools PrintDialog --- sd/source/ui/inc/ViewShellBase.hxx | 8 ++------ sd/source/ui/view/ViewShellBase.cxx | 19 +++---------------- 2 files changed, 5 insertions(+), 22 deletions(-) (limited to 'sd') diff --git a/sd/source/ui/inc/ViewShellBase.hxx b/sd/source/ui/inc/ViewShellBase.hxx index 38f7223f1d83..463b32ac2fb6 100755 --- a/sd/source/ui/inc/ViewShellBase.hxx +++ b/sd/source/ui/inc/ViewShellBase.hxx @@ -143,24 +143,20 @@ public: SfxPrinter* pNewPrinter, USHORT nDiffFlags = SFX_PRINTER_ALL, bool bIsApi=false); - /// Forwarded to the print manager. - virtual PrintDialog* CreatePrintDialog (::Window *pParent); - /// Forwarded to the print manager. virtual SfxTabPage* CreatePrintOptionsPage ( ::Window *pParent, const SfxItemSet &rOptions); /// Forwarded to the print manager. - virtual USHORT Print (SfxProgress& rProgress, BOOL bIsAPI, PrintDialog* pDialog); + virtual USHORT Print (SfxProgress& rProgress, BOOL bIsAPI); /// Forwarded to the print manager. virtual ErrCode DoPrint ( SfxPrinter *pPrinter, - PrintDialog *pPrintDialog, BOOL bSilent, BOOL bIsAPI ); - virtual void PreparePrint (PrintDialog* pPrintDialog); + virtual void PreparePrint (); /// Forward methods to main sub shell. virtual void WriteUserDataSequence ( diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index c748ffbc05e0..244bcc3b4da7 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -654,16 +654,6 @@ USHORT ViewShellBase::SetPrinter ( -PrintDialog* ViewShellBase::CreatePrintDialog (::Window *pParent) -{ - (void)pParent; - return NULL; - // return mpImpl->mpPrintManager->CreatePrintDialog (pParent); -} - - - - SfxTabPage* ViewShellBase::CreatePrintOptionsPage( ::Window *pParent, const SfxItemSet &rOptions) @@ -677,10 +667,9 @@ SfxTabPage* ViewShellBase::CreatePrintOptionsPage( -USHORT ViewShellBase::Print(SfxProgress&, BOOL bIsAPI, PrintDialog* pDlg) +USHORT ViewShellBase::Print(SfxProgress&, BOOL bIsAPI) { (void)bIsAPI; - (void)pDlg; return 0; // return mpImpl->mpPrintManager->Print (rProgress, bIsAPI, pDlg); } @@ -690,11 +679,9 @@ USHORT ViewShellBase::Print(SfxProgress&, BOOL bIsAPI, PrintDialog* pDlg) ErrCode ViewShellBase::DoPrint ( SfxPrinter* pPrinter, - PrintDialog* pPrintDialog, BOOL bSilent, BOOL bIsAPI ) { (void)pPrinter; - (void)pPrintDialog; (void)bSilent; (void)bIsAPI; return 0; @@ -704,9 +691,9 @@ ErrCode ViewShellBase::DoPrint ( -void ViewShellBase::PreparePrint (PrintDialog* pPrintDialog) +void ViewShellBase::PreparePrint () { - SfxViewShell::PreparePrint (pPrintDialog); + SfxViewShell::PreparePrint (); //mpImpl->mpPrintManager->PreparePrint (pPrintDialog); } -- cgit v1.2.3 From ef82e70080adef60010429f7cacd5ae82be47f54 Mon Sep 17 00:00:00 2001 From: "Philipp Lohmann [pl]" Date: Tue, 9 Nov 2010 15:20:35 +0100 Subject: vcl117: #i115477# clean up unused methods --- sd/source/ui/inc/ViewShellBase.hxx | 10 ---------- sd/source/ui/view/ViewShellBase.cxx | 33 --------------------------------- 2 files changed, 43 deletions(-) (limited to 'sd') diff --git a/sd/source/ui/inc/ViewShellBase.hxx b/sd/source/ui/inc/ViewShellBase.hxx index 463b32ac2fb6..2d1ae6404108 100755 --- a/sd/source/ui/inc/ViewShellBase.hxx +++ b/sd/source/ui/inc/ViewShellBase.hxx @@ -148,16 +148,6 @@ public: ::Window *pParent, const SfxItemSet &rOptions); - /// Forwarded to the print manager. - virtual USHORT Print (SfxProgress& rProgress, BOOL bIsAPI); - - /// Forwarded to the print manager. - virtual ErrCode DoPrint ( - SfxPrinter *pPrinter, - BOOL bSilent, BOOL bIsAPI ); - - virtual void PreparePrint (); - /// Forward methods to main sub shell. virtual void WriteUserDataSequence ( ::com::sun::star::uno::Sequence < diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index 244bcc3b4da7..7f6d3be02167 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -667,39 +667,6 @@ SfxTabPage* ViewShellBase::CreatePrintOptionsPage( -USHORT ViewShellBase::Print(SfxProgress&, BOOL bIsAPI) -{ - (void)bIsAPI; - return 0; - // return mpImpl->mpPrintManager->Print (rProgress, bIsAPI, pDlg); -} - - - - -ErrCode ViewShellBase::DoPrint ( - SfxPrinter* pPrinter, - BOOL bSilent, BOOL bIsAPI ) -{ - (void)pPrinter; - (void)bSilent; - (void)bIsAPI; - return 0; - //return mpImpl->mpPrintManager->DoPrint (pPrinter, pPrintDialog, bSilent, bIsAPI ); -} - - - - -void ViewShellBase::PreparePrint () -{ - SfxViewShell::PreparePrint (); - //mpImpl->mpPrintManager->PreparePrint (pPrintDialog); -} - - - - void ViewShellBase::UIActivating( SfxInPlaceClient* pClient ) { mpImpl->ShowViewTabBar(false); -- cgit v1.2.3 From 7e82d6429cf459d440d01724e620ff31ccbfde12 Mon Sep 17 00:00:00 2001 From: "Philipp Lohmann [pl]" Date: Tue, 23 Nov 2010 18:41:04 +0100 Subject: vcl117: removed obsolete header --- sd/source/ui/dlg/dlgass.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sd') diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx index acbf70d8e687..82ca4d05b996 100755 --- a/sd/source/ui/dlg/dlgass.cxx +++ b/sd/source/ui/dlg/dlgass.cxx @@ -49,7 +49,7 @@ #include #include "DrawDocShell.hxx" #include -#include +#include #include "docprev.hxx" #include #include -- cgit v1.2.3 From 1a5df47d2902194e9d6bbaa702980cb4fb1b312f Mon Sep 17 00:00:00 2001 From: "Philipp Lohmann [pl]" Date: Wed, 24 Nov 2010 16:09:43 +0100 Subject: vcl117: header cleanup --- sd/inc/pch/precompiled_sd.hxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 sd/inc/pch/precompiled_sd.hxx (limited to 'sd') diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx old mode 100644 new mode 100755 index 7e92020eb88f..dd874680e887 --- a/sd/inc/pch/precompiled_sd.hxx +++ b/sd/inc/pch/precompiled_sd.hxx @@ -902,7 +902,7 @@ #include "vcl/virdev.hxx" #include "vcl/waitobj.hxx" #include "vcl/window.hxx" -#include "vcl/wintypes.hxx" +#include "tools/wintypes.hxx" #include "vcl/wrkwin.hxx" #include "vos/diagnose.hxx" -- cgit v1.2.3 From 9dba5eaadeba2789c6b9f563c9e148a7ac50c679 Mon Sep 17 00:00:00 2001 From: "Philipp Lohmann [pl]" Date: Thu, 2 Dec 2010 11:04:17 +0100 Subject: fix pch --- sd/inc/pch/precompiled_sd.hxx | 1 - 1 file changed, 1 deletion(-) (limited to 'sd') diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx index dd874680e887..44dc28d64d73 100755 --- a/sd/inc/pch/precompiled_sd.hxx +++ b/sd/inc/pch/precompiled_sd.hxx @@ -530,7 +530,6 @@ #include "unotools/pathoptions.hxx" #include "svl/poolitem.hxx" #include "svtools/prgsbar.hxx" -#include "svtools/printdlg.hxx" #include "svl/ptitem.hxx" #include "svl/rectitem.hxx" #include "unotools/saveopt.hxx" -- cgit v1.2.3 From 41137ed7095b7a46b071e50587f8bc081e361de1 Mon Sep 17 00:00:00 2001 From: "Philipp Lohmann [pl]" Date: Thu, 9 Dec 2010 11:30:23 +0100 Subject: vcl117: more HelpID cleanup --- sd/source/ui/view/DocumentRenderer.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sd') diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx index 5b47bd699054..230469cfe6b4 100755 --- a/sd/source/ui/view/DocumentRenderer.cxx +++ b/sd/source/ui/view/DocumentRenderer.cxx @@ -436,7 +436,7 @@ namespace { aOpt.GetModuleName( mbImpress ? SvtModuleOptions::E_SIMPRESS : SvtModuleOptions::E_SDRAW ) ); AddDialogControl( vcl::PrinterOptionsHelper::getGroupControlOpt( aAppGroupname, - rtl::OUString() + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:TabPage:AppPage" ) ) ) ); uno::Sequence< rtl::OUString > aHelpIds; -- cgit v1.2.3 From 8ea2ed193327f81b8713def96246b45c6bb0d196 Mon Sep 17 00:00:00 2001 From: "Philipp Lohmann [pl]" Date: Fri, 10 Dec 2010 11:39:42 +0100 Subject: vcl117: more help id woes --- sd/source/ui/view/DocumentRenderer.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sd') diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx index 230469cfe6b4..b0248647b3dc 100755 --- a/sd/source/ui/view/DocumentRenderer.cxx +++ b/sd/source/ui/view/DocumentRenderer.cxx @@ -665,7 +665,7 @@ namespace { // create a an Edit dependent on "Pages" selected vcl::PrinterOptionsHelper::UIControlOptions aPageRangeOpt( aPrintRangeName, 1, sal_True ); AddDialogControl( vcl::PrinterOptionsHelper::getEditControlOpt( rtl::OUString(), - rtl::OUString(), + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PageRange:Edit" ) ), rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PageRange" ) ), rtl::OUString(), aPageRangeOpt ) -- cgit v1.2.3