diff options
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/inc/strings.hrc | 15 | ||||
| -rw-r--r-- | sc/source/ui/unoobj/docuno.cxx | 26 |
2 files changed, 15 insertions, 26 deletions
diff --git a/sc/inc/strings.hrc b/sc/inc/strings.hrc index 171845f996b4..3da565195f2f 100644 --- a/sc/inc/strings.hrc +++ b/sc/inc/strings.hrc @@ -102,15 +102,14 @@ #define STR_ACC_DOC_SPREADSHEET NC_("STR_ACC_DOC_SPREADSHEET", "%PRODUCTNAME Spreadsheets") #define STR_ACC_DOC_SPREADSHEET_READONLY NC_("STR_ACC_DOC_SPREADSHEET_READONLY", "(read-only)") #define STR_ACC_DOC_PREVIEW_SUFFIX NC_("STR_ACC_DOC_PREVIEW_SUFFIX", "(Preview mode)") -#define SCSTR_PRINTOPT_PAGES NC_("SCSTR_PRINTOPT_PAGES", "Pages") +#define SCSTR_PRINTOPT_PAGES NC_("SCSTR_PRINTOPT_PAGES", "Pages:") #define SCSTR_PRINTOPT_SUPPRESSEMPTY NC_("SCSTR_PRINTOPT_SUPPRESSEMPTY", "~Suppress output of empty pages") -#define SCSTR_PRINTOPT_PRNTCONTENT NC_("SCSTR_PRINTOPT_PRNTCONTENT", "Print content") -#define SCSTR_PRINTOPT_ALLSHEETS NC_("SCSTR_PRINTOPT_ALLSHEETS", "~All sheets") -#define SCSTR_PRINTOPT_SELECTEDSHEETS NC_("SCSTR_PRINTOPT_SELECTEDSHEETS", "~Selected sheets") -#define SCSTR_PRINTOPT_SELECTEDCELLS NC_("SCSTR_PRINTOPT_SELECTEDCELLS", "Selected cells") -#define SCSTR_PRINTOPT_FROMWHICH NC_("SCSTR_PRINTOPT_FROMWHICH", "From which print") -#define SCSTR_PRINTOPT_ALLPAGES NC_("SCSTR_PRINTOPT_ALLPAGES", "All ~pages") -#define SCSTR_PRINTOPT_PAGES_ NC_("SCSTR_PRINTOPT_PAGES_", "Pa~ges") +#define SCSTR_PRINTOPT_ALLSHEETS NC_("SCSTR_PRINTOPT_ALLSHEETS", "Print All Sheets") +#define SCSTR_PRINTOPT_SELECTEDSHEETS NC_("SCSTR_PRINTOPT_SELECTEDSHEETS", "Print Selected Sheets") +#define SCSTR_PRINTOPT_SELECTEDCELLS NC_("SCSTR_PRINTOPT_SELECTEDCELLS", "Print Selected Cells") +#define SCSTR_PRINTOPT_FROMWHICH NC_("SCSTR_PRINTOPT_FROMWHICH", "From which:") +#define SCSTR_PRINTOPT_PRINTALLPAGES NC_("SCSTR_PRINTOPT_PRINTALLPAGES", "Print all pages") +#define SCSTR_PRINTOPT_PRINTPAGES NC_("SCSTR_PRINTOPT_PRINTPAGES", "Print pages") #define SCSTR_PRINTOPT_PRODNAME NC_("SCSTR_PRINTOPT_PRODNAME", "%PRODUCTNAME %s") #define SCSTR_WARN_ME_IN_FUTURE_CHECK NC_("SCSTR_WARN_ME_IN_FUTURE_CHECK", "Warn me about this in the future.") #define SCSTR_DDEDOC_NOT_LOADED NC_("SCSTR_DDEDOC_NOT_LOADED", "The following DDE source could not be updated possibly because the source document was not open. Please launch the source document and try again." ) diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index 343f576e3ab7..603a521774c3 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -278,7 +278,7 @@ ScPrintUIOptions::ScPrintUIOptions() // show Subgroup for print content vcl::PrinterOptionsHelper::UIControlOptions aPrintRangeOpt; aPrintRangeOpt.maGroupHint = "PrintRange"; - m_aUIProperties[nIdx++].Value = setSubgroupControlOpt("printrange", ScResId( SCSTR_PRINTOPT_PRNTCONTENT ), + m_aUIProperties[nIdx++].Value = setSubgroupControlOpt("printrange", ScResId( SCSTR_PRINTOPT_PAGES ), OUString(), aPrintRangeOpt); @@ -288,14 +288,8 @@ ScPrintUIOptions::ScPrintUIOptions() ScResId( SCSTR_PRINTOPT_SELECTEDSHEETS ), ScResId( SCSTR_PRINTOPT_SELECTEDCELLS )}; uno::Sequence< OUString > aHelpIds{ - ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:0", - ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:1", - ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:2"}; - uno::Sequence< OUString > aWidgetIds{ - "printallsheets", - "printselectedsheets", - "printselectedcells"}; - m_aUIProperties[nIdx++].Value = setChoiceRadiosControlOpt(aWidgetIds, OUString(), + ".HelpID:vcl:PrintDialog:PrintContent:ListBox"}; + m_aUIProperties[nIdx++].Value = setChoiceListControlOpt( "printpagesbox", OUString(), aHelpIds, "PrintContent", aChoices, nContent ); @@ -308,15 +302,11 @@ ScPrintUIOptions::ScPrintUIOptions() // create a choice for the range to print OUString aPrintRangeName( "PrintRange" ); aChoices.realloc( 2 ); - aHelpIds.realloc( 2 ); - aWidgetIds.realloc( 2 ); - aChoices[0] = ScResId( SCSTR_PRINTOPT_ALLPAGES ); - aHelpIds[0] = ".HelpID:vcl:PrintDialog:PrintRange:RadioButton:0"; - aWidgetIds[0] = "printallpages"; - aChoices[1] = ScResId( SCSTR_PRINTOPT_PAGES_ ); - aHelpIds[1] = ".HelpID:vcl:PrintDialog:PrintRange:RadioButton:1"; - aWidgetIds[1] = "printpages"; - m_aUIProperties[nIdx++].Value = setChoiceRadiosControlOpt(aWidgetIds, OUString(), + aHelpIds.realloc( 1 ); + aChoices[0] = ScResId( SCSTR_PRINTOPT_PRINTALLPAGES ); + aChoices[1] = ScResId( SCSTR_PRINTOPT_PRINTPAGES ); + aHelpIds[0] = ".HelpID:vcl:PrintDialog:PrintRange:ListBox"; + m_aUIProperties[nIdx++].Value = setChoiceListControlOpt( "printextrabox", OUString(), aHelpIds, aPrintRangeName, aChoices, |