summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-05-18 21:14:00 +0100
committerCaolán McNamara <caolanm@redhat.com>2017-05-19 15:40:40 +0200
commit2155e04d6343638ca9815d394cbc4f78c2b17c3a (patch)
tree0378142f6ce9edb63074291aed45527568e7b254
parentcee02e81cd3b55fb46eacf5db5713e8bf4363bcd (diff)
make string translation loading more uniform
change various ResId classes that use conversion operator to OUString to functions that return a OUString drop various defines drop unnecessary toString calls Change-Id: Ibeccdf2b91a46a2ed5b4b74e6024e301a023bc92 Reviewed-on: https://gerrit.libreoffice.org/37817 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--avmedia/source/framework/MediaControlBase.cxx18
-rw-r--r--avmedia/source/framework/mediacontrol.cxx10
-rw-r--r--avmedia/source/framework/mediaplayer.cxx2
-rw-r--r--avmedia/source/inc/mediamisc.hxx17
-rw-r--r--avmedia/source/viewer/mediawindow.cxx8
-rw-r--r--basctl/source/basicide/bastypes.cxx2
-rw-r--r--basic/source/runtime/basrdll.cxx2
-rw-r--r--basic/source/sbx/sbxscan.cxx14
-rw-r--r--chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx6
-rw-r--r--chart2/source/controller/main/ChartController_Tools.cxx4
-rw-r--r--chart2/source/controller/main/DrawCommandDispatch.cxx4
-rw-r--r--chart2/source/controller/main/UndoCommandDispatch.cxx4
-rw-r--r--chart2/source/inc/ResId.hxx7
-rw-r--r--chart2/source/tools/InternalData.cxx1
-rw-r--r--chart2/source/tools/ResId.cxx7
-rw-r--r--cui/source/customize/acccfg.cxx6
-rw-r--r--cui/source/customize/cfg.cxx60
-rw-r--r--cui/source/customize/cfgutil.cxx16
-rw-r--r--cui/source/customize/macropg.cxx2
-rw-r--r--cui/source/dialogs/cuifmsearch.cxx10
-rw-r--r--cui/source/dialogs/cuigaldlg.cxx16
-rw-r--r--cui/source/dialogs/cuihyperdlg.cxx18
-rw-r--r--cui/source/dialogs/hangulhanjadlg.cxx6
-rw-r--r--cui/source/dialogs/hldocntp.cxx4
-rw-r--r--cui/source/dialogs/hlmarkwn.cxx4
-rw-r--r--cui/source/dialogs/hltpbase.cxx10
-rw-r--r--cui/source/dialogs/insdlg.cxx2
-rw-r--r--cui/source/dialogs/insrc.cxx4
-rw-r--r--cui/source/dialogs/linkdlg.cxx12
-rw-r--r--cui/source/dialogs/multipat.cxx4
-rw-r--r--cui/source/dialogs/passwdomdlg.cxx8
-rw-r--r--cui/source/dialogs/screenshotannotationdlg.cxx2
-rw-r--r--cui/source/dialogs/scriptdlg.cxx46
-rw-r--r--cui/source/dialogs/srchxtra.cxx2
-rw-r--r--cui/source/dialogs/thesdlg.cxx2
-rw-r--r--cui/source/inc/dialmgr.hxx7
-rw-r--r--cui/source/options/cfgchart.cxx4
-rw-r--r--cui/source/options/connpooloptions.cxx10
-rw-r--r--cui/source/options/dbregister.cxx6
-rw-r--r--cui/source/options/doclinkdialog.cxx6
-rw-r--r--cui/source/options/optcolor.cxx8
-rw-r--r--cui/source/options/optdict.cxx6
-rw-r--r--cui/source/options/optfltr.cxx14
-rw-r--r--cui/source/options/optinet2.cxx2
-rw-r--r--cui/source/options/optjava.cxx14
-rw-r--r--cui/source/options/optlingu.cxx28
-rw-r--r--cui/source/options/optopencl.cxx2
-rw-r--r--cui/source/options/optpath.cxx2
-rw-r--r--cui/source/options/personalization.cxx18
-rw-r--r--cui/source/options/treeopt.cxx26
-rw-r--r--cui/source/tabpages/align.cxx6
-rw-r--r--cui/source/tabpages/autocdlg.cxx58
-rw-r--r--cui/source/tabpages/backgrnd.cxx4
-rw-r--r--cui/source/tabpages/border.cxx6
-rw-r--r--cui/source/tabpages/chardlg.cxx10
-rw-r--r--cui/source/tabpages/connect.cxx2
-rw-r--r--cui/source/tabpages/grfpage.cxx2
-rw-r--r--cui/source/tabpages/measure.cxx4
-rw-r--r--cui/source/tabpages/numfmt.cxx2
-rw-r--r--cui/source/tabpages/numpages.cxx6
-rw-r--r--cui/source/tabpages/page.cxx8
-rw-r--r--cui/source/tabpages/paragrph.cxx6
-rw-r--r--cui/source/tabpages/tpbitmap.cxx2
-rw-r--r--cui/source/tabpages/tpcolor.cxx4
-rw-r--r--cui/source/tabpages/tpgradnt.cxx8
-rw-r--r--cui/source/tabpages/tphatch.cxx8
-rw-r--r--cui/source/tabpages/tpline.cxx10
-rw-r--r--cui/source/tabpages/tplnedef.cxx6
-rw-r--r--cui/source/tabpages/tplneend.cxx2
-rw-r--r--cui/source/tabpages/tppattern.cxx6
-rw-r--r--desktop/inc/dp_gui_shared.hxx9
-rw-r--r--desktop/source/app/app.cxx8
-rw-r--r--desktop/source/deployment/gui/dp_gui_dialog2.cxx4
-rw-r--r--desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx8
-rw-r--r--desktop/source/deployment/gui/dp_gui_updatedialog.cxx28
-rw-r--r--desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx16
-rw-r--r--desktop/source/deployment/misc/dp_dependencies.cxx12
-rw-r--r--desktop/source/deployment/misc/dp_resource.cxx2
-rw-r--r--desktop/source/lib/init.cxx2
-rw-r--r--desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx18
-rw-r--r--extensions/source/abpilot/abspilot.cxx6
-rw-r--r--extensions/source/abpilot/admininvokationimpl.cxx2
-rw-r--r--extensions/source/abpilot/datasourcehandling.cxx4
-rw-r--r--extensions/source/abpilot/fieldmappingimpl.cxx2
-rw-r--r--extensions/source/abpilot/fieldmappingpage.cxx2
-rw-r--r--extensions/source/bibliography/bibload.cxx2
-rw-r--r--extensions/source/bibliography/bibmod.cxx6
-rw-r--r--extensions/source/bibliography/bibresid.hxx11
-rw-r--r--extensions/source/bibliography/bibview.cxx2
-rw-r--r--extensions/source/bibliography/datman.cxx46
-rw-r--r--extensions/source/bibliography/general.cxx4
-rw-r--r--extensions/source/dbpilots/controlwizard.cxx4
-rw-r--r--extensions/source/dbpilots/gridwizard.cxx6
-rw-r--r--extensions/source/dbpilots/groupboxwiz.cxx4
-rw-r--r--extensions/source/dbpilots/listcombowizard.cxx8
-rw-r--r--extensions/source/propctrlr/defaultforminspection.cxx2
-rw-r--r--extensions/source/propctrlr/eformshelper.cxx2
-rw-r--r--extensions/source/propctrlr/eventhandler.cxx2
-rw-r--r--extensions/source/propctrlr/formbrowsertools.cxx42
-rw-r--r--extensions/source/propctrlr/formcomponenthandler.cxx10
-rw-r--r--extensions/source/propctrlr/formlinkdialog.cxx6
-rw-r--r--extensions/source/propctrlr/inspectorhelpwindow.cxx2
-rw-r--r--extensions/source/propctrlr/propcontroller.cxx2
-rw-r--r--extensions/source/propctrlr/selectlabeldialog.cxx2
-rw-r--r--extensions/source/propctrlr/usercontrol.cxx4
-rw-r--r--extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx2
-rw-r--r--filter/source/graphicfilter/eps/eps.cxx2
-rw-r--r--filter/source/xsltdialog/xmlfiltersettingsdialog.cxx45
-rw-r--r--include/editeng/eerdll.hxx2
-rw-r--r--include/sfx2/sfxresid.hxx9
-rw-r--r--include/svtools/svtresid.hxx10
-rw-r--r--include/svx/dialmgr.hxx8
-rw-r--r--include/svx/galmisc.hxx15
-rw-r--r--sc/inc/scresid.hxx10
-rw-r--r--sc/qa/unit/screenshots/screenshots.cxx6
-rw-r--r--sc/source/core/data/documen8.cxx4
-rw-r--r--sc/source/core/data/dpdimsave.cxx1
-rw-r--r--sc/source/core/data/dpoutput.cxx4
-rw-r--r--sc/source/core/data/funcdesc.cxx4
-rw-r--r--sc/source/core/tool/autoform.cxx2
-rw-r--r--sc/source/core/tool/inputopt.cxx1
-rw-r--r--sc/source/core/tool/rangeutl.cxx1
-rw-r--r--sc/source/ui/Accessibility/AccessibleDocument.cxx6
-rw-r--r--sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx2
-rw-r--r--sc/source/ui/Accessibility/AccessiblePageHeader.cxx6
-rw-r--r--sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx6
-rw-r--r--sc/source/ui/Accessibility/AccessiblePreviewTable.cxx2
-rw-r--r--sc/source/ui/Accessibility/AccessibleTableBase.cxx2
-rw-r--r--sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx22
-rw-r--r--sc/source/ui/StatisticsDialogs/ChiSquareTestDialog.cxx14
-rw-r--r--sc/source/ui/StatisticsDialogs/CorrelationDialog.cxx2
-rw-r--r--sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx2
-rw-r--r--sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx6
-rw-r--r--sc/source/ui/StatisticsDialogs/ExponentialSmoothingDialog.cxx6
-rw-r--r--sc/source/ui/StatisticsDialogs/FTestDialog.cxx32
-rw-r--r--sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx8
-rw-r--r--sc/source/ui/StatisticsDialogs/MovingAverageDialog.cxx4
-rw-r--r--sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx28
-rw-r--r--sc/source/ui/StatisticsDialogs/RegressionDialog.cxx14
-rw-r--r--sc/source/ui/StatisticsDialogs/SamplingDialog.cxx2
-rw-r--r--sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx2
-rw-r--r--sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx2
-rw-r--r--sc/source/ui/StatisticsDialogs/TTestDialog.cxx36
-rw-r--r--sc/source/ui/StatisticsDialogs/ZTestDialog.cxx30
-rw-r--r--sc/source/ui/app/inputwin.cxx4
-rw-r--r--sc/source/ui/app/scdll.cxx4
-rw-r--r--sc/source/ui/app/scmod.cxx4
-rw-r--r--sc/source/ui/cctrl/checklistmenu.cxx8
-rw-r--r--sc/source/ui/condformat/condformatdlgentry.cxx2
-rw-r--r--sc/source/ui/dbgui/filtdlg.cxx10
-rw-r--r--sc/source/ui/dbgui/pfiltdlg.cxx8
-rw-r--r--sc/source/ui/dbgui/pvfundlg.cxx3
-rw-r--r--sc/source/ui/dbgui/scuiimoptdlg.cxx4
-rw-r--r--sc/source/ui/dbgui/sfiltdlg.cxx2
-rw-r--r--sc/source/ui/dbgui/tpsort.cxx12
-rw-r--r--sc/source/ui/dbgui/tpsubt.cxx4
-rw-r--r--sc/source/ui/dialogs/searchresults.cxx2
-rw-r--r--sc/source/ui/docshell/docsh.cxx2
-rw-r--r--sc/source/ui/docshell/documentlinkmgr.cxx2
-rw-r--r--sc/source/ui/drawfunc/fuconrec.cxx18
-rw-r--r--sc/source/ui/drawfunc/graphsh.cxx2
-rw-r--r--sc/source/ui/miscdlgs/acredlin.cxx32
-rw-r--r--sc/source/ui/miscdlgs/filldlg.cxx2
-rw-r--r--sc/source/ui/navipi/navipi.cxx6
-rw-r--r--sc/source/ui/optdlg/tpformula.cxx6
-rw-r--r--sc/source/ui/optdlg/tpview.cxx2
-rw-r--r--sc/source/ui/pagedlg/tphfedit.cxx6
-rw-r--r--sc/source/ui/unoobj/PivotTableDataProvider.cxx4
-rw-r--r--sc/source/ui/unoobj/docuno.cxx20
-rw-r--r--sc/source/ui/view/drawvie3.cxx4
-rw-r--r--sc/source/ui/view/gridwin.cxx12
-rw-r--r--sc/source/ui/view/gridwin2.cxx6
-rw-r--r--sc/source/ui/view/tabvwshf.cxx10
-rw-r--r--scaddins/source/analysis/analysis.cxx2
-rw-r--r--scaddins/source/datefunc/datefunc.cxx2
-rw-r--r--scaddins/source/pricing/pricing.cxx2
-rw-r--r--sd/Library_sd.mk1
-rw-r--r--sd/inc/sdabstdlg.hxx1
-rw-r--r--sd/inc/sdresid.hxx10
-rw-r--r--sd/qa/unit/dialogs-test.cxx4
-rw-r--r--sd/source/core/drawdoc.cxx14
-rw-r--r--sd/source/core/drawdoc2.cxx18
-rw-r--r--sd/source/core/drawdoc3.cxx10
-rw-r--r--sd/source/core/drawdoc4.cxx50
-rw-r--r--sd/source/core/sdpage.cxx48
-rw-r--r--sd/source/core/stlfamily.cxx4
-rw-r--r--sd/source/core/stlpool.cxx14
-rw-r--r--sd/source/core/stlsheet.cxx24
-rw-r--r--sd/source/core/undoanim.cxx6
-rw-r--r--sd/source/filter/grf/sdgrffilter.cxx2
-rw-r--r--sd/source/filter/html/htmlattr.cxx8
-rw-r--r--sd/source/filter/html/htmlex.cxx38
-rw-r--r--sd/source/filter/html/pubdlg.cxx2
-rw-r--r--sd/source/filter/ppt/pptin.cxx18
-rw-r--r--sd/source/filter/xml/sdxmlwrp.cxx4
-rw-r--r--sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx16
-rw-r--r--sd/source/ui/accessibility/AccessibleOutlineView.cxx4
-rw-r--r--sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx6
-rw-r--r--sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx2
-rw-r--r--sd/source/ui/accessibility/AccessibleSlideSorterView.cxx4
-rw-r--r--sd/source/ui/animations/CustomAnimationDialog.cxx10
-rw-r--r--sd/source/ui/animations/CustomAnimationList.cxx12
-rw-r--r--sd/source/ui/animations/CustomAnimationPane.cxx42
-rw-r--r--sd/source/ui/animations/SlideTransitionPane.cxx4
-rw-r--r--sd/source/ui/annotations/annotationmanager.cxx16
-rw-r--r--sd/source/ui/annotations/annotationtag.cxx2
-rw-r--r--sd/source/ui/annotations/annotationwindow.cxx2
-rw-r--r--sd/source/ui/app/sdmod1.cxx2
-rw-r--r--sd/source/ui/app/sdmod2.cxx22
-rw-r--r--sd/source/ui/app/sdpopup.cxx18
-rw-r--r--sd/source/ui/app/sdresid.cxx30
-rw-r--r--sd/source/ui/app/tmplctrl.cxx2
-rw-r--r--sd/source/ui/controller/displaymodecontroller.cxx6
-rw-r--r--sd/source/ui/controller/slidelayoutcontroller.cxx8
-rw-r--r--sd/source/ui/dlg/LayerTabBar.cxx22
-rw-r--r--sd/source/ui/dlg/PaneChildWindows.cxx2
-rw-r--r--sd/source/ui/dlg/PhotoAlbumDialog.cxx4
-rw-r--r--sd/source/ui/dlg/RemoteDialogClientBox.cxx6
-rw-r--r--sd/source/ui/dlg/animobjs.cxx2
-rw-r--r--sd/source/ui/dlg/brkdlg.cxx4
-rw-r--r--sd/source/ui/dlg/custsdlg.cxx2
-rw-r--r--sd/source/ui/dlg/diactrl.cxx6
-rw-r--r--sd/source/ui/dlg/dlgfield.cxx14
-rw-r--r--sd/source/ui/dlg/filedlg.cxx26
-rw-r--r--sd/source/ui/dlg/gluectrl.cxx24
-rw-r--r--sd/source/ui/dlg/inspagob.cxx2
-rw-r--r--sd/source/ui/dlg/navigatr.cxx8
-rw-r--r--sd/source/ui/dlg/prltempl.cxx14
-rw-r--r--sd/source/ui/dlg/sdpreslt.cxx4
-rw-r--r--sd/source/ui/dlg/sdtreelb.cxx4
-rw-r--r--sd/source/ui/dlg/tpaction.cxx22
-rw-r--r--sd/source/ui/dlg/tpoption.cxx2
-rw-r--r--sd/source/ui/dlg/unchss.cxx14
-rw-r--r--sd/source/ui/docshell/docshel2.cxx4
-rw-r--r--sd/source/ui/docshell/docshel4.cxx8
-rw-r--r--sd/source/ui/framework/module/SlideSorterModule.cxx2
-rw-r--r--sd/source/ui/framework/module/ViewTabBarModule.cxx8
-rw-r--r--sd/source/ui/func/fubullet.cxx4
-rw-r--r--sd/source/ui/func/fuconrec.cxx32
-rw-r--r--sd/source/ui/func/fuconstr.cxx2
-rw-r--r--sd/source/ui/func/fuconuno.cxx2
-rw-r--r--sd/source/ui/func/fucopy.cxx6
-rw-r--r--sd/source/ui/func/fudraw.cxx24
-rw-r--r--sd/source/ui/func/fuexpand.cxx2
-rw-r--r--sd/source/ui/func/fuhhconv.cxx2
-rw-r--r--sd/source/ui/func/fuinsert.cxx6
-rw-r--r--sd/source/ui/func/fuinsfil.cxx16
-rw-r--r--sd/source/ui/func/fulinend.cxx6
-rw-r--r--sd/source/ui/func/fumorph.cxx2
-rw-r--r--sd/source/ui/func/fupage.cxx4
-rw-r--r--sd/source/ui/func/fusldlg.cxx2
-rw-r--r--sd/source/ui/func/fusnapln.cxx4
-rw-r--r--sd/source/ui/func/fusumry.cxx2
-rw-r--r--sd/source/ui/func/futempl.cxx20
-rw-r--r--sd/source/ui/func/futext.cxx2
-rw-r--r--sd/source/ui/func/futransf.cxx2
-rw-r--r--sd/source/ui/func/fuvect.cxx2
-rw-r--r--sd/source/ui/func/unprlout.cxx2
-rw-r--r--sd/source/ui/sidebar/DocumentHelper.cxx2
-rw-r--r--sd/source/ui/sidebar/LayoutMenu.cxx4
-rw-r--r--sd/source/ui/sidebar/SlideBackground.cxx20
-rw-r--r--sd/source/ui/slidesorter/controller/SlsClipboard.cxx4
-rw-r--r--sd/source/ui/slidesorter/controller/SlsSlotManager.cxx8
-rw-r--r--sd/source/ui/slidesorter/view/SlsToolTip.cxx2
-rw-r--r--sd/source/ui/table/tableobjectbar.cxx2
-rw-r--r--sd/source/ui/unoidl/unolayer.cxx22
-rw-r--r--sd/source/ui/unoidl/unomodel.cxx8
-rw-r--r--sd/source/ui/unoidl/unopage.cxx14
-rw-r--r--sd/source/ui/view/DocumentRenderer.cxx38
-rw-r--r--sd/source/ui/view/GraphicObjectBar.cxx2
-rw-r--r--sd/source/ui/view/MediaObjectBar.cxx2
-rw-r--r--sd/source/ui/view/Outliner.cxx6
-rw-r--r--sd/source/ui/view/ViewShellImplementation.cxx8
-rw-r--r--sd/source/ui/view/drawview.cxx8
-rw-r--r--sd/source/ui/view/drbezob.cxx2
-rw-r--r--sd/source/ui/view/drtxtob1.cxx2
-rw-r--r--sd/source/ui/view/drviews1.cxx10
-rw-r--r--sd/source/ui/view/drviews2.cxx60
-rw-r--r--sd/source/ui/view/drviews3.cxx10
-rw-r--r--sd/source/ui/view/drviews4.cxx10
-rw-r--r--sd/source/ui/view/drviews6.cxx2
-rw-r--r--sd/source/ui/view/drviews7.cxx14
-rw-r--r--sd/source/ui/view/drviews9.cxx2
-rw-r--r--sd/source/ui/view/drviewsa.cxx2
-rw-r--r--sd/source/ui/view/drviewsb.cxx4
-rw-r--r--sd/source/ui/view/drviewse.cxx18
-rw-r--r--sd/source/ui/view/drviewsi.cxx4
-rw-r--r--sd/source/ui/view/frmview.cxx2
-rw-r--r--sd/source/ui/view/outlnvsh.cxx2
-rw-r--r--sd/source/ui/view/outlview.cxx8
-rw-r--r--sd/source/ui/view/sdview.cxx20
-rw-r--r--sd/source/ui/view/sdview2.cxx8
-rw-r--r--sd/source/ui/view/sdview3.cxx10
-rw-r--r--sd/source/ui/view/sdview4.cxx10
-rw-r--r--sd/source/ui/view/unmodpg.cxx16
-rw-r--r--sd/source/ui/view/viewoverlaymanager.cxx6
-rw-r--r--sd/source/ui/view/viewshe3.cxx10
-rw-r--r--sfx2/source/appl/app.cxx3
-rw-r--r--sfx2/source/appl/appcfg.cxx2
-rw-r--r--sfx2/source/appl/appopen.cxx2
-rw-r--r--sfx2/source/appl/appquit.cxx4
-rw-r--r--sfx2/source/appl/appserv.cxx4
-rw-r--r--sfx2/source/appl/fileobj.cxx2
-rw-r--r--sfx2/source/appl/linkmgr2.cxx4
-rw-r--r--sfx2/source/appl/lnkbase2.cxx2
-rw-r--r--sfx2/source/appl/newhelp.cxx36
-rw-r--r--sfx2/source/appl/opengrf.cxx2
-rw-r--r--sfx2/source/appl/sfxhelp.cxx2
-rw-r--r--sfx2/source/appl/shutdownicon.cxx10
-rw-r--r--sfx2/source/bastyp/fltfnc.cxx4
-rw-r--r--sfx2/source/bastyp/sfxresid.cxx11
-rw-r--r--sfx2/source/control/msgpool.cxx6
-rw-r--r--sfx2/source/control/templatedefaultview.cxx4
-rw-r--r--sfx2/source/control/templatelocalview.cxx22
-rw-r--r--sfx2/source/control/templatesearchview.cxx10
-rw-r--r--sfx2/source/dialog/dinfdlg.cxx28
-rw-r--r--sfx2/source/dialog/filedlghelper.cxx18
-rw-r--r--sfx2/source/dialog/filtergrouping.cxx2
-rw-r--r--sfx2/source/dialog/mailmodel.cxx2
-rw-r--r--sfx2/source/dialog/mgetempl.cxx8
-rw-r--r--sfx2/source/dialog/navigat.cxx2
-rw-r--r--sfx2/source/dialog/passwd.cxx6
-rw-r--r--sfx2/source/dialog/recfloat.cxx4
-rw-r--r--sfx2/source/dialog/securitypage.cxx4
-rw-r--r--sfx2/source/dialog/styledlg.cxx2
-rw-r--r--sfx2/source/dialog/tabdlg.cxx4
-rw-r--r--sfx2/source/dialog/templdlg.cxx20
-rw-r--r--sfx2/source/doc/doctempl.cxx4
-rw-r--r--sfx2/source/doc/doctemplates.cxx7
-rw-r--r--sfx2/source/doc/guisaveas.cxx4
-rw-r--r--sfx2/source/doc/new.cxx6
-rw-r--r--sfx2/source/doc/objcont.cxx2
-rw-r--r--sfx2/source/doc/objmisc.cxx8
-rw-r--r--sfx2/source/doc/objserv.cxx8
-rw-r--r--sfx2/source/doc/objstor.cxx14
-rw-r--r--sfx2/source/doc/objxtor.cxx2
-rw-r--r--sfx2/source/doc/querytemplate.cxx4
-rw-r--r--sfx2/source/doc/saveastemplatedlg.cxx6
-rw-r--r--sfx2/source/doc/sfxbasemodel.cxx8
-rw-r--r--sfx2/source/doc/templatedlg.cxx44
-rw-r--r--sfx2/source/sidebar/DeckTitleBar.cxx2
-rw-r--r--sfx2/source/sidebar/PanelTitleBar.cxx2
-rw-r--r--sfx2/source/sidebar/SidebarController.cxx10
-rw-r--r--sfx2/source/sidebar/TabBar.cxx2
-rw-r--r--sfx2/source/view/viewfrm.cxx6
-rw-r--r--sfx2/source/view/viewprn.cxx8
-rw-r--r--starmath/inc/smmod.hxx8
-rw-r--r--starmath/source/ElementsDockingWindow.cxx84
-rw-r--r--starmath/source/accessibility.cxx4
-rw-r--r--starmath/source/document.cxx8
-rw-r--r--starmath/source/mathmlexport.cxx2
-rw-r--r--starmath/source/mathmlimport.cxx2
-rw-r--r--starmath/source/parse.cxx4
-rw-r--r--starmath/source/smmod.cxx12
-rw-r--r--starmath/source/unomodel.cxx18
-rw-r--r--starmath/source/utility.cxx4
-rw-r--r--starmath/source/view.cxx2
-rw-r--r--svtools/source/contnr/fileview.cxx24
-rw-r--r--svtools/source/contnr/svtabbx.cxx4
-rw-r--r--svtools/source/contnr/templwin.cxx2
-rw-r--r--svtools/source/control/calendar.cxx8
-rw-r--r--svtools/source/control/collatorres.cxx26
-rw-r--r--svtools/source/control/ctrlbox.cxx16
-rw-r--r--svtools/source/control/ctrltool.cxx24
-rw-r--r--svtools/source/control/filectrl.cxx2
-rw-r--r--svtools/source/control/indexentryres.cxx22
-rw-r--r--svtools/source/control/tabbar.cxx10
-rw-r--r--svtools/source/dialogs/PlaceEditDialog.cxx2
-rw-r--r--svtools/source/dialogs/addresstemplate.cxx66
-rw-r--r--svtools/source/dialogs/insdlg.cxx6
-rw-r--r--svtools/source/dialogs/prnsetup.cxx4
-rw-r--r--svtools/source/dialogs/roadmapwizard.cxx2
-rw-r--r--svtools/source/dialogs/wizardmachine.cxx6
-rw-r--r--svtools/source/filter/exportdialog.cxx20
-rw-r--r--svtools/source/misc/imagemgr.cxx6
-rw-r--r--svtools/source/misc/langtab.cxx4
-rw-r--r--svtools/source/misc/svtresid.cxx11
-rw-r--r--svx/source/accessibility/AccessibleFrameSelector.cxx4
-rw-r--r--svx/source/accessibility/DescriptionGenerator.cxx20
-rw-r--r--svx/source/accessibility/GraphCtlAccessibleContext.cxx4
-rw-r--r--svx/source/accessibility/ShapeTypeHandler.cxx2
-rw-r--r--svx/source/accessibility/charmapacc.cxx10
-rw-r--r--svx/source/accessibility/svxrectctaccessiblecontext.cxx8
-rw-r--r--svx/source/core/graphichelper.cxx4
-rw-r--r--svx/source/dialog/SafeModeDialog.cxx2
-rw-r--r--svx/source/dialog/_bmpmask.cxx5
-rw-r--r--svx/source/dialog/charmap.cxx2
-rw-r--r--svx/source/dialog/compressgraphicdialog.cxx28
-rw-r--r--svx/source/dialog/contimp.hxx2
-rw-r--r--svx/source/dialog/dlgctl3d.cxx2
-rw-r--r--svx/source/dialog/dlgctrl.cxx12
-rw-r--r--svx/source/dialog/docrecovery.cxx8
-rw-r--r--svx/source/dialog/langbox.cxx4
-rw-r--r--svx/source/dialog/pagenumberlistbox.cxx2
-rw-r--r--svx/source/dialog/papersizelistbox.cxx4
-rw-r--r--svx/source/dialog/passwd.cxx4
-rw-r--r--svx/source/dialog/prtqry.cxx8
-rw-r--r--svx/source/dialog/samecontentlistbox.cxx2
-rw-r--r--svx/source/dialog/spacinglistbox.cxx2
-rw-r--r--svx/source/dialog/srchdlg.cxx22
-rw-r--r--svx/source/dialog/strarray.cxx6
-rw-r--r--svx/source/dialog/svxbmpnumvalueset.cxx6
-rw-r--r--svx/source/dialog/svxruler.cxx2
-rw-r--r--svx/source/dialog/swframeposstrings.cxx2
-rw-r--r--svx/source/dialog/txenctab.cxx3
-rw-r--r--svx/source/engine3d/dragmt3d.cxx2
-rw-r--r--svx/source/engine3d/float3d.cxx6
-rw-r--r--svx/source/engine3d/view3d.cxx8
-rw-r--r--svx/source/engine3d/view3d1.cxx2
-rw-r--r--svx/source/fmcomp/fmgridcl.cxx8
-rw-r--r--svx/source/fmcomp/gridcell.cxx2
-rw-r--r--svx/source/fmcomp/gridctrl.cxx6
-rw-r--r--svx/source/form/ParseContext.cxx26
-rw-r--r--svx/source/form/databaselocationinput.cxx2
-rw-r--r--svx/source/form/datanavi.cxx98
-rw-r--r--svx/source/form/filtnav.cxx12
-rw-r--r--svx/source/form/fmPropBrw.cxx14
-rw-r--r--svx/source/form/fmexpl.cxx2
-rw-r--r--svx/source/form/fmpgeimp.cxx14
-rw-r--r--svx/source/form/fmshimp.cxx4
-rw-r--r--svx/source/form/fmundo.cxx4
-rw-r--r--svx/source/form/fmvwimp.cxx6
-rw-r--r--svx/source/form/formcontrolfactory.cxx4
-rw-r--r--svx/source/form/formcontroller.cxx12
-rw-r--r--svx/source/form/navigatortree.cxx28
-rw-r--r--svx/source/form/navigatortreemodel.cxx12
-rw-r--r--svx/source/form/tabwin.cxx6
-rw-r--r--svx/source/form/tbxform.cxx4
-rw-r--r--svx/source/gallery2/galbrws1.cxx6
-rw-r--r--svx/source/gallery2/galbrws2.cxx14
-rw-r--r--svx/source/gallery2/galctrl.cxx2
-rw-r--r--svx/source/gallery2/gallery1.cxx12
-rw-r--r--svx/source/gallery2/galmisc.cxx2
-rw-r--r--svx/source/gallery2/galobj.cxx2
-rw-r--r--svx/source/gallery2/galtheme.cxx2
-rw-r--r--svx/source/inc/datanavi.hxx12
-rw-r--r--svx/source/items/algitem.cxx10
-rw-r--r--svx/source/items/pageitem.cxx22
-rw-r--r--svx/source/items/postattr.cxx6
-rw-r--r--svx/source/sidebar/EmptyPanel.cxx2
-rw-r--r--svx/source/sidebar/graphic/GraphicPropertyPanel.cxx8
-rw-r--r--svx/source/sidebar/line/LinePropertyPanelBase.cxx2
-rw-r--r--svx/source/sidebar/line/LineWidthPopup.cxx4
-rw-r--r--svx/source/sidebar/nbdtmg.cxx12
-rw-r--r--svx/source/stbctrls/insctrl.cxx6
-rw-r--r--svx/source/stbctrls/modctrl.cxx2
-rw-r--r--svx/source/stbctrls/xmlsecctrl.cxx2
-rw-r--r--svx/source/stbctrls/zoomctrl.cxx4
-rw-r--r--svx/source/stbctrls/zoomsliderctrl.cxx4
-rw-r--r--svx/source/svdraw/svdetc.cxx2
-rw-r--r--svx/source/svdraw/svdhdl.cxx2
-rw-r--r--svx/source/svdraw/svdmrkv.cxx2
-rw-r--r--svx/source/table/tabledesign.cxx2
-rw-r--r--svx/source/tbxctrls/PaletteManager.cxx6
-rw-r--r--svx/source/tbxctrls/bulletsnumbering.cxx6
-rw-r--r--svx/source/tbxctrls/colrctrl.cxx6
-rw-r--r--svx/source/tbxctrls/extrusioncontrols.cxx26
-rw-r--r--svx/source/tbxctrls/fontworkgallery.cxx26
-rw-r--r--svx/source/tbxctrls/grafctrl.cxx28
-rw-r--r--svx/source/tbxctrls/layctrl.cxx4
-rw-r--r--svx/source/tbxctrls/lboxctrl.cxx4
-rw-r--r--svx/source/tbxctrls/linectrl.cxx8
-rw-r--r--svx/source/tbxctrls/tbcontrl.cxx32
-rw-r--r--svx/source/tbxctrls/tbunosearchcontrollers.cxx6
-rw-r--r--svx/source/toolbars/extrusionbar.cxx4
-rw-r--r--svx/source/toolbars/fontworkbar.cxx6
-rw-r--r--svx/source/unodraw/unoprov.cxx13
-rw-r--r--svx/source/xoutdev/xattr.cxx13
-rw-r--r--svx/source/xoutdev/xattr2.cxx8
-rw-r--r--svx/source/xoutdev/xtabcolr.cxx50
-rw-r--r--svx/source/xoutdev/xtabdash.cxx6
-rw-r--r--svx/source/xoutdev/xtabgrdt.cxx2
-rw-r--r--svx/source/xoutdev/xtabhtch.cxx2
-rw-r--r--svx/source/xoutdev/xtablend.cxx6
-rw-r--r--svx/source/xoutdev/xtabptrn.cxx2
-rw-r--r--sw/inc/swtypes.hxx11
-rw-r--r--sw/source/core/access/acccontext.cxx2
-rw-r--r--sw/source/core/crsr/crsrsh.cxx2
-rw-r--r--sw/source/core/crsr/findcoll.cxx2
-rw-r--r--sw/source/core/doc/DocumentFieldsManager.cxx8
-rw-r--r--sw/source/core/doc/DocumentRedlineManager.cxx4
-rw-r--r--sw/source/core/doc/doc.cxx8
-rw-r--r--sw/source/core/doc/docnum.cxx2
-rw-r--r--sw/source/core/doc/docredln.cxx8
-rw-r--r--sw/source/core/doc/notxtfrm.cxx2
-rw-r--r--sw/source/core/edit/eddel.cxx2
-rw-r--r--sw/source/core/fields/authfld.cxx2
-rw-r--r--sw/source/core/fields/docufld.cxx2
-rw-r--r--sw/source/core/fields/fldbas.cxx2
-rw-r--r--sw/source/core/fields/reffld.cxx4
-rw-r--r--sw/source/core/fields/scrptfld.cxx2
-rw-r--r--sw/source/core/frmedt/feshview.cxx18
-rw-r--r--sw/source/core/layout/atrfrm.cxx4
-rw-r--r--sw/source/core/layout/pagedesc.cxx2
-rw-r--r--sw/source/core/layout/paintfrm.cxx4
-rw-r--r--sw/source/core/ole/ndole.cxx6
-rw-r--r--sw/source/core/tox/tox.cxx10
-rw-r--r--sw/source/core/tox/txmsrt.cxx4
-rw-r--r--sw/source/core/txtnode/fntcache.cxx2
-rw-r--r--sw/source/core/undo/SwUndoFmt.cxx4
-rw-r--r--sw/source/core/undo/SwUndoPageDesc.cxx2
-rw-r--r--sw/source/core/undo/docundo.cxx4
-rw-r--r--sw/source/core/undo/rolbck.cxx6
-rw-r--r--sw/source/core/undo/unbkmk.cxx6
-rw-r--r--sw/source/core/undo/undel.cxx22
-rw-r--r--sw/source/core/undo/undobj.cxx4
-rw-r--r--sw/source/core/undo/unins.cxx30
-rw-r--r--sw/source/core/undo/unovwr.cxx6
-rw-r--r--sw/source/core/undo/untbl.cxx4
-rw-r--r--sw/source/core/unocore/unochart.cxx8
-rw-r--r--sw/source/core/unocore/unofield.cxx8
-rw-r--r--sw/source/core/unocore/unosett.cxx4
-rw-r--r--sw/source/core/unocore/unostyle.cxx4
-rw-r--r--sw/source/core/view/pagepreviewlayout.cxx2
-rw-r--r--sw/source/core/view/printdata.cxx62
-rw-r--r--sw/source/filter/xml/swxml.cxx2
-rw-r--r--sw/source/filter/xml/wrtxml.cxx2
-rw-r--r--sw/source/filter/xml/xmlimp.cxx2
-rw-r--r--sw/source/ui/chrdlg/break.cxx2
-rw-r--r--sw/source/ui/chrdlg/chardlg.cxx2
-rw-r--r--sw/source/ui/chrdlg/drpcps.cxx2
-rw-r--r--sw/source/ui/chrdlg/numpara.cxx2
-rw-r--r--sw/source/ui/chrdlg/pardlg.cxx2
-rw-r--r--sw/source/ui/config/optload.cxx20
-rw-r--r--sw/source/ui/config/optpage.cxx10
-rw-r--r--sw/source/ui/dbui/createaddresslistdialog.cxx2
-rw-r--r--sw/source/ui/dbui/dbinsdlg.cxx2
-rw-r--r--sw/source/ui/dbui/mailmergewizard.cxx16
-rw-r--r--sw/source/ui/dbui/mmaddressblockpage.cxx38
-rw-r--r--sw/source/ui/dbui/mmoutputtypepage.cxx12
-rw-r--r--sw/source/ui/dbui/mmresultdialogs.cxx4
-rw-r--r--sw/source/ui/dbui/selectdbtabledialog.cxx8
-rw-r--r--sw/source/ui/dialog/macassgn.cxx26
-rw-r--r--sw/source/ui/dialog/uiregionsw.cxx10
-rw-r--r--sw/source/ui/envelp/label1.cxx6
-rw-r--r--sw/source/ui/envelp/labfmt.cxx22
-rw-r--r--sw/source/ui/fldui/changedb.cxx2
-rw-r--r--sw/source/ui/fldui/flddinf.cxx2
-rw-r--r--sw/source/ui/fldui/flddok.cxx14
-rw-r--r--sw/source/ui/fldui/fldfunc.cxx22
-rw-r--r--sw/source/ui/fldui/fldref.cxx4
-rw-r--r--sw/source/ui/fldui/fldvar.cxx28
-rw-r--r--sw/source/ui/fldui/javaedit.cxx2
-rw-r--r--sw/source/ui/frmdlg/column.cxx16
-rw-r--r--sw/source/ui/frmdlg/cption.cxx12
-rw-r--r--sw/source/ui/frmdlg/frmdlg.cxx2
-rw-r--r--sw/source/ui/frmdlg/frmpage.cxx4
-rw-r--r--sw/source/ui/frmdlg/pattern.cxx2
-rw-r--r--sw/source/ui/frmdlg/uiborder.cxx2
-rw-r--r--sw/source/ui/index/cnttab.cxx46
-rw-r--r--sw/source/ui/index/swuiidxmrk.cxx10
-rw-r--r--sw/source/ui/misc/bookmark.cxx10
-rw-r--r--sw/source/ui/misc/glosbib.cxx4
-rw-r--r--sw/source/ui/misc/glossary.cxx14
-rw-r--r--sw/source/ui/misc/linenum.cxx6
-rw-r--r--sw/source/ui/misc/outline.cxx2
-rw-r--r--sw/source/ui/misc/pgfnote.cxx2
-rw-r--r--sw/source/ui/misc/srtdlg.cxx8
-rw-r--r--sw/source/ui/table/convert.cxx2
-rw-r--r--sw/source/ui/table/tabledlg.cxx2
-rw-r--r--sw/source/ui/table/tautofmt.cxx28
-rw-r--r--sw/source/uibase/app/appenv.cxx2
-rw-r--r--sw/source/uibase/app/applab.cxx2
-rw-r--r--sw/source/uibase/app/docsh.cxx4
-rw-r--r--sw/source/uibase/app/docsh2.cxx20
-rw-r--r--sw/source/uibase/app/docstyle.cxx8
-rw-r--r--sw/source/uibase/app/mainwn.cxx4
-rw-r--r--sw/source/uibase/app/swmodul1.cxx2
-rw-r--r--sw/source/uibase/app/swmodule.cxx24
-rw-r--r--sw/source/uibase/dbui/dbmgr.cxx22
-rw-r--r--sw/source/uibase/dbui/mailmergehelper.cxx2
-rw-r--r--sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx2
-rw-r--r--sw/source/uibase/dbui/mmconfigitem.cxx2
-rw-r--r--sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx4
-rw-r--r--sw/source/uibase/dochdl/gloshdl.cxx4
-rw-r--r--sw/source/uibase/dochdl/swdtflvr.cxx20
-rw-r--r--sw/source/uibase/docvw/AnnotationMenuButton.cxx6
-rw-r--r--sw/source/uibase/docvw/AnnotationWin.cxx2
-rw-r--r--sw/source/uibase/docvw/AnnotationWin2.cxx8
-rw-r--r--sw/source/uibase/docvw/HeaderFooterWin.cxx26
-rw-r--r--sw/source/uibase/docvw/PostItMgr.cxx8
-rw-r--r--sw/source/uibase/docvw/SidebarTxtControl.cxx2
-rw-r--r--sw/source/uibase/docvw/edtwin2.cxx10
-rw-r--r--sw/source/uibase/envelp/envimg.cxx2
-rw-r--r--sw/source/uibase/fldui/fldmgr.cxx16
-rw-r--r--sw/source/uibase/globdoc/globdoc.cxx6
-rw-r--r--sw/source/uibase/lingu/hyp.cxx2
-rw-r--r--sw/source/uibase/lingu/olmenu.cxx18
-rw-r--r--sw/source/uibase/misc/glshell.cxx4
-rw-r--r--sw/source/uibase/misc/numberingtypelistbox.cxx2
-rw-r--r--sw/source/uibase/misc/redlndlg.cxx18
-rw-r--r--sw/source/uibase/misc/swruler.cxx4
-rw-r--r--sw/source/uibase/ribbar/drawbase.cxx2
-rw-r--r--sw/source/uibase/ribbar/inputwin.cxx18
-rw-r--r--sw/source/uibase/ribbar/workctrl.cxx18
-rw-r--r--sw/source/uibase/shells/annotsh.cxx4
-rw-r--r--sw/source/uibase/shells/basesh.cxx24
-rw-r--r--sw/source/uibase/shells/drawsh.cxx2
-rw-r--r--sw/source/uibase/shells/frmsh.cxx6
-rw-r--r--sw/source/uibase/shells/tabsh.cxx2
-rw-r--r--sw/source/uibase/shells/textfld.cxx4
-rw-r--r--sw/source/uibase/shells/textsh.cxx4
-rw-r--r--sw/source/uibase/shells/textsh1.cxx12
-rw-r--r--sw/source/uibase/sidebar/PageMarginControl.cxx12
-rw-r--r--sw/source/uibase/uiview/pview.cxx2
-rw-r--r--sw/source/uibase/uiview/srcview.cxx12
-rw-r--r--sw/source/uibase/uiview/uivwimp.cxx2
-rw-r--r--sw/source/uibase/uiview/view2.cxx24
-rw-r--r--sw/source/uibase/uiview/viewdlg2.cxx2
-rw-r--r--sw/source/uibase/uiview/viewling.cxx6
-rw-r--r--sw/source/uibase/uiview/viewprt.cxx4
-rw-r--r--sw/source/uibase/uiview/viewsrch.cxx4
-rw-r--r--sw/source/uibase/uno/unotxdoc.cxx18
-rw-r--r--sw/source/uibase/utlui/attrdesc.cxx84
-rw-r--r--sw/source/uibase/utlui/bookctrl.cxx4
-rw-r--r--sw/source/uibase/utlui/content.cxx30
-rw-r--r--sw/source/uibase/utlui/glbltree.cxx2
-rw-r--r--sw/source/uibase/utlui/initui.cxx64
-rw-r--r--sw/source/uibase/utlui/navipi.cxx10
-rw-r--r--sw/source/uibase/utlui/numfmtlb.cxx6
-rw-r--r--sw/source/uibase/utlui/tmplctrl.cxx2
-rw-r--r--sw/source/uibase/utlui/uiitems.cxx2
-rw-r--r--sw/source/uibase/utlui/unotools.cxx20
-rw-r--r--sw/source/uibase/utlui/viewlayoutctrl.cxx6
-rw-r--r--sw/source/uibase/utlui/wordcountctrl.cxx2
-rw-r--r--sw/source/uibase/web/wdocsh.cxx6
-rw-r--r--sw/source/uibase/wrtsh/wrtsh1.cxx28
-rw-r--r--sw/source/uibase/wrtsh/wrtundo.cxx4
-rw-r--r--tools/source/rc/resmgr.cxx2
-rw-r--r--vcl/source/app/stdtext.cxx2
-rw-r--r--vcl/source/app/svapp.cxx12
-rw-r--r--vcl/source/control/button.cxx2
-rw-r--r--vcl/source/edit/textundo.cxx4
-rw-r--r--vcl/source/outdev/font.cxx2
-rw-r--r--vcl/source/window/brdwin.cxx2
-rw-r--r--vcl/source/window/menubarwindow.cxx6
-rw-r--r--vcl/source/window/msgbox.cxx4
-rw-r--r--vcl/source/window/printdlg.cxx8
-rw-r--r--vcl/source/window/splitwin.cxx2
-rw-r--r--vcl/unx/gtk/fpicker/resourceprovider.cxx2
-rw-r--r--vcl/unx/gtk/gtksalframe.cxx10
-rw-r--r--vcl/unx/gtk3/gtk3gtkframe.cxx10
-rw-r--r--vcl/unx/kde4/KDE4FilePicker.cxx2
-rw-r--r--writerperfect/inc/WPFTResMgr.hxx6
-rw-r--r--writerperfect/source/calc/MSWorksCalcImportFilter.cxx8
-rw-r--r--writerperfect/source/writer/MSWorksImportFilter.cxx8
-rw-r--r--xmlsecurity/inc/resourcemanager.hxx5
-rw-r--r--xmlsecurity/source/component/documentdigitalsignatures.cxx2
-rw-r--r--xmlsecurity/source/dialogs/certificateviewer.cxx28
-rw-r--r--xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx4
650 files changed, 2943 insertions, 3007 deletions
diff --git a/avmedia/source/framework/MediaControlBase.cxx b/avmedia/source/framework/MediaControlBase.cxx
index b828efb990b6..c4174f0304d4 100644
--- a/avmedia/source/framework/MediaControlBase.cxx
+++ b/avmedia/source/framework/MediaControlBase.cxx
@@ -97,27 +97,27 @@ void MediaControlBase::UpdateTimeSlider( MediaItem aMediaItem )
void MediaControlBase::InitializeWidgets()
{
- mpPlayToolBox->InsertItem( AVMEDIA_TOOLBOXITEM_PLAY, GetImage(AVMEDIA_TOOLBOXITEM_PLAY), OUString( AVMEDIA_RESID( AVMEDIA_STR_PLAY ) ), ToolBoxItemBits::CHECKABLE );
+ mpPlayToolBox->InsertItem( AVMEDIA_TOOLBOXITEM_PLAY, GetImage(AVMEDIA_TOOLBOXITEM_PLAY), OUString( AvmResId( AVMEDIA_STR_PLAY ) ), ToolBoxItemBits::CHECKABLE );
mpPlayToolBox->SetHelpId( AVMEDIA_TOOLBOXITEM_PLAY, HID_AVMEDIA_TOOLBOXITEM_PLAY );
- mpPlayToolBox->InsertItem( AVMEDIA_TOOLBOXITEM_PAUSE, GetImage(AVMEDIA_TOOLBOXITEM_PAUSE), OUString( AVMEDIA_RESID( AVMEDIA_STR_PAUSE ) ), ToolBoxItemBits::CHECKABLE );
+ mpPlayToolBox->InsertItem( AVMEDIA_TOOLBOXITEM_PAUSE, GetImage(AVMEDIA_TOOLBOXITEM_PAUSE), OUString( AvmResId( AVMEDIA_STR_PAUSE ) ), ToolBoxItemBits::CHECKABLE );
mpPlayToolBox->SetHelpId( AVMEDIA_TOOLBOXITEM_PAUSE, HID_AVMEDIA_TOOLBOXITEM_PAUSE );
- mpPlayToolBox->InsertItem( AVMEDIA_TOOLBOXITEM_STOP, GetImage(AVMEDIA_TOOLBOXITEM_STOP), OUString( AVMEDIA_RESID( AVMEDIA_STR_STOP ) ), ToolBoxItemBits::CHECKABLE );
+ mpPlayToolBox->InsertItem( AVMEDIA_TOOLBOXITEM_STOP, GetImage(AVMEDIA_TOOLBOXITEM_STOP), OUString( AvmResId( AVMEDIA_STR_STOP ) ), ToolBoxItemBits::CHECKABLE );
mpPlayToolBox->SetHelpId( AVMEDIA_TOOLBOXITEM_STOP, HID_AVMEDIA_TOOLBOXITEM_STOP );
mpPlayToolBox->InsertSeparator();
- mpPlayToolBox->InsertItem( AVMEDIA_TOOLBOXITEM_LOOP, GetImage(AVMEDIA_TOOLBOXITEM_LOOP), OUString( AVMEDIA_RESID( AVMEDIA_STR_LOOP ) ) );
+ mpPlayToolBox->InsertItem( AVMEDIA_TOOLBOXITEM_LOOP, GetImage(AVMEDIA_TOOLBOXITEM_LOOP), OUString( AvmResId( AVMEDIA_STR_LOOP ) ) );
mpPlayToolBox->SetHelpId( AVMEDIA_TOOLBOXITEM_LOOP, HID_AVMEDIA_TOOLBOXITEM_LOOP );
- mpMuteToolBox->InsertItem( AVMEDIA_TOOLBOXITEM_MUTE, GetImage(AVMEDIA_TOOLBOXITEM_MUTE), OUString( AVMEDIA_RESID( AVMEDIA_STR_MUTE ) ) );
+ mpMuteToolBox->InsertItem( AVMEDIA_TOOLBOXITEM_MUTE, GetImage(AVMEDIA_TOOLBOXITEM_MUTE), OUString( AvmResId( AVMEDIA_STR_MUTE ) ) );
mpMuteToolBox->SetHelpId( AVMEDIA_TOOLBOXITEM_MUTE, HID_AVMEDIA_TOOLBOXITEM_MUTE );
- mpZoomListBox->InsertEntry( OUString( AVMEDIA_RESID( AVMEDIA_STR_ZOOM_50 ) ), AVMEDIA_ZOOMLEVEL_50 );
- mpZoomListBox->InsertEntry( OUString( AVMEDIA_RESID( AVMEDIA_STR_ZOOM_100 ) ), AVMEDIA_ZOOMLEVEL_100 );
- mpZoomListBox->InsertEntry( OUString( AVMEDIA_RESID( AVMEDIA_STR_ZOOM_200 ) ), AVMEDIA_ZOOMLEVEL_200 );
- mpZoomListBox->InsertEntry( OUString( AVMEDIA_RESID( AVMEDIA_STR_ZOOM_FIT ) ), AVMEDIA_ZOOMLEVEL_FIT );
+ mpZoomListBox->InsertEntry( OUString( AvmResId( AVMEDIA_STR_ZOOM_50 ) ), AVMEDIA_ZOOMLEVEL_50 );
+ mpZoomListBox->InsertEntry( OUString( AvmResId( AVMEDIA_STR_ZOOM_100 ) ), AVMEDIA_ZOOMLEVEL_100 );
+ mpZoomListBox->InsertEntry( OUString( AvmResId( AVMEDIA_STR_ZOOM_200 ) ), AVMEDIA_ZOOMLEVEL_200 );
+ mpZoomListBox->InsertEntry( OUString( AvmResId( AVMEDIA_STR_ZOOM_FIT ) ), AVMEDIA_ZOOMLEVEL_FIT );
mpZoomListBox->SetHelpId( HID_AVMEDIA_ZOOMLISTBOX );
const OUString aTimeText( " 00:00:00/00:00:00 " );
diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx
index 698042eb9a73..be6528b44e8b 100644
--- a/avmedia/source/framework/mediacontrol.cxx
+++ b/avmedia/source/framework/mediacontrol.cxx
@@ -89,7 +89,7 @@ MediaControl::MediaControl( vcl::Window* pParent, MediaControlStyle eControlStyl
mpZoomListBox->SetSizePixel( Size( mpTimeEdit->GetSizePixel().Width(), 260 ) );
mpZoomListBox->SetSelectHdl( LINK( this, MediaControl, implZoomSelectHdl ) );
- mpZoomToolBox->InsertItem( AVMEDIA_TOOLBOXITEM_ZOOM, OUString( AVMEDIA_RESID( AVMEDIA_STR_ZOOM ) ) );
+ mpZoomToolBox->InsertItem( AVMEDIA_TOOLBOXITEM_ZOOM, OUString( AvmResId( AVMEDIA_STR_ZOOM ) ) );
mpZoomToolBox->SetHelpId( AVMEDIA_TOOLBOXITEM_ZOOM, HID_AVMEDIA_ZOOMLISTBOX );
mpZoomToolBox->SetItemWindow( AVMEDIA_TOOLBOXITEM_ZOOM, mpZoomListBox );
@@ -98,7 +98,7 @@ MediaControl::MediaControl( vcl::Window* pParent, MediaControlStyle eControlStyl
mpZoomToolBox->Show();
maMinSize.Width() += mpZoomToolBox->GetSizePixel().Width();
- const OUString aMediaPath( AVMEDIA_RESID( AVMEDIA_MEDIA_PATH_DEFAULT ) );
+ const OUString aMediaPath( AvmResId( AVMEDIA_MEDIA_PATH_DEFAULT ) );
mpMediaPath->SetText(aMediaPath);
mpMediaPath->SetUpdateMode( false );
mpMediaPath->SetSizePixel( Size( mpMediaPath->GetTextWidth( aMediaPath ) + 400, mpPlayToolBox->GetSizePixel().Height() ) ); // maybe extend the no. 400 to span the screen width
@@ -123,9 +123,9 @@ void MediaControl::InitializeWidgets()
{
if( meControlStyle != MEDIACONTROLSTYLE_SINGLELINE )
{
- mpPlayToolBox->InsertItem( AVMEDIA_TOOLBOXITEM_OPEN, GetImage(AVMEDIA_TOOLBOXITEM_OPEN), OUString( AVMEDIA_RESID( AVMEDIA_STR_OPEN ) ) );
+ mpPlayToolBox->InsertItem( AVMEDIA_TOOLBOXITEM_OPEN, GetImage(AVMEDIA_TOOLBOXITEM_OPEN), OUString( AvmResId( AVMEDIA_STR_OPEN ) ) );
mpPlayToolBox->SetHelpId( AVMEDIA_TOOLBOXITEM_OPEN, HID_AVMEDIA_TOOLBOXITEM_OPEN );
- mpPlayToolBox->InsertItem( AVMEDIA_TOOLBOXITEM_INSERT, GetImage(AVMEDIA_TOOLBOXITEM_INSERT), OUString( AVMEDIA_RESID( AVMEDIA_STR_INSERT ) ) );
+ mpPlayToolBox->InsertItem( AVMEDIA_TOOLBOXITEM_INSERT, GetImage(AVMEDIA_TOOLBOXITEM_INSERT), OUString( AvmResId( AVMEDIA_STR_INSERT ) ) );
mpPlayToolBox->SetHelpId( AVMEDIA_TOOLBOXITEM_INSERT, HID_AVMEDIA_TOOLBOXITEM_INSERT );
mpPlayToolBox->InsertSeparator();
}
@@ -170,7 +170,7 @@ const Size& MediaControl::getMinSizePixel() const
void MediaControl::UpdateURLField(MediaItem tempItem)
{
- const OUString aURL( OUString(AVMEDIA_RESID(AVMEDIA_MEDIA_PATH)) + ": " + tempItem.getURL() ) ;
+ const OUString aURL( OUString(AvmResId(AVMEDIA_MEDIA_PATH)) + ": " + tempItem.getURL() ) ;
mpMediaPath->SetText(aURL);
mpMediaPath->SetUpdateMode( false );
mpMediaPath->SetSizePixel( Size( mpMediaPath->GetTextWidth( aURL ) + 8, mpPlayToolBox->GetSizePixel().Height() ) );
diff --git a/avmedia/source/framework/mediaplayer.cxx b/avmedia/source/framework/mediaplayer.cxx
index 881ce0760244..0a0c86f88c8c 100644
--- a/avmedia/source/framework/mediaplayer.cxx
+++ b/avmedia/source/framework/mediaplayer.cxx
@@ -57,7 +57,7 @@ MediaFloater::MediaFloater( SfxBindings* _pBindings, SfxChildWindow* pCW, vcl::W
SetPosSizePixel( Point( 0, 0 ), aSize );
SetMinOutputSizePixel( aSize );
- SetText( OUString( AVMEDIA_RESID( AVMEDIA_STR_MEDIAPLAYER ) ) );
+ SetText( OUString( AvmResId( AVMEDIA_STR_MEDIAPLAYER ) ) );
mpMediaWindow->show();
}
diff --git a/avmedia/source/inc/mediamisc.hxx b/avmedia/source/inc/mediamisc.hxx
index f6db84cc2ecb..aefc6ac49c0b 100644
--- a/avmedia/source/inc/mediamisc.hxx
+++ b/avmedia/source/inc/mediamisc.hxx
@@ -21,10 +21,17 @@
#define INCLUDED_AVMEDIA_SOURCE_INC_MEDIAMISC_HXX
#include <config_features.h>
+#include <tools/resid.hxx>
-class ResMgr;
+namespace avmedia
+{
+ ResMgr* GetResMgr();
+}
-#define AVMEDIA_RESID( nId ) ResId( nId, * ::avmedia::GetResMgr() )
+inline OUString AvmResId(sal_uInt16 nId)
+{
+ return ResId(nId, * ::avmedia::GetResMgr());
+}
#define AVMEDIA_MANAGER_SERVICE_PREFERRED "com.sun.star.comp.avmedia.Manager_VLC"
#ifdef _WIN32
@@ -48,12 +55,6 @@ class ResMgr;
#define AVMEDIA_MIMETYPE_JSON "model/vnd.gltf+json"
#endif
-
-namespace avmedia
-{
- ResMgr* GetResMgr();
-}
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx
index 811ac0e1f7d5..8145cea56b32 100644
--- a/avmedia/source/viewer/mediawindow.cxx
+++ b/avmedia/source/viewer/mediawindow.cxx
@@ -219,7 +219,7 @@ bool MediaWindow::executeMediaURLDialog(OUString& rURL, bool *const o_pbLink)
static const char aSeparator[] = ";";
OUString aAllTypes;
- aDlg.SetTitle( AVMEDIA_RESID( (o_pbLink)
+ aDlg.SetTitle( AvmResId( (o_pbLink)
? AVMEDIA_STR_INSERTMEDIA_DLG : AVMEDIA_STR_OPENMEDIA_DLG ) );
getMediaFilters( aFilters );
@@ -236,7 +236,7 @@ bool MediaWindow::executeMediaURLDialog(OUString& rURL, bool *const o_pbLink)
}
// add filter for all media types
- aDlg.AddFilter( AVMEDIA_RESID( AVMEDIA_STR_ALL_MEDIAFILES ), aAllTypes );
+ aDlg.AddFilter( AvmResId( AVMEDIA_STR_ALL_MEDIAFILES ), aAllTypes );
for( FilterNameVector::size_type i = 0; i < aFilters.size(); ++i )
{
@@ -255,7 +255,7 @@ bool MediaWindow::executeMediaURLDialog(OUString& rURL, bool *const o_pbLink)
}
// add filter for all types
- aDlg.AddFilter( AVMEDIA_RESID( AVMEDIA_STR_ALL_FILES ), "*.*" );
+ aDlg.AddFilter( AvmResId( AVMEDIA_STR_ALL_FILES ), "*.*" );
uno::Reference<ui::dialogs::XFilePicker2> const xFP(aDlg.GetFilePicker());
uno::Reference<ui::dialogs::XFilePickerControlAccess> const xCtrlAcc(xFP,
@@ -297,7 +297,7 @@ bool MediaWindow::executeMediaURLDialog(OUString& rURL, bool *const o_pbLink)
void MediaWindow::executeFormatErrorBox( vcl::Window* pParent )
{
- ScopedVclPtrInstance< MessageDialog > aErrBox( pParent, AVMEDIA_RESID( AVMEDIA_STR_ERR_URL ) );
+ ScopedVclPtrInstance< MessageDialog > aErrBox( pParent, AvmResId( AVMEDIA_STR_ERR_URL ) );
aErrBox->Execute();
aErrBox.disposeAndClear();
diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx
index 6dee3ba0f564..f182f15ba311 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -711,7 +711,7 @@ LibInfo::Item::~Item ()
bool QueryDel( const OUString& rName, const ResId& rId, vcl::Window* pParent )
{
- OUString aQuery(rId.toString());
+ OUString aQuery(rId);
OUStringBuffer aNameBuf( rName );
aNameBuf.append('\'');
aNameBuf.insert(0, '\'');
diff --git a/basic/source/runtime/basrdll.cxx b/basic/source/runtime/basrdll.cxx
index f2f2a68961ea..c9e4a153338d 100644
--- a/basic/source/runtime/basrdll.cxx
+++ b/basic/source/runtime/basrdll.cxx
@@ -104,7 +104,7 @@ void BasicDLL::BasicBreak()
{
bJustStopping = true;
StarBASIC::Stop();
- ScopedVclPtrInstance<InfoBox>(nullptr, BasResId(IDS_SBERR_TERMINATED).toString())->Execute();
+ ScopedVclPtrInstance<InfoBox>(nullptr, BasResId(IDS_SBERR_TERMINATED))->Execute();
bJustStopping = false;
}
}
diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx
index 5e73e62f2db7..8a5d59573d2d 100644
--- a/basic/source/sbx/sbxscan.cxx
+++ b/basic/source/sbx/sbxscan.cxx
@@ -826,13 +826,13 @@ void SbxValue::Format( OUString& rRes, const OUString* pFmt ) const
// initialize the Basic-formater help object:
// get resources for predefined output
// of the Format()-command, e. g. for "On/Off"
- OUString aOnStrg = SbxValueFormatResId(STR_BASICKEY_FORMAT_ON).toString();
- OUString aOffStrg = SbxValueFormatResId(STR_BASICKEY_FORMAT_OFF).toString();
- OUString aYesStrg = SbxValueFormatResId(STR_BASICKEY_FORMAT_YES).toString();
- OUString aNoStrg = SbxValueFormatResId(STR_BASICKEY_FORMAT_NO).toString();
- OUString aTrueStrg = SbxValueFormatResId(STR_BASICKEY_FORMAT_TRUE).toString();
- OUString aFalseStrg = SbxValueFormatResId(STR_BASICKEY_FORMAT_FALSE).toString();
- OUString aCurrencyFormatStrg = SbxValueFormatResId(STR_BASICKEY_FORMAT_CURRENCY).toString();
+ OUString aOnStrg = SbxValueFormatResId(STR_BASICKEY_FORMAT_ON);
+ OUString aOffStrg = SbxValueFormatResId(STR_BASICKEY_FORMAT_OFF);
+ OUString aYesStrg = SbxValueFormatResId(STR_BASICKEY_FORMAT_YES);
+ OUString aNoStrg = SbxValueFormatResId(STR_BASICKEY_FORMAT_NO);
+ OUString aTrueStrg = SbxValueFormatResId(STR_BASICKEY_FORMAT_TRUE);
+ OUString aFalseStrg = SbxValueFormatResId(STR_BASICKEY_FORMAT_FALSE);
+ OUString aCurrencyFormatStrg = SbxValueFormatResId(STR_BASICKEY_FORMAT_CURRENCY);
rAppData.pBasicFormater = o3tl::make_unique<SbxBasicFormater>(
cComma,c1000,aOnStrg,aOffStrg,
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
index 188eb1409974..6c4a4814ae61 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
@@ -106,13 +106,13 @@ namespace
{
OUString lcl_makeColorName(const Color& rColor)
{
- OUString aStr = SVX_RESSTR(RID_SVXFLOAT3D_FIX_R) +
+ OUString aStr = SvxResId(RID_SVXFLOAT3D_FIX_R) +
OUString::number(rColor.GetRed()) +
" " +
- SVX_RESSTR(RID_SVXFLOAT3D_FIX_G) +
+ SvxResId(RID_SVXFLOAT3D_FIX_G) +
OUString::number(rColor.GetGreen()) +
" " +
- SVX_RESSTR(RID_SVXFLOAT3D_FIX_B) +
+ SvxResId(RID_SVXFLOAT3D_FIX_B) +
OUString::number(rColor.GetBlue());
return aStr;
}
diff --git a/chart2/source/controller/main/ChartController_Tools.cxx b/chart2/source/controller/main/ChartController_Tools.cxx
index 489dbf02bbb9..6c98f4f77015 100644
--- a/chart2/source/controller/main/ChartController_Tools.cxx
+++ b/chart2/source/controller/main/ChartController_Tools.cxx
@@ -385,7 +385,7 @@ void ChartController::impl_PasteShapes( SdrModel* pModel )
if ( pDestPage )
{
Reference< drawing::XShape > xSelShape;
- m_pDrawViewWrapper->BegUndo( SVX_RESSTR( RID_SVX_3D_UNDO_EXCHANGE_PASTE ) );
+ m_pDrawViewWrapper->BegUndo( SvxResId( RID_SVX_3D_UNDO_EXCHANGE_PASTE ) );
sal_uInt16 nCount = pModel->GetPageCount();
for ( sal_uInt16 i = 0; i < nCount; ++i )
{
@@ -470,7 +470,7 @@ void ChartController::impl_PasteStringAsTextShape( const OUString& rString, cons
SdrObject* pObj = DrawViewWrapper::getSdrObject( xTextShape );
if ( pObj )
{
- m_pDrawViewWrapper->BegUndo( SVX_RESSTR( RID_SVX_3D_UNDO_EXCHANGE_PASTE ) );
+ m_pDrawViewWrapper->BegUndo( SvxResId( RID_SVX_3D_UNDO_EXCHANGE_PASTE ) );
m_pDrawViewWrapper->AddUndo( new SdrUndoInsertObj( *pObj ) );
m_pDrawViewWrapper->EndUndo();
diff --git a/chart2/source/controller/main/DrawCommandDispatch.cxx b/chart2/source/controller/main/DrawCommandDispatch.cxx
index 22f3bb95ad29..d1e6488c052c 100644
--- a/chart2/source/controller/main/DrawCommandDispatch.cxx
+++ b/chart2/source/controller/main/DrawCommandDispatch.cxx
@@ -93,7 +93,7 @@ bool DrawCommandDispatch::isFeatureSupported( const OUString& rCommandURL )
XLineEndListRef pLineEndList = rModel.GetLineEndList();
if ( pLineEndList.is() )
{
- OUString aName( SVX_RESSTR( nResId ) );
+ OUString aName( SvxResId( nResId ) );
long nCount = pLineEndList->Count();
for ( long nIndex = 0; nIndex < nCount; ++nIndex )
{
@@ -215,7 +215,7 @@ void DrawCommandDispatch::setLineEnds( SfxItemSet& rAttr )
}
}
- rAttr.Put( XLineEndItem( SVX_RESSTR( RID_SVXSTR_ARROW ), aArrow ) );
+ rAttr.Put( XLineEndItem( SvxResId( RID_SVXSTR_ARROW ), aArrow ) );
rAttr.Put( XLineEndWidthItem( nWidth ) );
}
}
diff --git a/chart2/source/controller/main/UndoCommandDispatch.cxx b/chart2/source/controller/main/UndoCommandDispatch.cxx
index ed78d54188eb..25ff8605d9f7 100644
--- a/chart2/source/controller/main/UndoCommandDispatch.cxx
+++ b/chart2/source/controller/main/UndoCommandDispatch.cxx
@@ -69,9 +69,9 @@ void UndoCommandDispatch::fireStatusEvent(
const bool bFireAll = rURL.isEmpty();
uno::Any aUndoState, aRedoState;
if( m_xUndoManager->isUndoPossible())
- aUndoState <<= ( SVT_RESSTR( STR_UNDO ) + m_xUndoManager->getCurrentUndoActionTitle());
+ aUndoState <<= ( SvtResId( STR_UNDO ) + m_xUndoManager->getCurrentUndoActionTitle());
if( m_xUndoManager->isRedoPossible())
- aRedoState <<= ( SVT_RESSTR( STR_REDO ) + m_xUndoManager->getCurrentRedoActionTitle());
+ aRedoState <<= ( SvtResId( STR_REDO ) + m_xUndoManager->getCurrentRedoActionTitle());
if( bFireAll || rURL == ".uno:Undo" )
fireStatusEventForURL( ".uno:Undo", aUndoState, m_xUndoManager->isUndoPossible(), xSingleListener );
diff --git a/chart2/source/inc/ResId.hxx b/chart2/source/inc/ResId.hxx
index 802eea9c7277..0eefc83d5362 100644
--- a/chart2/source/inc/ResId.hxx
+++ b/chart2/source/inc/ResId.hxx
@@ -19,18 +19,13 @@
#ifndef INCLUDED_CHART2_SOURCE_INC_RESID_HXX
#define INCLUDED_CHART2_SOURCE_INC_RESID_HXX
-#include <tools/resid.hxx>
#include <rtl/ustring.hxx>
#include "charttoolsdllapi.hxx"
namespace chart
{
-class OOO_DLLPUBLIC_CHARTTOOLS SchResId : public ResId
-{
-public:
- SchResId( sal_Int16 nId );
-};
+OUString OOO_DLLPUBLIC_CHARTTOOLS SchResId(sal_uInt16 nId);
} // namespace chart
diff --git a/chart2/source/tools/InternalData.cxx b/chart2/source/tools/InternalData.cxx
index 84e53f2c514e..59d5cb1b6dee 100644
--- a/chart2/source/tools/InternalData.cxx
+++ b/chart2/source/tools/InternalData.cxx
@@ -21,6 +21,7 @@
#include "ResId.hxx"
#include "Strings.hrc"
+#include <osl/diagnose.h>
#include <rtl/math.hxx>
#ifdef DEBUG_CHART2_TOOLS
#define DEBUG_INTERNAL_DATA 1
diff --git a/chart2/source/tools/ResId.cxx b/chart2/source/tools/ResId.cxx
index 61e6755f3e90..6bff5b7efc0e 100644
--- a/chart2/source/tools/ResId.cxx
+++ b/chart2/source/tools/ResId.cxx
@@ -19,15 +19,14 @@
#include "ResId.hxx"
#include "ResourceManager.hxx"
+#include <tools/resid.hxx>
namespace chart
{
-
- SchResId::SchResId( sal_Int16 nId )
- : ResId( nId, ResourceManager::getResourceManager() )
+ OUString SchResId(sal_uInt16 nId)
{
+ return ResId(nId, ResourceManager::getResourceManager());
}
-
} // namespace chart
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index f5d90803fc58..0ee24f8631b1 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -725,9 +725,9 @@ SfxAcceleratorConfigPage::SfxAcceleratorConfigPage( vcl::Window* pParent, const
, m_pStringItem()
, m_pFontItem()
, m_pFileDlg(nullptr)
- , aLoadAccelConfigStr(CUI_RES(RID_SVXSTR_LOADACCELCONFIG))
- , aSaveAccelConfigStr(CUI_RES(RID_SVXSTR_SAVEACCELCONFIG))
- , aFilterCfgStr(CUI_RES(RID_SVXSTR_FILTERNAME_CFG))
+ , aLoadAccelConfigStr(CuiResId(RID_SVXSTR_LOADACCELCONFIG))
+ , aSaveAccelConfigStr(CuiResId(RID_SVXSTR_SAVEACCELCONFIG))
+ , aFilterCfgStr(CuiResId(RID_SVXSTR_FILTERNAME_CFG))
, m_bStylesInfoInitialized(false)
, m_xGlobal()
, m_xModule()
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index d01b948205b3..c28e5f4528fb 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -2283,7 +2283,7 @@ IMPL_LINK_NOARG( SvxConfigPage, AsyncInfoMsg, void*, void )
{
// Asynchronous msg because of D&D
ScopedVclPtrInstance<MessageDialog>(this,
- CUI_RES( RID_SVXSTR_MNUCFG_ALREADY_INCLUDED ),
+ CuiResId( RID_SVXSTR_MNUCFG_ALREADY_INCLUDED ),
VclMessageType::Info)->Execute();
}
@@ -2421,7 +2421,7 @@ SvxMenuConfigPage::SvxMenuConfigPage(vcl::Window *pParent, const SfxItemSet& rSe
if ( !bIsMenuBar )
{
- m_pTopLevel->set_label( CUI_RES( RID_SVXSTR_PRODUCTNAME_CONTEXTMENUS ) );
+ m_pTopLevel->set_label( CuiResId( RID_SVXSTR_PRODUCTNAME_CONTEXTMENUS ) );
m_pNewTopLevelButton->Hide();
pMenu->HideItem( pMenu->GetItemId( "move" ) );
pMenu->HideItem( pMenu->GetItemId( "menuitem3" ) );
@@ -2561,7 +2561,7 @@ void SvxMenuConfigPage::DeleteSelectedContent()
short SvxMenuConfigPage::QueryReset()
{
- OUString msg = CUI_RES( RID_SVXSTR_CONFIRM_MENU_RESET );
+ OUString msg = CuiResId( RID_SVXSTR_CONFIRM_MENU_RESET );
OUString saveInName = m_pSaveInListBox->GetEntry(
m_pSaveInListBox->GetSelectEntryPos() );
@@ -2617,11 +2617,11 @@ IMPL_LINK( SvxMenuConfigPage, MenuSelectHdl, MenuButton *, pButton, void )
SvxConfigEntry* pMenuData = GetTopLevelSelection();
OUString aNewName( stripHotKey( pMenuData->GetName() ) );
- OUString aDesc = CUI_RES( RID_SVXSTR_LABEL_NEW_NAME );
+ OUString aDesc = CuiResId( RID_SVXSTR_LABEL_NEW_NAME );
VclPtrInstance< SvxNameDialog > pNameDialog( this, aNewName, aDesc );
pNameDialog->SetHelpId( HID_SVX_CONFIG_RENAME_MENU );
- pNameDialog->SetText( CUI_RES( RID_SVXSTR_RENAME_MENU ) );
+ pNameDialog->SetText( CuiResId( RID_SVXSTR_RENAME_MENU ) );
if ( pNameDialog->Execute() == RET_OK ) {
pNameDialog->GetName( aNewName );
@@ -2661,11 +2661,11 @@ IMPL_LINK( SvxMenuConfigPage, EntrySelectHdl, MenuButton *, pButton, void )
static_cast<SvxConfigEntry*>(pActEntry->GetUserData());
OUString aNewName( stripHotKey( pEntry->GetName() ) );
- OUString aDesc = CUI_RES( RID_SVXSTR_LABEL_NEW_NAME );
+ OUString aDesc = CuiResId( RID_SVXSTR_LABEL_NEW_NAME );
VclPtrInstance< SvxNameDialog > pNameDialog( this, aNewName, aDesc );
pNameDialog->SetHelpId( HID_SVX_CONFIG_RENAME_MENU_ITEM );
- pNameDialog->SetText( CUI_RES( RID_SVXSTR_RENAME_MENU ) );
+ pNameDialog->SetText( CuiResId( RID_SVXSTR_RENAME_MENU ) );
if ( pNameDialog->Execute() == RET_OK ) {
pNameDialog->GetName(aNewName);
@@ -2716,7 +2716,7 @@ IMPL_LINK_NOARG( SvxMenuConfigPage, AddCommandsHdl, Button *, void )
m_pSelectorDlg->SetAddHdl(
LINK( this, SvxMenuConfigPage, AddFunctionHdl ) );
- m_pSelectorDlg->SetDialogDescription( CUI_RES( RID_SVXSTR_MENU_ADDCOMMANDS_DESCRIPTION ) );
+ m_pSelectorDlg->SetDialogDescription( CuiResId( RID_SVXSTR_MENU_ADDCOMMANDS_DESCRIPTION ) );
}
// Position the Script Selector over the Add button so it is
@@ -2743,11 +2743,11 @@ IMPL_LINK_NOARG( SvxMenuConfigPage, AddSeparatorHdl, Button *, void )
IMPL_LINK_NOARG( SvxMenuConfigPage, AddSubmenuHdl, Button *, void )
{
OUString aNewName;
- OUString aDesc = CUI_RES( RID_SVXSTR_SUBMENU_NAME );
+ OUString aDesc = CuiResId( RID_SVXSTR_SUBMENU_NAME );
VclPtrInstance< SvxNameDialog > pNameDialog( this, aNewName, aDesc );
pNameDialog->SetHelpId( HID_SVX_CONFIG_NAME_SUBMENU );
- pNameDialog->SetText( CUI_RES( RID_SVXSTR_ADD_SUBMENU ) );
+ pNameDialog->SetText( CuiResId( RID_SVXSTR_ADD_SUBMENU ) );
if ( pNameDialog->Execute() == RET_OK )
{
@@ -2828,7 +2828,7 @@ SvxMainMenuOrganizerDialog::SvxMainMenuOrganizerDialog(
if ( bCreateMenu )
{
// Generate custom name for new menu
- OUString prefix = CUI_RES( RID_SVXSTR_NEW_MENU );
+ OUString prefix = CuiResId( RID_SVXSTR_NEW_MENU );
OUString newname = generateCustomName( prefix, entries );
OUString newurl = generateCustomMenuURL( mpEntries );
@@ -2859,7 +2859,7 @@ SvxMainMenuOrganizerDialog::SvxMainMenuOrganizerDialog(
// hide name label and textfield
m_pMenuBox->Hide();
// change the title
- SetText( CUI_RES( RID_SVXSTR_MOVE_MENU ) );
+ SetText( CuiResId( RID_SVXSTR_MOVE_MENU ) );
}
m_pMenuListBox->SetSelectHdl(
@@ -3072,12 +3072,12 @@ SvxToolbarConfigPage::SvxToolbarConfigPage(vcl::Window *pParent, const SfxItemSe
m_pMoveDownButton->SetHelpId( HID_SVX_DOWN_TOOLBAR_ITEM );
m_pDescriptionField->SetHelpId ( HID_SVX_DESCFIELD );
- m_pTopLevel->set_label(CUI_RES(RID_SVXSTR_PRODUCTNAME_TOOLBARS));
+ m_pTopLevel->set_label(CuiResId(RID_SVXSTR_PRODUCTNAME_TOOLBARS));
- m_pTopLevelLabel->SetText( CUI_RES( RID_SVXSTR_TOOLBAR ) );
- m_pModifyTopLevelButton->SetText( CUI_RES( RID_SVXSTR_TOOLBAR ) );
- m_pContents->set_label(CUI_RES(RID_SVXSTR_TOOLBAR_CONTENT));
- m_pContentsLabel->SetText( CUI_RES( RID_SVXSTR_COMMANDS ) );
+ m_pTopLevelLabel->SetText( CuiResId( RID_SVXSTR_TOOLBAR ) );
+ m_pModifyTopLevelButton->SetText( CuiResId( RID_SVXSTR_TOOLBAR ) );
+ m_pContents->set_label(CuiResId(RID_SVXSTR_TOOLBAR_CONTENT));
+ m_pContentsLabel->SetText( CuiResId( RID_SVXSTR_COMMANDS ) );
// The reset button will be used in the toolbar config tab
m_pResetTopLevelButton->Show();
@@ -3239,7 +3239,7 @@ void SvxToolbarConfigPage::DeleteSelectedContent()
GetTopLevelSelection()->IsDeletable() )
{
ScopedVclPtrInstance<MessageDialog> qbox(this,
- CUI_RES(RID_SXVSTR_CONFIRM_DELETE_TOOLBAR), VclMessageType::Question, VclButtonsType::YesNo);
+ CuiResId(RID_SXVSTR_CONFIRM_DELETE_TOOLBAR), VclMessageType::Question, VclButtonsType::YesNo);
if ( qbox->Execute() == RET_YES )
{
@@ -3288,11 +3288,11 @@ IMPL_LINK( SvxToolbarConfigPage, ToolbarSelectHdl, MenuButton *, pButton, void )
else if (sCommand == "modtoolrename")
{
OUString aNewName( stripHotKey( pToolbar->GetName() ) );
- OUString aDesc = CUI_RES( RID_SVXSTR_LABEL_NEW_NAME );
+ OUString aDesc = CuiResId( RID_SVXSTR_LABEL_NEW_NAME );
VclPtrInstance< SvxNameDialog > pNameDialog( this, aNewName, aDesc );
pNameDialog->SetHelpId( HID_SVX_CONFIG_RENAME_TOOLBAR );
- pNameDialog->SetText( CUI_RES( RID_SVXSTR_RENAME_TOOLBAR ) );
+ pNameDialog->SetText( CuiResId( RID_SVXSTR_RENAME_TOOLBAR ) );
if ( pNameDialog->Execute() == RET_OK )
{
@@ -3327,11 +3327,11 @@ IMPL_LINK( SvxToolbarConfigPage, EntrySelectHdl, MenuButton *, pButton, void )
static_cast<SvxConfigEntry*>(pActEntry->GetUserData());
OUString aNewName( stripHotKey( pEntry->GetName() ) );
- OUString aDesc = CUI_RES( RID_SVXSTR_LABEL_NEW_NAME );
+ OUString aDesc = CuiResId( RID_SVXSTR_LABEL_NEW_NAME );
VclPtrInstance< SvxNameDialog > pNameDialog( this, aNewName, aDesc );
pNameDialog->SetHelpId( HID_SVX_CONFIG_RENAME_TOOLBAR_ITEM );
- pNameDialog->SetText( CUI_RES( RID_SVXSTR_RENAME_TOOLBAR ) );
+ pNameDialog->SetText( CuiResId( RID_SVXSTR_RENAME_TOOLBAR ) );
if ( pNameDialog->Execute() == RET_OK ) {
pNameDialog->GetName(aNewName);
@@ -4413,7 +4413,7 @@ void SvxToolbarConfigPage::UpdateButtonStates()
short SvxToolbarConfigPage::QueryReset()
{
- OUString msg = CUI_RES( RID_SVXSTR_CONFIRM_TOOLBAR_RESET );
+ OUString msg = CuiResId( RID_SVXSTR_CONFIRM_TOOLBAR_RESET );
OUString saveInName = m_pSaveInListBox->GetEntry(
m_pSaveInListBox->GetSelectEntryPos() );
@@ -4539,7 +4539,7 @@ IMPL_LINK( SvxToolbarConfigPage, StyleChangeHdl, Button*, pButton, void )
IMPL_LINK_NOARG( SvxToolbarConfigPage, NewToolbarHdl, Button *, void )
{
- OUString prefix = CUI_RES( RID_SVXSTR_NEW_TOOLBAR );
+ OUString prefix = CuiResId( RID_SVXSTR_NEW_TOOLBAR );
OUString aNewName =
generateCustomName( prefix, GetSaveInData()->GetEntries() );
@@ -4646,7 +4646,7 @@ IMPL_LINK_NOARG( SvxToolbarConfigPage, ResetTopLevelHdl, Button *, void )
static_cast<SvxConfigEntry*>(m_pTopLevelListBox->GetEntryData( nSelectionPos ));
ScopedVclPtrInstance<MessageDialog> qbox(this,
- CUI_RES(RID_SVXSTR_CONFIRM_RESTORE_DEFAULT), VclMessageType::Question, VclButtonsType::YesNo);
+ CuiResId(RID_SVXSTR_CONFIRM_RESTORE_DEFAULT), VclMessageType::Question, VclButtonsType::YesNo);
if ( qbox->Execute() == RET_YES )
{
@@ -5204,7 +5204,7 @@ IMPL_LINK_NOARG( SvxIconSelectorDialog, ImportHdl, Button *, void)
IMPL_LINK_NOARG( SvxIconSelectorDialog, DeleteHdl, Button *, void )
{
- OUString message = CUI_RES( RID_SVXSTR_DELETE_ICON_CONFIRM );
+ OUString message = CuiResId( RID_SVXSTR_DELETE_ICON_CONFIRM );
if (ScopedVclPtrInstance<WarningBox>(this, WinBits(WB_OK_CANCEL), message)->Execute() == RET_OK)
{
ToolBox::ImplToolItems::size_type nCount = pTbSymbol->GetItemCount();
@@ -5492,21 +5492,21 @@ bool SvxIconSelectorDialog::ImportGraphic( const OUString& aURL )
SvxIconReplacementDialog::SvxIconReplacementDialog(
vcl::Window *pWindow, const OUString& aMessage, bool /*bYestoAll*/ )
:
-MessBox( pWindow, WB_DEF_YES, CUI_RES( RID_SVXSTR_REPLACE_ICON_CONFIRM ), CUI_RES( RID_SVXSTR_REPLACE_ICON_WARNING ) )
+MessBox( pWindow, WB_DEF_YES, CuiResId( RID_SVXSTR_REPLACE_ICON_CONFIRM ), CuiResId( RID_SVXSTR_REPLACE_ICON_WARNING ) )
{
SetImage( WarningBox::GetStandardImage() );
SetMessText( ReplaceIconName( aMessage ) );
RemoveButton( 1 );
AddButton( StandardButtonType::Yes, 2);
- AddButton( CUI_RES( RID_SVXSTR_YESTOALL ), 5);
+ AddButton( CuiResId( RID_SVXSTR_YESTOALL ), 5);
AddButton( StandardButtonType::No, 3);
AddButton( StandardButtonType::Cancel, 4);
}
SvxIconReplacementDialog::SvxIconReplacementDialog(
vcl::Window *pWindow, const OUString& aMessage )
- : MessBox( pWindow, WB_YES_NO_CANCEL, CUI_RES( RID_SVXSTR_REPLACE_ICON_CONFIRM ), CUI_RES( RID_SVXSTR_REPLACE_ICON_WARNING ) )
+ : MessBox( pWindow, WB_YES_NO_CANCEL, CuiResId( RID_SVXSTR_REPLACE_ICON_CONFIRM ), CuiResId( RID_SVXSTR_REPLACE_ICON_WARNING ) )
{
SetImage( WarningBox::GetStandardImage() );
SetMessText( ReplaceIconName( aMessage ));
@@ -5515,7 +5515,7 @@ SvxIconReplacementDialog::SvxIconReplacementDialog(
OUString SvxIconReplacementDialog::ReplaceIconName( const OUString& rMessage )
{
OUString name;
- OUString message = CUI_RES( RID_SVXSTR_REPLACE_ICON_WARNING );
+ OUString message = CuiResId( RID_SVXSTR_REPLACE_ICON_WARNING );
OUString placeholder("%ICONNAME" );
sal_Int32 pos = message.indexOf( placeholder );
if ( pos != -1 )
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index 1d43a3182fac..93e86d1bb437 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -388,11 +388,11 @@ SvxConfigGroupBoxResource_Impl::SvxConfigGroupBoxResource_Impl() :
m_libImage(BitmapEx(RID_CUIBMP_LIB)),
m_macImage(BitmapEx(RID_CUIBMP_MACRO)),
m_docImage(BitmapEx(RID_CUIBMP_DOC)),
- m_sMyMacros(CUI_RES(RID_SVXSTR_MYMACROS)),
- m_sProdMacros(CUI_RES(RID_SVXSTR_PRODMACROS)),
- m_sMacros(CUI_RES(RID_SVXSTR_BASICMACROS)),
- m_sDlgMacros(CUI_RES(RID_SVXSTR_PRODMACROS)),
- m_aStrGroupStyles(CUI_RES(RID_SVXSTR_GROUP_STYLES)),
+ m_sMyMacros(CuiResId(RID_SVXSTR_MYMACROS)),
+ m_sProdMacros(CuiResId(RID_SVXSTR_PRODMACROS)),
+ m_sMacros(CuiResId(RID_SVXSTR_BASICMACROS)),
+ m_sDlgMacros(CuiResId(RID_SVXSTR_PRODMACROS)),
+ m_aStrGroupStyles(CuiResId(RID_SVXSTR_GROUP_STYLES)),
m_collapsedImage(BitmapEx(RID_CUIBMP_COLLAPSED)),
m_expandedImage(BitmapEx(RID_CUIBMP_EXPANDED))
{
@@ -461,7 +461,7 @@ void SfxConfigGroupListBox::InitModule()
if ( c1 )
{
// Add All Commands category
- SvTreeListEntry* pEntry = InsertEntry( CUI_RES(RID_SVXSTR_ALLFUNCTIONS) );
+ SvTreeListEntry* pEntry = InsertEntry( CuiResId(RID_SVXSTR_ALLFUNCTIONS) );
aArr.push_back( o3tl::make_unique<SfxGroupInfo_Impl>( SfxCfgKind::GROUP_ALLFUNCTIONS, 0 ) );
pEntry->SetUserData(aArr.back().get());
}
@@ -1176,7 +1176,7 @@ SvxScriptSelectorDialog::SvxScriptSelectorDialog(
if (m_bShowSlots)
{
// If we are showing Slot API commands update labels in the UI
- SetText(CUI_RES(RID_SVXSTR_SELECTOR_ADD_COMMANDS));
+ SetText(CuiResId(RID_SVXSTR_SELECTOR_ADD_COMMANDS));
get(m_pCancelButton, "close");
get(m_pDialogDescription, "helptoolbar");
get(m_pOKButton, "add");
@@ -1306,7 +1306,7 @@ IMPL_LINK( SvxScriptSelectorDialog, ClickHdl, Button *, pButton, void )
void
SvxScriptSelectorDialog::SetRunLabel()
{
- m_pOKButton->SetText(CUI_RES(RID_SVXSTR_SELECTOR_RUN));
+ m_pOKButton->SetText(CuiResId(RID_SVXSTR_SELECTOR_RUN));
}
void
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index 343fd5dabb10..1175bd9ec45e 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -530,7 +530,7 @@ void SvxMacroTabPage_::DisplayAppEvents( bool appEvents)
}
OUString eventURL = h_it->second.second;
- OUString displayName(CUI_RES(displayableEvent->nEventResourceID));
+ OUString displayName(CuiResId(displayableEvent->nEventResourceID));
displayName += "\t";
diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx
index 01db8f5688e8..e88feb3fafcf 100644
--- a/cui/source/dialogs/cuifmsearch.cxx
+++ b/cui/source/dialogs/cuifmsearch.cxx
@@ -247,7 +247,7 @@ void FmSearchDialog::Init(const OUString& strVisibleFields, const OUString& sIni
RID_STR_SEARCH_WHOLE
};
for (unsigned short nResId : nResIds)
- m_plbPosition->InsertEntry( OUString( CUI_RES( nResId ) ) );
+ m_plbPosition->InsertEntry( OUString( CuiResId( nResId ) ) );
m_plbPosition->SelectEntryPos(MATCHING_ANYWHERE);
// the field listbox
@@ -438,7 +438,7 @@ IMPL_LINK(FmSearchDialog, OnCheckBoxToggled, CheckBox&, rBox, void)
// direction -> pass on and reset the checkbox-text for StartOver
else if (&rBox == m_pcbBackwards)
{
- m_pcbStartOver->SetText( OUString( CUI_RES( bChecked ? RID_STR_FROM_BOTTOM : RID_STR_FROM_TOP ) ) );
+ m_pcbStartOver->SetText( OUString( CuiResId( bChecked ? RID_STR_FROM_BOTTOM : RID_STR_FROM_TOP ) ) );
m_pSearchEngine->SetDirection(!bChecked);
}
// similarity-search or regular expression
@@ -702,7 +702,7 @@ IMPL_LINK(FmSearchDialog, OnSearchProgress, const FmSearchProgress*, pProgress,
case FmSearchProgress::State::Progress:
if (pProgress->bOverflow)
{
- OUString sHint( CUI_RES( m_pcbBackwards->IsChecked() ? RID_STR_OVERFLOW_BACKWARD : RID_STR_OVERFLOW_FORWARD ) );
+ OUString sHint( CuiResId( m_pcbBackwards->IsChecked() ? RID_STR_OVERFLOW_BACKWARD : RID_STR_OVERFLOW_FORWARD ) );
m_pftHint->SetText( sHint );
m_pftHint->Invalidate();
}
@@ -712,7 +712,7 @@ IMPL_LINK(FmSearchDialog, OnSearchProgress, const FmSearchProgress*, pProgress,
break;
case FmSearchProgress::State::ProgressCounting:
- m_pftHint->SetText(CUI_RES(RID_STR_SEARCH_COUNTING));
+ m_pftHint->SetText(CuiResId(RID_STR_SEARCH_COUNTING));
m_pftHint->Invalidate();
m_pftRecord->SetText(OUString::number(pProgress->nCurrentRecord));
@@ -730,7 +730,7 @@ IMPL_LINK(FmSearchDialog, OnSearchProgress, const FmSearchProgress*, pProgress,
sal_uInt16 nErrorId = (FmSearchProgress::State::Error == pProgress->aSearchState)
? RID_STR_SEARCH_GENERAL_ERROR
: RID_STR_SEARCH_NORECORD;
- ScopedVclPtrInstance<MessageDialog>(this, CUI_RES(nErrorId))->Execute();
+ ScopedVclPtrInstance<MessageDialog>(this, CuiResId(nErrorId))->Execute();
SAL_FALLTHROUGH;
}
case FmSearchProgress::State::Canceled:
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index ff298167227d..273363e384cd 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -559,7 +559,7 @@ IMPL_LINK_NOARG(GalleryIdDialog, ClickOkHdl, Button*, void)
if( ( pInfo->GetId() == nId ) && ( pInfo->GetThemeName() != pThm->GetName() ) )
{
- OUString aStr( CUI_RES( RID_SVXSTR_GALLERY_ID_EXISTS ) );
+ OUString aStr( CuiResId( RID_SVXSTR_GALLERY_ID_EXISTS ) );
aStr += " (" + pInfo->GetThemeName() + ")";
@@ -592,7 +592,7 @@ GalleryThemeProperties::GalleryThemeProperties(vcl::Window* pParent,
OUString aText = GetText() + pData->pTheme->GetName();
if( pData->pTheme->IsReadOnly() )
- aText += CUI_RES( RID_SVXSTR_GALLERY_READONLY );
+ aText += CuiResId( RID_SVXSTR_GALLERY_READONLY );
SetText( aText );
}
@@ -645,9 +645,9 @@ void TPGalleryThemeGeneral::SetXChgData( ExchangeData* _pData )
GalleryTheme* pThm = pData->pTheme;
OUString aOutStr( OUString::number(pThm->GetObjectCount()) );
- OUString aObjStr( CUI_RES( RID_SVXSTR_GALLERYPROPS_OBJECT ) );
+ OUString aObjStr( CuiResId( RID_SVXSTR_GALLERYPROPS_OBJECT ) );
OUString aAccess;
- OUString aType( SVX_RES( RID_SVXSTR_GALLERYPROPS_GALTHEME ) );
+ OUString aType( SvxResId( RID_SVXSTR_GALLERYPROPS_GALTHEME ) );
bool bReadOnly = pThm->IsReadOnly();
m_pEdtMSName->SetText( pThm->GetName() );
@@ -659,7 +659,7 @@ void TPGalleryThemeGeneral::SetXChgData( ExchangeData* _pData )
m_pEdtMSName->Enable();
if( pThm->IsReadOnly() )
- aType += CUI_RES( RID_SVXSTR_GALLERY_READONLY );
+ aType += CuiResId( RID_SVXSTR_GALLERY_READONLY );
m_pFtMSShowType->SetText( aType );
m_pFtMSShowPath->SetText( pThm->GetSdgURL().GetMainURL( INetURLObject::DecodeMechanism::Unambiguous ) );
@@ -748,7 +748,7 @@ void TPGalleryThemeProperties::SetXChgData( ExchangeData* _pData )
m_pCbbFileType->EnableDDAutoWidth( false );
m_pLbxFound->SetDoubleClickHdl(LINK(this, TPGalleryThemeProperties, DClickFoundHdl));
m_pLbxFound->SetSelectHdl(LINK(this, TPGalleryThemeProperties, SelectFoundHdl));
- m_pLbxFound->InsertEntry(OUString(CUI_RES(RID_SVXSTR_GALLERY_NOFILES)));
+ m_pLbxFound->InsertEntry(OUString(CuiResId(RID_SVXSTR_GALLERY_NOFILES)));
m_pLbxFound->Show();
FillFilterList();
@@ -947,7 +947,7 @@ void TPGalleryThemeProperties::FillFilterList()
#endif
pFilterEntry = new FilterEntry;
- pFilterEntry->aFilterName = CUI_RES(RID_SVXSTR_GALLERY_ALLFILES);
+ pFilterEntry->aFilterName = CuiResId(RID_SVXSTR_GALLERY_ALLFILES);
pFilterEntry->aFilterName = addExtension( pFilterEntry->aFilterName, aExtensions );
size_t pos = m_pCbbFileType->InsertEntry( pFilterEntry->aFilterName, 0 );
if ( pos < aFilterEntryList.size() ) {
@@ -1182,7 +1182,7 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties, EndSearchProgressHdl, Dialog&, void)
}
else
{
- m_pLbxFound->InsertEntry( OUString( CUI_RES( RID_SVXSTR_GALLERY_NOFILES ) ) );
+ m_pLbxFound->InsertEntry( OUString( CuiResId( RID_SVXSTR_GALLERY_NOFILES ) ) );
m_pBtnTakeAll->Disable();
m_pCbxPreview->Disable();
bEntriesFound = false;
diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx
index 9f9e01406f89..6830ff7b320b 100644
--- a/cui/source/dialogs/cuihyperdlg.cxx
+++ b/cui/source/dialogs/cuihyperdlg.cxx
@@ -98,21 +98,21 @@ SvxHpLinkDlg::SvxHpLinkDlg (vcl::Window* pParent, SfxBindings* pBindings)
aBitmap.Scale(GetDPIScaleFactor(),GetDPIScaleFactor(),BmpScaleFlag::BestQuality);
aImage = Image(aBitmap);
}
- aStrTitle = CUI_RES( RID_SVXSTR_HYPERDLG_HLINETTP );
+ aStrTitle = CuiResId( RID_SVXSTR_HYPERDLG_HLINETTP );
pEntry = AddTabPage ( RID_SVXPAGE_HYPERLINK_INTERNET, aStrTitle, imgVector[0], SvxHyperlinkInternetTp::Create );
- pEntry->SetQuickHelpText( CUI_RES( RID_SVXSTR_HYPERDLG_HLINETTP_HELP ) );
- aStrTitle = CUI_RES( RID_SVXSTR_HYPERDLG_HLMAILTP );
+ pEntry->SetQuickHelpText( CuiResId( RID_SVXSTR_HYPERDLG_HLINETTP_HELP ) );
+ aStrTitle = CuiResId( RID_SVXSTR_HYPERDLG_HLMAILTP );
pEntry = AddTabPage ( RID_SVXPAGE_HYPERLINK_MAIL, aStrTitle, imgVector[1], SvxHyperlinkMailTp::Create );
- pEntry->SetQuickHelpText( CUI_RES( RID_SVXSTR_HYPERDLG_HLMAILTP_HELP ) );
- aStrTitle = CUI_RES( RID_SVXSTR_HYPERDLG_HLDOCTP );
+ pEntry->SetQuickHelpText( CuiResId( RID_SVXSTR_HYPERDLG_HLMAILTP_HELP ) );
+ aStrTitle = CuiResId( RID_SVXSTR_HYPERDLG_HLDOCTP );
pEntry = AddTabPage ( RID_SVXPAGE_HYPERLINK_DOCUMENT, aStrTitle, imgVector[2], SvxHyperlinkDocTp::Create );
- pEntry->SetQuickHelpText( CUI_RES( RID_SVXSTR_HYPERDLG_HLDOCTP_HELP ) );
- aStrTitle = CUI_RES( RID_SVXSTR_HYPERDLG_HLDOCNTP );
+ pEntry->SetQuickHelpText( CuiResId( RID_SVXSTR_HYPERDLG_HLDOCTP_HELP ) );
+ aStrTitle = CuiResId( RID_SVXSTR_HYPERDLG_HLDOCNTP );
pEntry = AddTabPage ( RID_SVXPAGE_HYPERLINK_NEWDOCUMENT, aStrTitle, imgVector[3], SvxHyperlinkNewDocTp::Create );
- pEntry->SetQuickHelpText( CUI_RES( RID_SVXSTR_HYPERDLG_HLDOCNTP_HELP ) );
+ pEntry->SetQuickHelpText( CuiResId( RID_SVXSTR_HYPERDLG_HLDOCNTP_HELP ) );
// set OK/Cancel - button
- GetCancelButton().SetText ( CUI_RES(RID_SVXSTR_HYPDLG_CLOSEBUT) );
+ GetCancelButton().SetText ( CuiResId(RID_SVXSTR_HYPDLG_CLOSEBUT) );
// create itemset for tabpages
mpItemSet = new SfxItemSet( SfxGetpApp()->GetPool(), SID_HYPERLINK_GETLINK,
diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx
index cb959b327987..dc33da086b0b 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -574,8 +574,8 @@ namespace svx
m_pSuggestions->set_height_request( m_pSuggestions->GetTextHeight() * 5 );
m_pSuggestions->set_width_request( m_pSuggestions->approximate_char_width() * 48 );
- const OUString sHangul(CUI_RES(RID_SVXSTR_HANGUL));
- const OUString sHanja(CUI_RES(RID_SVXSTR_HANJA));
+ const OUString sHangul(CuiResId(RID_SVXSTR_HANGUL));
+ const OUString sHanja(CuiResId(RID_SVXSTR_HANJA));
m_pHanjaAbove->init( sHangul, sHanja, PseudoRubyText::eAbove );
m_pHanjaBelow->init( sHangul, sHanja, PseudoRubyText::eBelow );
m_pHangulAbove->init( sHanja, sHangul, PseudoRubyText::eAbove );
@@ -1730,7 +1730,7 @@ namespace svx
HangulHanjaEditDictDialog::HangulHanjaEditDictDialog( vcl::Window* _pParent, HHDictList& _rDictList, sal_uInt32 _nSelDict )
:ModalDialog ( _pParent, "HangulHanjaEditDictDialog", "cui/ui/hangulhanjaeditdictdialog.ui" )
- ,m_aEditHintText ( CUI_RES(RID_SVXSTR_EDITHINT) )
+ ,m_aEditHintText ( CuiResId(RID_SVXSTR_EDITHINT) )
,m_rDictList ( _rDictList )
,m_nCurrentDict ( 0xFFFFFFFF )
,m_pSuggestions ( nullptr )
diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx
index 112c27359e82..d37c5991ce80 100644
--- a/cui/source/dialogs/hldocntp.cxx
+++ b/cui/source/dialogs/hldocntp.cxx
@@ -275,7 +275,7 @@ bool SvxHyperlinkNewDocTp::AskApply()
bool bRet = ImplGetURLObject( m_pCbbPath->GetText(), m_pCbbPath->GetBaseURL(), aINetURLObject );
if ( !bRet )
{
- ScopedVclPtrInstance< WarningBox > aWarning( this, WB_OK, CUI_RES(RID_SVXSTR_HYPDLG_NOVALIDFILENAME) );
+ ScopedVclPtrInstance< WarningBox > aWarning( this, WB_OK, CuiResId(RID_SVXSTR_HYPDLG_NOVALIDFILENAME) );
aWarning->Execute();
}
return bRet;
@@ -323,7 +323,7 @@ void SvxHyperlinkNewDocTp::DoApply ()
if( bOk )
{
- ScopedVclPtrInstance<WarningBox> aWarning( this, WB_YES_NO, CUI_RES(RID_SVXSTR_HYPERDLG_QUERYOVERWRITE) );
+ ScopedVclPtrInstance<WarningBox> aWarning( this, WB_YES_NO, CuiResId(RID_SVXSTR_HYPERDLG_QUERYOVERWRITE) );
bCreate = aWarning->Execute() == RET_YES;
}
}
diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx
index db14236bfa33..a055a0a243ad 100644
--- a/cui/source/dialogs/hlmarkwn.cxx
+++ b/cui/source/dialogs/hlmarkwn.cxx
@@ -109,10 +109,10 @@ void SvxHlmarkTreeLBox::Paint(vcl::RenderContext& rRenderContext, const ::tools:
switch (mpParentWnd->mnError)
{
case LERR_NOENTRIES :
- aStrMessage = CUI_RES( RID_SVXSTR_HYPDLG_ERR_LERR_NOENTRIES );
+ aStrMessage = CuiResId( RID_SVXSTR_HYPDLG_ERR_LERR_NOENTRIES );
break;
case LERR_DOCNOTOPEN :
- aStrMessage = CUI_RES( RID_SVXSTR_HYPDLG_ERR_LERR_DOCNOTOPEN );
+ aStrMessage = CuiResId( RID_SVXSTR_HYPDLG_ERR_LERR_DOCNOTOPEN );
break;
}
diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx
index bc4172da4c4b..15e43da019e7 100644
--- a/cui/source/dialogs/hltpbase.cxx
+++ b/cui/source/dialogs/hltpbase.cxx
@@ -246,8 +246,8 @@ void SvxHyperlinkTabPageBase::FillStandardDlgFields ( const SvxHyperlinkItem* pH
mpCbbFrame->SetText ( pHyperlinkItem->GetTargetFrame() );
// Form
- OUString aStrFormText = CUI_RES( RID_SVXSTR_HYPERDLG_FROM_TEXT );
- OUString aStrFormButton = CUI_RES( RID_SVXSTR_HYPERDLG_FORM_BUTTON );
+ OUString aStrFormText = CuiResId( RID_SVXSTR_HYPERDLG_FROM_TEXT );
+ OUString aStrFormButton = CuiResId( RID_SVXSTR_HYPERDLG_FORM_BUTTON );
if( pHyperlinkItem->GetInsertMode() & HLINK_HTMLMODE )
{
@@ -340,13 +340,13 @@ IMPL_LINK_NOARG(SvxHyperlinkTabPageBase, ClickScriptHdl_Impl, Button*, void)
SfxMacroTabPage *pMacroPage = static_cast<SfxMacroTabPage*>( aDlg->GetTabPage() );
if ( pHyperlinkItem->GetMacroEvents() & HyperDialogEvent::MouseOverObject )
- pMacroPage->AddEvent( OUString( CUI_RES(RID_SVXSTR_HYPDLG_MACROACT1) ),
+ pMacroPage->AddEvent( OUString( CuiResId(RID_SVXSTR_HYPDLG_MACROACT1) ),
SFX_EVENT_MOUSEOVER_OBJECT );
if ( pHyperlinkItem->GetMacroEvents() & HyperDialogEvent::MouseClickObject )
- pMacroPage->AddEvent( OUString( CUI_RES(RID_SVXSTR_HYPDLG_MACROACT2) ),
+ pMacroPage->AddEvent( OUString( CuiResId(RID_SVXSTR_HYPDLG_MACROACT2) ),
SFX_EVENT_MOUSECLICK_OBJECT);
if ( pHyperlinkItem->GetMacroEvents() & HyperDialogEvent::MouseOutObject )
- pMacroPage->AddEvent( OUString( CUI_RES(RID_SVXSTR_HYPDLG_MACROACT3) ),
+ pMacroPage->AddEvent( OUString( CuiResId(RID_SVXSTR_HYPDLG_MACROACT3) ),
SFX_EVENT_MOUSEOUT_OBJECT);
if ( bIsInputEnabled )
diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index 7f64b780fee7..a5f16c8f6b0d 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -637,7 +637,7 @@ IMPL_LINK_NOARG( SfxInsertFloatingFrameDialog, OpenHdl, Button*, void)
ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, FileDialogFlags::NONE, OUString() );
// set the title
- aFileDlg.SetTitle(CUI_RES(RID_SVXSTR_SELECT_FILE_IFRAME));
+ aFileDlg.SetTitle(CuiResId(RID_SVXSTR_SELECT_FILE_IFRAME));
// show the dialog
if ( aFileDlg.Execute() == ERRCODE_NONE )
diff --git a/cui/source/dialogs/insrc.cxx b/cui/source/dialogs/insrc.cxx
index 4c907d34635f..1f32977a0eb1 100644
--- a/cui/source/dialogs/insrc.cxx
+++ b/cui/source/dialogs/insrc.cxx
@@ -34,8 +34,8 @@ sal_uInt16 SvxInsRowColDlg::getInsertCount() const
SvxInsRowColDlg::SvxInsRowColDlg(vcl::Window* pParent, bool bCol, const OString& sHelpId )
: m_pDialog(VclPtr<ModalDialog>::Create(pParent, "InsertRowColumnDialog", "cui/ui/insertrowcolumn.ui"))
- , aRow(CUI_RES(RID_SVXSTR_ROW))
- , aCol(CUI_RES(RID_SVXSTR_COL))
+ , aRow(CuiResId(RID_SVXSTR_ROW))
+ , aCol(CuiResId(RID_SVXSTR_COL))
, bColumn(bCol)
{
m_pDialog->get(m_pCountEdit, "insert_number");
diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx
index 7e758c4bbbc1..da9c08262ec0 100644
--- a/cui/source/dialogs/linkdlg.cxx
+++ b/cui/source/dialogs/linkdlg.cxx
@@ -88,12 +88,12 @@ static long nTabs[] =
SvBaseLinksDlg::SvBaseLinksDlg( vcl::Window * pParent, LinkManager* pMgr, bool bHtml )
: ModalDialog( pParent, "BaseLinksDialog", "cui/ui/baselinksdialog.ui"),
- aStrAutolink( CUI_RES( STR_AUTOLINK ) ),
- aStrManuallink( CUI_RES( STR_MANUALLINK ) ),
- aStrBrokenlink( CUI_RES( STR_BROKENLINK ) ),
- aStrCloselinkmsg( CUI_RES( STR_CLOSELINKMSG ) ),
- aStrCloselinkmsgMulti( CUI_RES( STR_CLOSELINKMSG_MULTI ) ),
- aStrWaitinglink( CUI_RES( STR_WAITINGLINK ) ),
+ aStrAutolink( CuiResId( STR_AUTOLINK ) ),
+ aStrManuallink( CuiResId( STR_MANUALLINK ) ),
+ aStrBrokenlink( CuiResId( STR_BROKENLINK ) ),
+ aStrCloselinkmsg( CuiResId( STR_CLOSELINKMSG ) ),
+ aStrCloselinkmsgMulti( CuiResId( STR_CLOSELINKMSG_MULTI ) ),
+ aStrWaitinglink( CuiResId( STR_WAITINGLINK ) ),
pLinkMgr( nullptr ),
bHtmlMode(bHtml),
aUpdateIdle("cui SvBaseLinksDlg UpdateIdle")
diff --git a/cui/source/dialogs/multipat.cxx b/cui/source/dialogs/multipat.cxx
index 145077bd5c89..0bdc805d7381 100644
--- a/cui/source/dialogs/multipat.cxx
+++ b/cui/source/dialogs/multipat.cxx
@@ -90,7 +90,7 @@ IMPL_LINK_NOARG(SvxMultiPathDialog, AddHdl_Impl, Button*, void)
}
else
{
- OUString sMsg( CUI_RES( RID_MULTIPATH_DBL_ERR ) );
+ OUString sMsg( CuiResId( RID_MULTIPATH_DBL_ERR ) );
sMsg = sMsg.replaceFirst( "%1", sInsPath );
ScopedVclPtrInstance<InfoBox>(this, sMsg)->Execute();
}
@@ -114,7 +114,7 @@ IMPL_LINK_NOARG(SvxPathSelectDialog, AddHdl_Impl, Button*, void)
if ( LISTBOX_ENTRY_NOTFOUND != m_pPathLB->GetEntryPos( sInsPath ) )
{
- OUString sMsg( CUI_RES( RID_MULTIPATH_DBL_ERR ) );
+ OUString sMsg( CuiResId( RID_MULTIPATH_DBL_ERR ) );
sMsg = sMsg.replaceFirst( "%1", sInsPath );
ScopedVclPtrInstance<InfoBox>(this, sMsg)->Execute();
}
diff --git a/cui/source/dialogs/passwdomdlg.cxx b/cui/source/dialogs/passwdomdlg.cxx
index 92866f30d842..8db8d4f633d3 100644
--- a/cui/source/dialogs/passwdomdlg.cxx
+++ b/cui/source/dialogs/passwdomdlg.cxx
@@ -61,10 +61,10 @@ PasswordToOpenModifyDialog_Impl::PasswordToOpenModifyDialog_Impl(
sal_uInt16 nMaxPasswdLen,
bool bIsPasswordToModify )
: m_pParent( pParent )
- , m_aOneMismatch( CUI_RES( RID_SVXSTR_ONE_PASSWORD_MISMATCH ) )
- , m_aTwoMismatch( CUI_RES( RID_SVXSTR_TWO_PASSWORDS_MISMATCH ) )
- , m_aInvalidStateForOkButton( CUI_RES( RID_SVXSTR_INVALID_STATE_FOR_OK_BUTTON ) )
- , m_aInvalidStateForOkButton_v2( CUI_RES( RID_SVXSTR_INVALID_STATE_FOR_OK_BUTTON_V2 ) )
+ , m_aOneMismatch( CuiResId( RID_SVXSTR_ONE_PASSWORD_MISMATCH ) )
+ , m_aTwoMismatch( CuiResId( RID_SVXSTR_TWO_PASSWORDS_MISMATCH ) )
+ , m_aInvalidStateForOkButton( CuiResId( RID_SVXSTR_INVALID_STATE_FOR_OK_BUTTON ) )
+ , m_aInvalidStateForOkButton_v2( CuiResId( RID_SVXSTR_INVALID_STATE_FOR_OK_BUTTON_V2 ) )
, m_bIsPasswordToModify( bIsPasswordToModify )
{
pParent->get(m_pPasswdToOpenED, "newpassEntry");
diff --git a/cui/source/dialogs/screenshotannotationdlg.cxx b/cui/source/dialogs/screenshotannotationdlg.cxx
index 5b02b861473a..b1922cbc4573 100644
--- a/cui/source/dialogs/screenshotannotationdlg.cxx
+++ b/cui/source/dialogs/screenshotannotationdlg.cxx
@@ -204,7 +204,7 @@ ScreenshotAnnotationDlg_Impl::ScreenshotAnnotationDlg_Impl(
mpPicture(nullptr),
mpText(nullptr),
mpSave(nullptr),
- maSaveAsText(CUI_RES(RID_SVXSTR_SAVE_SCREENSHOT_AS))
+ maSaveAsText(CuiResId(RID_SVXSTR_SAVE_SCREENSHOT_AS))
{
// image ain't empty
assert(!maParentDialogBitmap.IsEmpty());
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index 9b5b753c2e9a..bc625d315003 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -82,8 +82,8 @@ SFTreeListBox::SFTreeListBox(vcl::Window* pParent)
, m_libImage(BitmapEx(RID_CUIBMP_LIB))
, m_macImage(BitmapEx(RID_CUIBMP_MACRO))
, m_docImage(BitmapEx(RID_CUIBMP_DOC))
- , m_sMyMacros(CUI_RES(RID_SVXSTR_MYMACROS))
- , m_sProdMacros(CUI_RES(RID_SVXSTR_PRODMACROS))
+ , m_sMyMacros(CuiResId(RID_SVXSTR_MYMACROS))
+ , m_sProdMacros(CuiResId(RID_SVXSTR_PRODMACROS))
{
SetSelectionMode( SelectionMode::Single );
@@ -451,15 +451,15 @@ SvxScriptOrgDialog::SvxScriptOrgDialog( vcl::Window* pParent, const OUString& la
: SfxModalDialog(pParent, "ScriptOrganizerDialog",
"cui/ui/scriptorganizer.ui")
, m_sLanguage(language)
- , m_delErrStr(CUI_RES(RID_SVXSTR_DELFAILED))
- , m_delErrTitleStr(CUI_RES(RID_SVXSTR_DELFAILED_TITLE))
- , m_delQueryStr(CUI_RES(RID_SVXSTR_DELQUERY))
- , m_delQueryTitleStr(CUI_RES(RID_SVXSTR_DELQUERY_TITLE))
- , m_createErrStr(CUI_RES(RID_SVXSTR_CREATEFAILED))
- , m_createDupStr(CUI_RES(RID_SVXSTR_CREATEFAILEDDUP))
- , m_createErrTitleStr(CUI_RES(RID_SVXSTR_CREATEFAILED_TITLE))
- , m_renameErrStr(CUI_RES(RID_SVXSTR_RENAMEFAILED))
- , m_renameErrTitleStr(CUI_RES(RID_SVXSTR_RENAMEFAILED_TITLE))
+ , m_delErrStr(CuiResId(RID_SVXSTR_DELFAILED))
+ , m_delErrTitleStr(CuiResId(RID_SVXSTR_DELFAILED_TITLE))
+ , m_delQueryStr(CuiResId(RID_SVXSTR_DELQUERY))
+ , m_delQueryTitleStr(CuiResId(RID_SVXSTR_DELQUERY_TITLE))
+ , m_createErrStr(CuiResId(RID_SVXSTR_CREATEFAILED))
+ , m_createDupStr(CuiResId(RID_SVXSTR_CREATEFAILEDDUP))
+ , m_createErrTitleStr(CuiResId(RID_SVXSTR_CREATEFAILED_TITLE))
+ , m_renameErrStr(CuiResId(RID_SVXSTR_RENAMEFAILED))
+ , m_renameErrTitleStr(CuiResId(RID_SVXSTR_RENAMEFAILED_TITLE))
{
get(m_pScriptsBox, "scripts");
get(m_pRunButton, "run");
@@ -1227,12 +1227,12 @@ OUString FormatErrorString(
if ( !type.isEmpty() )
{
- result += "\n\n" + OUString(CUI_RES(RID_SVXSTR_ERROR_TYPE_LABEL)) + " " + type;
+ result += "\n\n" + OUString(CuiResId(RID_SVXSTR_ERROR_TYPE_LABEL)) + " " + type;
}
if ( !message.isEmpty() )
{
- result += "\n\n" + OUString(CUI_RES(RID_SVXSTR_ERROR_MESSAGE_LABEL)) + " " + message;
+ result += "\n\n" + OUString(CuiResId(RID_SVXSTR_ERROR_MESSAGE_LABEL)) + " " + message;
}
return result;
@@ -1241,7 +1241,7 @@ OUString FormatErrorString(
OUString GetErrorMessage(
const provider::ScriptErrorRaisedException& eScriptError )
{
- OUString unformatted = CUI_RES( RID_SVXSTR_ERROR_AT_LINE );
+ OUString unformatted = CuiResId( RID_SVXSTR_ERROR_AT_LINE );
OUString unknown("UNKNOWN");
OUString language = unknown;
@@ -1267,11 +1267,11 @@ OUString GetErrorMessage(
if ( eScriptError.lineNum != -1 )
{
line = OUString::number( eScriptError.lineNum );
- unformatted = CUI_RES( RID_SVXSTR_ERROR_AT_LINE );
+ unformatted = CuiResId( RID_SVXSTR_ERROR_AT_LINE );
}
else
{
- unformatted = CUI_RES( RID_SVXSTR_ERROR_RUNNING );
+ unformatted = CuiResId( RID_SVXSTR_ERROR_RUNNING );
}
return FormatErrorString(
@@ -1281,7 +1281,7 @@ OUString GetErrorMessage(
OUString GetErrorMessage(
const provider::ScriptExceptionRaisedException& eScriptException )
{
- OUString unformatted = CUI_RES( RID_SVXSTR_EXCEPTION_AT_LINE );
+ OUString unformatted = CuiResId( RID_SVXSTR_EXCEPTION_AT_LINE );
OUString unknown("UNKNOWN");
OUString language = unknown;
@@ -1307,11 +1307,11 @@ OUString GetErrorMessage(
if ( eScriptException.lineNum != -1 )
{
line = OUString::number( eScriptException.lineNum );
- unformatted = CUI_RES( RID_SVXSTR_EXCEPTION_AT_LINE );
+ unformatted = CuiResId( RID_SVXSTR_EXCEPTION_AT_LINE );
}
else
{
- unformatted = CUI_RES( RID_SVXSTR_EXCEPTION_RUNNING );
+ unformatted = CuiResId( RID_SVXSTR_EXCEPTION_RUNNING );
}
if ( !eScriptException.exceptionType.isEmpty() )
@@ -1326,7 +1326,7 @@ OUString GetErrorMessage(
OUString GetErrorMessage(
const provider::ScriptFrameworkErrorException& sError )
{
- OUString unformatted = CUI_RES( RID_SVXSTR_FRAMEWORK_ERROR_RUNNING );
+ OUString unformatted = CuiResId( RID_SVXSTR_FRAMEWORK_ERROR_RUNNING );
OUString language("UNKNOWN");
@@ -1345,7 +1345,7 @@ OUString GetErrorMessage(
if ( sError.errorType == provider::ScriptFrameworkErrorType::NOTSUPPORTED )
{
message = OUString(
- CUI_RES( RID_SVXSTR_ERROR_LANG_NOT_SUPPORTED ) );
+ CuiResId( RID_SVXSTR_ERROR_LANG_NOT_SUPPORTED ) );
message = ReplaceString(message, "%LANGUAGENAME", language );
}
@@ -1440,11 +1440,11 @@ IMPL_STATIC_LINK( SvxScriptErrorDialog, ShowDialog, void*, p, void )
}
else
{
- message = OUString( CUI_RES( RID_SVXSTR_ERROR_TITLE ) );
+ message = OUString( CuiResId( RID_SVXSTR_ERROR_TITLE ) );
}
ScopedVclPtrInstance<MessageDialog> pBox( nullptr, message, VclMessageType::Warning );
- pBox->SetText( CUI_RES( RID_SVXSTR_ERROR_TITLE ) );
+ pBox->SetText( CuiResId( RID_SVXSTR_ERROR_TITLE ) );
pBox->Execute();
delete pMessage;
diff --git a/cui/source/dialogs/srchxtra.cxx b/cui/source/dialogs/srchxtra.cxx
index 23342dd3c3fc..ea01bcb7a1cc 100644
--- a/cui/source/dialogs/srchxtra.cxx
+++ b/cui/source/dialogs/srchxtra.cxx
@@ -137,7 +137,7 @@ SvxSearchAttributeDialog::SvxSearchAttributeDialog(vcl::Window* pParent,
SfxObjectShell* pSh = SfxObjectShell::Current();
DBG_ASSERT( pSh, "No DocShell" );
- ResStringArray aAttrNames( SVX_RES( RID_ATTR_NAMES ) );
+ ResStringArray aAttrNames(ResId(RID_ATTR_NAMES, DIALOG_MGR()));
SfxItemPool& rPool = pSh->GetPool();
SfxItemSet aSet( rPool, pWhRanges );
SfxWhichIter aIter( aSet );
diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx
index f0ebda71297a..51fae3d5ceea 100644
--- a/cui/source/dialogs/thesdlg.cxx
+++ b/cui/source/dialogs/thesdlg.cxx
@@ -443,7 +443,7 @@ SvxThesaurusDialog::SvxThesaurusDialog(
const OUString &rWord,
LanguageType nLanguage)
: SvxStandardDialog(pParent, "ThesaurusDialog", "cui/ui/thesaurus.ui")
- , m_aErrStr(CUI_RES(RID_SVXSTR_ERR_TEXTNOTFOUND))
+ , m_aErrStr(CuiResId(RID_SVXSTR_ERR_TEXTNOTFOUND))
, xThesaurus(nullptr)
, aLookUpText()
, nLookUpLanguage(LANGUAGE_NONE)
diff --git a/cui/source/inc/dialmgr.hxx b/cui/source/inc/dialmgr.hxx
index 07226a0063e3..e323ba987c7e 100644
--- a/cui/source/inc/dialmgr.hxx
+++ b/cui/source/inc/dialmgr.hxx
@@ -24,14 +24,17 @@
// forward ---------------------------------------------------------------
#define CUI_MGR() (*CuiResMgr::GetResMgr())
-#define CUI_RES(i) ResId(i,CUI_MGR())
-class ResMgr;
struct CuiResMgr
{
static ResMgr* GetResMgr();
};
+inline OUString CuiResId(sal_uInt16 nId)
+{
+ return ResId(nId, CUI_MGR());
+}
+
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/cfgchart.cxx b/cui/source/options/cfgchart.cxx
index 662ce50234f2..67ec485efaeb 100644
--- a/cui/source/options/cfgchart.cxx
+++ b/cui/source/options/cfgchart.cxx
@@ -129,7 +129,7 @@ OUString SvxChartColorTable::getDefaultName( size_t _nIndex )
if (sDefaultNamePrefix.getLength() == 0)
{
- OUString aResName( CUI_RES( RID_SVXSTR_DIAGRAM_ROW ) );
+ OUString aResName( CuiResId( RID_SVXSTR_DIAGRAM_ROW ) );
sal_Int32 nPos = aResName.indexOf( "$(ROW)" );
if( nPos != -1 )
{
@@ -217,7 +217,7 @@ bool SvxChartOptions::RetrieveOptions()
Color aCol;
// create strings for entry names
- OUString aResName( CUI_RES( RID_SVXSTR_DIAGRAM_ROW ) );
+ OUString aResName( CuiResId( RID_SVXSTR_DIAGRAM_ROW ) );
OUString aPrefix, aPostfix, aName;
sal_Int32 nPos = aResName.indexOf( "$(ROW)" );
if( nPos != -1 )
diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx
index faaeeccfc3d8..5e8d53471b15 100644
--- a/cui/source/options/connpooloptions.cxx
+++ b/cui/source/options/connpooloptions.cxx
@@ -91,8 +91,8 @@ namespace offapp
:EditBrowseBox(_pParent, EditBrowseBoxFlags::NO_HANDLE_COLUMN_CONTENT, WB_BORDER,
BrowserMode::AUTO_VSCROLL | BrowserMode::AUTO_HSCROLL | BrowserMode::HIDECURSOR | BrowserMode::AUTOSIZE_LASTCOL | BrowserMode::KEEPHIGHLIGHT)
,m_aSeekRow(m_aSettings.end())
- ,m_sYes(CUI_RES(RID_SVXSTR_YES))
- ,m_sNo(CUI_RES(RID_SVXSTR_NO))
+ ,m_sYes(CuiResId(RID_SVXSTR_YES))
+ ,m_sNo(CuiResId(RID_SVXSTR_NO))
{
SetStyle((GetStyle() & ~WB_HSCROLL) | WB_AUTOHSCROLL);
}
@@ -128,11 +128,11 @@ namespace offapp
EditBrowseBox::Init();
Size aColWidth = LogicToPixel(Size(160, 0), MapUnit::MapAppFont);
- InsertDataColumn(1, OUString(CUI_RES(RID_SVXSTR_DRIVER_NAME)), aColWidth.Width());
+ InsertDataColumn(1, OUString(CuiResId(RID_SVXSTR_DRIVER_NAME)), aColWidth.Width());
aColWidth = LogicToPixel(Size(30, 0), MapUnit::MapAppFont);
- InsertDataColumn(2, OUString(CUI_RES(RID_SVXSTR_POOLED_FLAG)), aColWidth.Width());
+ InsertDataColumn(2, OUString(CuiResId(RID_SVXSTR_POOLED_FLAG)), aColWidth.Width());
aColWidth = LogicToPixel(Size(60, 0), MapUnit::MapAppFont);
- InsertDataColumn(3, OUString(CUI_RES(RID_SVXSTR_POOL_TIMEOUT)), aColWidth.Width());
+ InsertDataColumn(3, OUString(CuiResId(RID_SVXSTR_POOL_TIMEOUT)), aColWidth.Width());
// Attention: the resource of the string is local to the resource of the enclosing dialog!
}
diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx
index 082b74ee7b9d..4324762b3433 100644
--- a/cui/source/options/dbregister.cxx
+++ b/cui/source/options/dbregister.cxx
@@ -102,8 +102,8 @@ DbRegistrationOptionsPage::DbRegistrationOptionsPage( vcl::Window* pParent, cons
SfxTabPage( pParent, "DbRegisterPage", "cui/ui/dbregisterpage.ui", &rSet ),
- m_aTypeText ( CUI_RES( RID_SVXSTR_TYPE ) ),
- m_aPathText ( CUI_RES( RID_SVXSTR_PATH ) ),
+ m_aTypeText ( CuiResId( RID_SVXSTR_TYPE ) ),
+ m_aPathText ( CuiResId( RID_SVXSTR_PATH ) ),
m_pPathBox ( nullptr ),
m_pCurEntry ( nullptr ),
m_nOldCount ( 0 ),
@@ -275,7 +275,7 @@ IMPL_LINK_NOARG(DbRegistrationOptionsPage, DeleteHdl, Button*, void)
SvTreeListEntry* pEntry = m_pPathBox->FirstSelected();
if ( pEntry )
{
- ScopedVclPtrInstance< MessageDialog > aQuery(this, CUI_RES(RID_SVXSTR_QUERY_DELETE_CONFIRM), VclMessageType::Question, VclButtonsType::YesNo);
+ ScopedVclPtrInstance< MessageDialog > aQuery(this, CuiResId(RID_SVXSTR_QUERY_DELETE_CONFIRM), VclMessageType::Question, VclButtonsType::YesNo);
if ( aQuery->Execute() == RET_YES )
m_pPathBox->GetModel()->Remove(pEntry);
}
diff --git a/cui/source/options/doclinkdialog.cxx b/cui/source/options/doclinkdialog.cxx
index 34b961a6e56d..4cd538b28ee7 100644
--- a/cui/source/options/doclinkdialog.cxx
+++ b/cui/source/options/doclinkdialog.cxx
@@ -124,7 +124,7 @@ namespace svx
if (!bFileExists)
{
- OUString sMsg = CUI_RES(STR_LINKEDDOC_DOESNOTEXIST);
+ OUString sMsg = CuiResId(STR_LINKEDDOC_DOESNOTEXIST);
sMsg = sMsg.replaceFirst("$file$", m_pURL->GetText());
ScopedVclPtrInstance< MessageDialog > aError(this, sMsg);
aError->Execute();
@@ -133,7 +133,7 @@ namespace svx
INetURLObject aURL( sURL );
if ( aURL.GetProtocol() != INetProtocol::File )
{
- OUString sMsg = CUI_RES(STR_LINKEDDOC_NO_SYSTEM_FILE);
+ OUString sMsg = CuiResId(STR_LINKEDDOC_NO_SYSTEM_FILE);
sMsg = sMsg.replaceFirst("$file$", m_pURL->GetText());
ScopedVclPtrInstance< MessageDialog > aError(this, sMsg);
aError->Execute();
@@ -145,7 +145,7 @@ namespace svx
{
if ( !m_aNameValidator.Call( sCurrentText ) )
{
- OUString sMsg = CUI_RES(STR_NAME_CONFLICT);
+ OUString sMsg = CuiResId(STR_NAME_CONFLICT);
sMsg = sMsg.replaceFirst("$file$", sCurrentText);
ScopedVclPtrInstance< MessageDialog > aError(this, sMsg, VclMessageType::Info);
aError->Execute();
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index ec9a663100a5..27203a99ac7d 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -1151,10 +1151,10 @@ IMPL_LINK(SvxColorOptionsTabPage, SaveDeleteHdl_Impl, Button*, pButton, void )
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "Dialog creation failed!");
ScopedVclPtr<AbstractSvxNameDialog> aNameDlg(pFact->CreateSvxNameDialog( pButton,
- sName, CUI_RES(RID_SVXSTR_COLOR_CONFIG_SAVE2) ));
+ sName, CuiResId(RID_SVXSTR_COLOR_CONFIG_SAVE2) ));
DBG_ASSERT(aNameDlg, "Dialog creation failed!");
aNameDlg->SetCheckNameHdl( LINK(this, SvxColorOptionsTabPage, CheckNameHdl_Impl));
- aNameDlg->SetText(CUI_RES(RID_SVXSTR_COLOR_CONFIG_SAVE1));
+ aNameDlg->SetText(CuiResId(RID_SVXSTR_COLOR_CONFIG_SAVE1));
aNameDlg->SetHelpId(HID_OPTIONS_COLORCONFIG_SAVE_SCHEME);
aNameDlg->SetCheckNameHdl( LINK(this, SvxColorOptionsTabPage, CheckNameHdl_Impl));
if(RET_OK == aNameDlg->Execute())
@@ -1170,8 +1170,8 @@ IMPL_LINK(SvxColorOptionsTabPage, SaveDeleteHdl_Impl, Button*, pButton, void )
else
{
DBG_ASSERT(m_pColorSchemeLB->GetEntryCount() > 1, "don't delete the last scheme");
- ScopedVclPtrInstance< MessageDialog > aQuery(pButton, CUI_RES(RID_SVXSTR_COLOR_CONFIG_DELETE), VclMessageType::Question, VclButtonsType::YesNo);
- aQuery->SetText(CUI_RES(RID_SVXSTR_COLOR_CONFIG_DELETE_TITLE));
+ ScopedVclPtrInstance< MessageDialog > aQuery(pButton, CuiResId(RID_SVXSTR_COLOR_CONFIG_DELETE), VclMessageType::Question, VclButtonsType::YesNo);
+ aQuery->SetText(CuiResId(RID_SVXSTR_COLOR_CONFIG_DELETE_TITLE));
if(RET_YES == aQuery->Execute())
{
OUString sDeleteScheme(m_pColorSchemeLB->GetSelectEntry());
diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx
index b09975f0a9b9..437c2cb7f97e 100644
--- a/cui/source/options/optdict.cxx
+++ b/cui/source/options/optdict.cxx
@@ -153,7 +153,7 @@ IMPL_LINK_NOARG(SvxNewDictionaryDialog, OKHdl_Impl, Button*, void)
if ( bFound )
{
// duplicate names?
- ScopedVclPtrInstance<MessageDialog>(this, CUI_RES(RID_SVXSTR_OPT_DOUBLE_DICTS), VclMessageType::Info)->Execute();
+ ScopedVclPtrInstance<MessageDialog>(this, CuiResId(RID_SVXSTR_OPT_DOUBLE_DICTS), VclMessageType::Info)->Execute();
pNameEdit->GrabFocus();
return;
}
@@ -217,7 +217,7 @@ SvxEditDictionaryDialog::SvxEditDictionaryDialog(
ModalDialog( pParent, "EditDictionaryDialog" ,"cui/ui/editdictionarydialog.ui" ),
- sModify (CUI_RES(STR_MODIFY)),
+ sModify (CuiResId(STR_MODIFY)),
nOld ( NOACTDICT ),
bFirstSelect (true),
bDoNothing (false),
@@ -452,7 +452,7 @@ IMPL_LINK_NOARG(SvxEditDictionaryDialog, SelectLangHdl_Impl, ListBox&, void)
if ( nLang != nOldLang )
{
- ScopedVclPtrInstance< MessageDialog > aBox(this, CUI_RES( RID_SVXSTR_CONFIRM_SET_LANGUAGE), VclMessageType::Question, VclButtonsType::YesNo);
+ ScopedVclPtrInstance< MessageDialog > aBox(this, CuiResId( RID_SVXSTR_CONFIRM_SET_LANGUAGE), VclMessageType::Question, VclButtonsType::YesNo);
OUString sTxt(aBox->get_primary_text());
sTxt = sTxt.replaceFirst( "%1", pAllDictsLB->GetSelectEntry() );
aBox->set_primary_text(sTxt);
diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx
index 7f997c735fd1..8723c18e77be 100644
--- a/cui/source/options/optfltr.cxx
+++ b/cui/source/options/optfltr.cxx
@@ -143,13 +143,13 @@ void OfaMSFilterTabPage::Reset( const SfxItemSet* )
OfaMSFilterTabPage2::OfaMSFilterTabPage2( vcl::Window* pParent, const SfxItemSet& rSet ) :
SfxTabPage( pParent, "OptFilterPage", "cui/ui/optfltrembedpage.ui", &rSet ),
- sHeader1(CUI_RES(RID_SVXSTR_HEADER1)),
- sHeader2(CUI_RES(RID_SVXSTR_HEADER2)),
- sChgToFromMath(CUI_RES(RID_SVXSTR_CHG_MATH)),
- sChgToFromWriter(CUI_RES(RID_SVXSTR_CHG_WRITER)),
- sChgToFromCalc(CUI_RES(RID_SVXSTR_CHG_CALC)),
- sChgToFromImpress(CUI_RES(RID_SVXSTR_CHG_IMPRESS)),
- sChgToFromSmartArt(CUI_RES(RID_SVXSTR_CHG_SMARTART)),
+ sHeader1(CuiResId(RID_SVXSTR_HEADER1)),
+ sHeader2(CuiResId(RID_SVXSTR_HEADER2)),
+ sChgToFromMath(CuiResId(RID_SVXSTR_CHG_MATH)),
+ sChgToFromWriter(CuiResId(RID_SVXSTR_CHG_WRITER)),
+ sChgToFromCalc(CuiResId(RID_SVXSTR_CHG_CALC)),
+ sChgToFromImpress(CuiResId(RID_SVXSTR_CHG_IMPRESS)),
+ sChgToFromSmartArt(CuiResId(RID_SVXSTR_CHG_SMARTART)),
pCheckButtonData(nullptr)
{
get(m_pCheckLBContainer, "checklbcontainer");
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index 379067fda6f0..cea8b66cdbe3 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -132,7 +132,7 @@ void SvxNoSpaceEdit::Modify()
if ( !comphelper::string::isdigitAsciiString(aValue) || (long)aValue.toInt32() > USHRT_MAX )
// the maximum value of a port number is USHRT_MAX
- ScopedVclPtrInstance<MessageDialog>(this, CUI_RES( RID_SVXSTR_OPT_PROXYPORTS))->Execute();
+ ScopedVclPtrInstance<MessageDialog>(this, CuiResId( RID_SVXSTR_OPT_PROXYPORTS))->Execute();
}
}
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 1213b3d10a69..292558a6365d 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -545,12 +545,12 @@ void SvxJavaOptionsPage::AddFolder( const OUString& _rFolder )
}
else if ( JFW_E_NOT_RECOGNIZED == eErr )
{
- ScopedVclPtrInstance< MessageDialog > aErrBox( this, CUI_RES( RID_SVXSTR_JRE_NOT_RECOGNIZED ) );
+ ScopedVclPtrInstance< MessageDialog > aErrBox( this, CuiResId( RID_SVXSTR_JRE_NOT_RECOGNIZED ) );
aErrBox->Execute();
}
else if ( JFW_E_FAILED_VERSION == eErr )
{
- ScopedVclPtrInstance< MessageDialog > aErrBox( this, CUI_RES( RID_SVXSTR_JRE_FAILED_VERSION ) );
+ ScopedVclPtrInstance< MessageDialog > aErrBox( this, CuiResId( RID_SVXSTR_JRE_FAILED_VERSION ) );
aErrBox->Execute();
}
@@ -810,7 +810,7 @@ void SvxJavaParameterDlg::EditParameter()
if ( nPos != LISTBOX_ENTRY_NOTFOUND )
{
- ScopedVclPtrInstance< InputDialog > pParamEditDlg(CUI_RES(RID_SVXSTR_JAVA_START_PARAM), this);
+ ScopedVclPtrInstance< InputDialog > pParamEditDlg(CuiResId(RID_SVXSTR_JAVA_START_PARAM), this);
OUString editableClassPath = m_pAssignedList->GetSelectEntry();
pParamEditDlg->SetEntryText( editableClassPath );
pParamEditDlg->HideHelpBtn();
@@ -911,8 +911,8 @@ void SvxJavaClassPathDlg::dispose()
IMPL_LINK_NOARG(SvxJavaClassPathDlg, AddArchiveHdl_Impl, Button*, void)
{
sfx2::FileDialogHelper aDlg( TemplateDescription::FILEOPEN_SIMPLE );
- aDlg.SetTitle( CUI_RES( RID_SVXSTR_ARCHIVE_TITLE ) );
- aDlg.AddFilter( CUI_RES( RID_SVXSTR_ARCHIVE_HEADLINE ), "*.jar;*.zip" );
+ aDlg.SetTitle( CuiResId( RID_SVXSTR_ARCHIVE_TITLE ) );
+ aDlg.AddFilter( CuiResId( RID_SVXSTR_ARCHIVE_HEADLINE ), "*.jar;*.zip" );
OUString sFolder;
if ( m_pPathList->GetSelectEntryCount() > 0 )
{
@@ -934,7 +934,7 @@ IMPL_LINK_NOARG(SvxJavaClassPathDlg, AddArchiveHdl_Impl, Button*, void)
}
else
{
- OUString sMsg( CUI_RES( RID_SVXSTR_MULTIFILE_DBL_ERR ) );
+ OUString sMsg( CuiResId( RID_SVXSTR_MULTIFILE_DBL_ERR ) );
sMsg = sMsg.replaceFirst( "%1", sFile );
ScopedVclPtrInstance<MessageDialog>(this, sMsg)->Execute();
}
@@ -969,7 +969,7 @@ IMPL_LINK_NOARG(SvxJavaClassPathDlg, AddPathHdl_Impl, Button*, void)
}
else
{
- OUString sMsg( CUI_RES( RID_SVXSTR_MULTIFILE_DBL_ERR ) );
+ OUString sMsg( CuiResId( RID_SVXSTR_MULTIFILE_DBL_ERR ) );
sMsg = sMsg.replaceFirst( "%1", sNewFolder );
ScopedVclPtrInstance<MessageDialog>(this, sMsg)->Execute();
}
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index 37edc4c67692..33816f716d46 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -986,16 +986,16 @@ void SvxLinguData_Impl::Reconfigure( const OUString &rDisplayName, bool bEnable
SvxLinguTabPage::SvxLinguTabPage( vcl::Window* pParent, const SfxItemSet& rSet ) :
SfxTabPage(pParent, "OptLinguPage", "cui/ui/optlingupage.ui", &rSet),
- sCapitalWords (CUI_RES(RID_SVXSTR_CAPITAL_WORDS)),
- sWordsWithDigits(CUI_RES(RID_SVXSTR_WORDS_WITH_DIGITS)),
- sSpellSpecial (CUI_RES(RID_SVXSTR_SPELL_SPECIAL)),
- sSpellAuto (CUI_RES(RID_SVXSTR_SPELL_AUTO)),
- sGrammarAuto (CUI_RES(RID_SVXSTR_GRAMMAR_AUTO)),
- sNumMinWordlen (CUI_RES(RID_SVXSTR_NUM_MIN_WORDLEN)),
- sNumPreBreak (CUI_RES(RID_SVXSTR_NUM_PRE_BREAK)),
- sNumPostBreak (CUI_RES(RID_SVXSTR_NUM_POST_BREAK)),
- sHyphAuto (CUI_RES(RID_SVXSTR_HYPH_AUTO)),
- sHyphSpecial (CUI_RES(RID_SVXSTR_HYPH_SPECIAL)),
+ sCapitalWords (CuiResId(RID_SVXSTR_CAPITAL_WORDS)),
+ sWordsWithDigits(CuiResId(RID_SVXSTR_WORDS_WITH_DIGITS)),
+ sSpellSpecial (CuiResId(RID_SVXSTR_SPELL_SPECIAL)),
+ sSpellAuto (CuiResId(RID_SVXSTR_SPELL_AUTO)),
+ sGrammarAuto (CuiResId(RID_SVXSTR_GRAMMAR_AUTO)),
+ sNumMinWordlen (CuiResId(RID_SVXSTR_NUM_MIN_WORDLEN)),
+ sNumPreBreak (CuiResId(RID_SVXSTR_NUM_PRE_BREAK)),
+ sNumPostBreak (CuiResId(RID_SVXSTR_NUM_POST_BREAK)),
+ sHyphAuto (CuiResId(RID_SVXSTR_HYPH_AUTO)),
+ sHyphSpecial (CuiResId(RID_SVXSTR_HYPH_SPECIAL)),
pLinguData(nullptr)
{
@@ -1751,10 +1751,10 @@ void SvxLinguTabPage::HideGroups( sal_uInt16 nGrp )
SvxEditModulesDlg::SvxEditModulesDlg(vcl::Window* pParent, SvxLinguData_Impl& rData)
: ModalDialog( pParent, "EditModulesDialog",
"cui/ui/editmodulesdialog.ui")
- , sSpell(CUI_RES(RID_SVXSTR_SPELL))
- , sHyph(CUI_RES(RID_SVXSTR_HYPH))
- , sThes(CUI_RES(RID_SVXSTR_THES))
- , sGrammar(CUI_RES(RID_SVXSTR_GRAMMAR))
+ , sSpell(CuiResId(RID_SVXSTR_SPELL))
+ , sHyph(CuiResId(RID_SVXSTR_HYPH))
+ , sThes(CuiResId(RID_SVXSTR_THES))
+ , sGrammar(CuiResId(RID_SVXSTR_GRAMMAR))
, rLinguData(rData)
{
get(m_pClosePB, "close");
diff --git a/cui/source/options/optopencl.cxx b/cui/source/options/optopencl.cxx
index ecdce1d3971c..4706951f129a 100644
--- a/cui/source/options/optopencl.cxx
+++ b/cui/source/options/optopencl.cxx
@@ -102,7 +102,7 @@ bool SvxOpenCLTabPage::FillItemSet( SfxItemSet* )
if (bModified)
{
- ScopedVclPtrInstance<MessageDialog> aWarnBox(this, CUI_RES(RID_SVXSTR_OPTIONS_RESTART), VclMessageType::Info);
+ ScopedVclPtrInstance<MessageDialog> aWarnBox(this, CuiResId(RID_SVXSTR_OPTIONS_RESTART), VclMessageType::Info);
aWarnBox->Execute();
batch->commit();
}
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index af910b355f37..ab292153757f 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -312,7 +312,7 @@ void SvxPathTabPage::Reset( const SfxItemSet* )
if (i == SvtPathOptions::PATH_CLASSIFICATION)
// RID_SVXSTR_KEY_USERDICTIONARY_DIR already took our slot, so name the key explicitly.
nId = RID_SVXSTR_KEY_CLASSIFICATION_PATH;
- OUString aStr(CUI_RES(nId));
+ OUString aStr(CuiResId(nId));
nWidth1 = std::max(nWidth1, pPathBox->GetTextWidth(aStr));
aStr += "\t";
diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx
index b07433d5985c..fa4d7f452072 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -58,7 +58,7 @@ SelectPersonaDialog::SelectPersonaDialog( vcl::Window *pParent )
get( m_vSearchSuggestions[4], "suggestion5" );
get( m_vSearchSuggestions[5], "suggestion6" );
- ResStringArray aCategoriesArr(CUI_RES(RID_SVXSTR_PERSONA_CATEGORIES));
+ ResStringArray aCategoriesArr(ResId(RID_SVXSTR_PERSONA_CATEGORIES, CUI_MGR()));
assert(aCategoriesArr.Count() >= CATEGORYCOUNT);
for(sal_uInt32 i = 0; i < CATEGORYCOUNT; ++i)
{
@@ -209,7 +209,7 @@ IMPL_LINK( SelectPersonaDialog, SelectPersona, Button*, pButton, void )
// get the persona name from the setting variable to show in the progress.
sal_Int32 nNameIndex = m_aSelectedPersona.indexOf( ';' );
OUString aName = m_aSelectedPersona.copy( 0, nNameIndex );
- OUString aProgress = OUString(CUI_RES(RID_SVXSTR_SELECTEDPERSONA)) + aName;
+ OUString aProgress = OUString(CuiResId(RID_SVXSTR_SELECTEDPERSONA)) + aName;
SetProgress( aProgress );
}
break;
@@ -676,7 +676,7 @@ void SearchAndParseThread::execute()
if( m_aURL.startsWith( "https://" ) )
{
m_pPersonaDialog->ClearSearchResults();
- OUString sProgress( CUI_RES( RID_SVXSTR_SEARCHING ) ), sError;
+ OUString sProgress( CuiResId( RID_SVXSTR_SEARCHING ) ), sError;
m_pPersonaDialog->SetProgress( sProgress );
PersonasDocHandler* pHandler = new PersonasDocHandler();
@@ -703,7 +703,7 @@ void SearchAndParseThread::execute()
{
// in case of a returned CommandFailedException
// SimpleFileAccess serves it, returning an empty stream
- sError = CUI_RES(RID_SVXSTR_SEARCHERROR);
+ sError = CuiResId(RID_SVXSTR_SEARCHERROR);
sError = sError.replaceAll("%1", m_aURL);
m_pPersonaDialog->SetProgress( OUString() );
ScopedVclPtrInstance< ErrorBox > aBox( nullptr, WB_OK, sError);
@@ -715,7 +715,7 @@ void SearchAndParseThread::execute()
{
// a catch all clause, in case the exception is not
// served elsewhere
- sError = CUI_RES(RID_SVXSTR_SEARCHERROR);
+ sError = CuiResId(RID_SVXSTR_SEARCHERROR);
sError = sError.replaceAll("%1", m_aURL);
m_pPersonaDialog->SetProgress( OUString() );
ScopedVclPtrInstance< ErrorBox > aBox( nullptr, WB_OK, sError );
@@ -729,7 +729,7 @@ void SearchAndParseThread::execute()
if( !pHandler->hasResults() )
{
- sProgress = CUI_RES( RID_SVXSTR_NORESULTS );
+ sProgress = CuiResId( RID_SVXSTR_NORESULTS );
m_pPersonaDialog->SetProgress( sProgress );
return;
}
@@ -755,7 +755,7 @@ void SearchAndParseThread::execute()
{
if( m_bDirectURL )
{
- sError = CUI_RES(RID_SVXSTR_SEARCHERROR);
+ sError = CuiResId(RID_SVXSTR_SEARCHERROR);
sError = sError.replaceAll("%1", m_aURL);
m_pPersonaDialog->SetProgress( OUString() );
ScopedVclPtrInstance< ErrorBox > aBox( nullptr, WB_OK, sError);
@@ -789,7 +789,7 @@ void SearchAndParseThread::execute()
else
{
- OUString sProgress( CUI_RES( RID_SVXSTR_APPLYPERSONA ) ), sError;
+ OUString sProgress( CuiResId( RID_SVXSTR_APPLYPERSONA ) ), sError;
m_pPersonaDialog->SetProgress( sProgress );
uno::Reference< ucb::XSimpleFileAccess3 > xFileAccess( ucb::SimpleFileAccess::create( comphelper::getProcessComponentContext() ), uno::UNO_QUERY );
@@ -838,7 +838,7 @@ void SearchAndParseThread::execute()
}
catch ( const uno::Exception & )
{
- sError = CUI_RES( RID_SVXSTR_SEARCHERROR );
+ sError = CuiResId( RID_SVXSTR_SEARCHERROR );
sError = sError.replaceAll("%1", m_aURL);
m_pPersonaDialog->SetProgress( OUString() );
ScopedVclPtrInstance< ErrorBox > aBox( nullptr, WB_OK, sError);
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 583e930916fa..e0b799b73da8 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -484,7 +484,7 @@ struct OptionsGroupInfo
#define INI_LIST() \
pCurrentPageEntry ( nullptr ),\
sTitle ( GetText() ),\
- sNotLoadedError ( CUI_RES( RID_SVXSTR_LOAD_ERROR ) ),\
+ sNotLoadedError ( CuiResId( RID_SVXSTR_LOAD_ERROR ) ),\
bForgetSelection ( false ),\
bIsFromExtensionManager( false ), \
bIsForSetDocumentLanguage( false )
@@ -1102,18 +1102,18 @@ void OfaTreeOptionsDialog::SelectHdl_Impl()
}
OfaPageResource::OfaPageResource() :
- aGeneralDlgAry(CUI_RES(SID_GENERAL_OPTIONS)),
- aInetDlgAry(CUI_RES(SID_INET_DLG)),
- aLangDlgAry(CUI_RES(SID_LANGUAGE_OPTIONS)),
- aTextDlgAry(CUI_RES(SID_SW_EDITOPTIONS)),
- aHTMLDlgAry(CUI_RES(SID_SW_ONLINEOPTIONS)),
- aCalcDlgAry(CUI_RES(SID_SC_EDITOPTIONS)),
- aStarMathDlgAry(CUI_RES(SID_SM_EDITOPTIONS)),
- aImpressDlgAry(CUI_RES(SID_SD_EDITOPTIONS)),
- aDrawDlgAry(CUI_RES(SID_SD_GRAPHIC_OPTIONS)),
- aChartDlgAry(CUI_RES(SID_SCH_EDITOPTIONS)),
- aFilterDlgAry(CUI_RES(SID_FILTER_DLG)),
- aDatasourcesDlgAry(CUI_RES(SID_SB_STARBASEOPTIONS))
+ aGeneralDlgAry(ResId(SID_GENERAL_OPTIONS, CUI_MGR())),
+ aInetDlgAry(ResId(SID_INET_DLG, CUI_MGR())),
+ aLangDlgAry(ResId(SID_LANGUAGE_OPTIONS, CUI_MGR())),
+ aTextDlgAry(ResId(SID_SW_EDITOPTIONS, CUI_MGR())),
+ aHTMLDlgAry(ResId(SID_SW_ONLINEOPTIONS, CUI_MGR())),
+ aCalcDlgAry(ResId(SID_SC_EDITOPTIONS, CUI_MGR())),
+ aStarMathDlgAry(ResId(SID_SM_EDITOPTIONS, CUI_MGR())),
+ aImpressDlgAry(ResId(SID_SD_EDITOPTIONS, CUI_MGR())),
+ aDrawDlgAry(ResId(SID_SD_GRAPHIC_OPTIONS, CUI_MGR())),
+ aChartDlgAry(ResId(SID_SCH_EDITOPTIONS, CUI_MGR())),
+ aFilterDlgAry(ResId(SID_FILTER_DLG, CUI_MGR())),
+ aDatasourcesDlgAry(ResId(SID_SB_STARBASEOPTIONS, CUI_MGR()))
{
}
diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx
index 8a16acd0b546..2586a454f71e 100644
--- a/cui/source/tabpages/align.cxx
+++ b/cui/source/tabpages/align.cxx
@@ -212,9 +212,9 @@ AlignmentTabPage::AlignmentTabPage( vcl::Window* pParent, const SfxItemSet& rCor
// Asian vertical mode
m_pCbAsianMode->Show( SvtCJKOptions().IsVerticalTextEnabled() );
- m_pLbFrameDir->InsertEntryValue( CUI_RES( RID_SVXSTR_FRAMEDIR_LTR ), SvxFrameDirection::Horizontal_LR_TB );
- m_pLbFrameDir->InsertEntryValue( CUI_RES( RID_SVXSTR_FRAMEDIR_RTL ), SvxFrameDirection::Horizontal_RL_TB );
- m_pLbFrameDir->InsertEntryValue( CUI_RES( RID_SVXSTR_FRAMEDIR_SUPER ), SvxFrameDirection::Environment );
+ m_pLbFrameDir->InsertEntryValue( CuiResId( RID_SVXSTR_FRAMEDIR_LTR ), SvxFrameDirection::Horizontal_LR_TB );
+ m_pLbFrameDir->InsertEntryValue( CuiResId( RID_SVXSTR_FRAMEDIR_RTL ), SvxFrameDirection::Horizontal_RL_TB );
+ m_pLbFrameDir->InsertEntryValue( CuiResId( RID_SVXSTR_FRAMEDIR_SUPER ), SvxFrameDirection::Environment );
// This page needs ExchangeSupport.
SetExchangeSupport();
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 96445f32a1b3..758859897bf9 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -193,14 +193,14 @@ IMPL_LINK(OfaAutoCorrDlg, SelectLanguageHdl, ListBox&, rBox, void)
OfaAutocorrOptionsPage::OfaAutocorrOptionsPage(vcl::Window* pParent, const SfxItemSet& rSet)
: SfxTabPage(pParent, "AutocorrectOptionsPage", "cui/ui/acoroptionspage.ui", &rSet)
- , m_sInput(CUI_RES(RID_SVXSTR_USE_REPLACE))
- , m_sDoubleCaps(CUI_RES(RID_SVXSTR_CPTL_STT_WORD))
- , m_sStartCap(CUI_RES(RID_SVXSTR_CPTL_STT_SENT))
- , m_sBoldUnderline(CUI_RES(RID_SVXSTR_BOLD_UNDER))
- , m_sURL(CUI_RES(RID_SVXSTR_DETECT_URL))
- , m_sNoDblSpaces(CUI_RES(RID_SVXSTR_NO_DBL_SPACES))
- , m_sDash(CUI_RES(RID_SVXSTR_DASH))
- , m_sAccidentalCaps(CUI_RES(RID_SVXSTR_CORRECT_ACCIDENTAL_CAPS_LOCK))
+ , m_sInput(CuiResId(RID_SVXSTR_USE_REPLACE))
+ , m_sDoubleCaps(CuiResId(RID_SVXSTR_CPTL_STT_WORD))
+ , m_sStartCap(CuiResId(RID_SVXSTR_CPTL_STT_SENT))
+ , m_sBoldUnderline(CuiResId(RID_SVXSTR_BOLD_UNDER))
+ , m_sURL(CuiResId(RID_SVXSTR_DETECT_URL))
+ , m_sNoDblSpaces(CuiResId(RID_SVXSTR_NO_DBL_SPACES))
+ , m_sDash(CuiResId(RID_SVXSTR_DASH))
+ , m_sAccidentalCaps(CuiResId(RID_SVXSTR_CORRECT_ACCIDENTAL_CAPS_LOCK))
{
get(m_pCheckLB, "checklist");
}
@@ -413,24 +413,24 @@ enum OfaAutoFmtOptions
OfaSwAutoFmtOptionsPage::OfaSwAutoFmtOptionsPage( vcl::Window* pParent,
const SfxItemSet& rSet )
: SfxTabPage(pParent, "ApplyAutoFmtPage", "cui/ui/applyautofmtpage.ui", &rSet)
- , sDeleteEmptyPara(CUI_RES(RID_SVXSTR_DEL_EMPTY_PARA))
- , sUseReplaceTbl(CUI_RES(RID_SVXSTR_USE_REPLACE))
- , sCapitalStartWord(CUI_RES(RID_SVXSTR_CPTL_STT_WORD))
- , sCapitalStartSentence(CUI_RES(RID_SVXSTR_CPTL_STT_SENT))
- , sUserStyle(CUI_RES(RID_SVXSTR_USER_STYLE))
- , sBullet(CUI_RES(RID_SVXSTR_BULLET))
- , sBoldUnder(CUI_RES(RID_SVXSTR_BOLD_UNDER))
- , sNoDblSpaces(CUI_RES(RID_SVXSTR_NO_DBL_SPACES))
- , sCorrectCapsLock(CUI_RES(RID_SVXSTR_CORRECT_ACCIDENTAL_CAPS_LOCK))
- , sDetectURL(CUI_RES(RID_SVXSTR_DETECT_URL))
- , sDash(CUI_RES(RID_SVXSTR_DASH))
- , sRightMargin(CUI_RES(RID_SVXSTR_RIGHT_MARGIN))
- , sNum(CUI_RES(RID_SVXSTR_NUM))
- , sBorder(CUI_RES(RID_SVXSTR_BORDER))
- , sTable(CUI_RES(RID_SVXSTR_CREATE_TABLE))
- , sReplaceTemplates(CUI_RES(RID_SVXSTR_REPLACE_TEMPLATES))
- , sDelSpaceAtSttEnd(CUI_RES(RID_SVXSTR_DEL_SPACES_AT_STT_END))
- , sDelSpaceBetweenLines(CUI_RES(RID_SVXSTR_DEL_SPACES_BETWEEN_LINES))
+ , sDeleteEmptyPara(CuiResId(RID_SVXSTR_DEL_EMPTY_PARA))
+ , sUseReplaceTbl(CuiResId(RID_SVXSTR_USE_REPLACE))
+ , sCapitalStartWord(CuiResId(RID_SVXSTR_CPTL_STT_WORD))
+ , sCapitalStartSentence(CuiResId(RID_SVXSTR_CPTL_STT_SENT))
+ , sUserStyle(CuiResId(RID_SVXSTR_USER_STYLE))
+ , sBullet(CuiResId(RID_SVXSTR_BULLET))
+ , sBoldUnder(CuiResId(RID_SVXSTR_BOLD_UNDER))
+ , sNoDblSpaces(CuiResId(RID_SVXSTR_NO_DBL_SPACES))
+ , sCorrectCapsLock(CuiResId(RID_SVXSTR_CORRECT_ACCIDENTAL_CAPS_LOCK))
+ , sDetectURL(CuiResId(RID_SVXSTR_DETECT_URL))
+ , sDash(CuiResId(RID_SVXSTR_DASH))
+ , sRightMargin(CuiResId(RID_SVXSTR_RIGHT_MARGIN))
+ , sNum(CuiResId(RID_SVXSTR_NUM))
+ , sBorder(CuiResId(RID_SVXSTR_BORDER))
+ , sTable(CuiResId(RID_SVXSTR_CREATE_TABLE))
+ , sReplaceTemplates(CuiResId(RID_SVXSTR_REPLACE_TEMPLATES))
+ , sDelSpaceAtSttEnd(CuiResId(RID_SVXSTR_DEL_SPACES_AT_STT_END))
+ , sDelSpaceBetweenLines(CuiResId(RID_SVXSTR_DEL_SPACES_BETWEEN_LINES))
, nPercent(50)
, pCheckButtonData(nullptr)
{
@@ -1812,8 +1812,8 @@ SvTreeListEntry* OfaQuoteTabPage::CreateEntry(OUString& rTxt, sal_uInt16 nCol)
OfaQuoteTabPage::OfaQuoteTabPage(vcl::Window* pParent, const SfxItemSet& rSet)
: SfxTabPage(pParent, "ApplyLocalizedPage", "cui/ui/applylocalizedpage.ui", &rSet)
- , sNonBrkSpace(CUI_RES(RID_SVXSTR_NON_BREAK_SPACE))
- , sOrdinal(CUI_RES(RID_SVXSTR_ORDINAL))
+ , sNonBrkSpace(CuiResId(RID_SVXSTR_NON_BREAK_SPACE))
+ , sOrdinal(CuiResId(RID_SVXSTR_ORDINAL))
, pCheckButtonData(nullptr)
, cSglStartQuote(0)
, cSglEndQuote(0)
@@ -2060,7 +2060,7 @@ IMPL_LINK( OfaQuoteTabPage, QuoteHdl, Button*, pBtn, void )
ScopedVclPtrInstance< SvxCharacterMap > pMap( this, true );
pMap->SetCharFont( OutputDevice::GetDefaultFont(DefaultFontType::LATIN_TEXT,
LANGUAGE_ENGLISH_US, GetDefaultFontFlags::OnlyOne ));
- pMap->SetText(nMode < SGL_END ? CUI_RES(RID_SVXSTR_STARTQUOTE) : CUI_RES(RID_SVXSTR_ENDQUOTE) );
+ pMap->SetText(nMode < SGL_END ? CuiResId(RID_SVXSTR_STARTQUOTE) : CuiResId(RID_SVXSTR_ENDQUOTE) );
sal_UCS4 cDlg;
SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect();
LanguageType eLang = Application::GetSettings().GetLanguageTag().getLanguageType();
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index 2f332aee4232..407550d2bf3f 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -382,7 +382,7 @@ SvxBackgroundTabPage::SvxBackgroundTabPage(vcl::Window* pParent, const SfxItemSe
m_pBackgroundColorSet->SetSelectHdl( HDL(BackgroundColorHdl_Impl) );
m_pBackgroundColorSet->SetStyle(m_pBackgroundColorSet->GetStyle() | WB_ITEMBORDER | WB_NAMEFIELD | WB_NONEFIELD);
- m_pBackgroundColorSet->SetText(SVX_RESSTR(RID_SVXSTR_NOFILL));
+ m_pBackgroundColorSet->SetText(SvxResId(RID_SVXSTR_NOFILL));
}
SvxBackgroundTabPage::~SvxBackgroundTabPage()
@@ -1528,7 +1528,7 @@ void SvxBackgroundTabPage::PageCreated(const SfxAllItemSet& aSet)
}
if ( nFlags & SvxBackgroundTabFlags::SHOW_HIGHLIGHTING )
{
- m_pBackGroundColorLabelFT->SetText(CUI_RES(RID_SVXSTR_CHARNAME_HIGHLIGHTING));
+ m_pBackGroundColorLabelFT->SetText(CuiResId(RID_SVXSTR_CHARNAME_HIGHLIGHTING));
bHighlighting = true;
}
}
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index 73c912d15d0a..606e66309205 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -1014,7 +1014,7 @@ void SvxBorderTabPage::FillPresetVS()
{
m_pWndPresets->InsertItem( nVSIdx );
m_pWndPresets->SetItemImage(nVSIdx, Image(m_aBorderImgVec[nVSIdx-1]));
- m_pWndPresets->SetItemText( nVSIdx, CUI_RES( GetPresetStringId( nVSIdx ) ) );
+ m_pWndPresets->SetItemText( nVSIdx, CuiResId( GetPresetStringId( nVSIdx ) ) );
}
// show the control
@@ -1037,7 +1037,7 @@ void SvxBorderTabPage::FillShadowVS()
{
m_pWndShadows->InsertItem( nVSIdx );
m_pWndShadows->SetItemImage(nVSIdx, Image(m_aShadowImgVec[nVSIdx-1]));
- m_pWndShadows->SetItemText( nVSIdx, CUI_RES( pnStrIds[ nVSIdx - 1 ] ) );
+ m_pWndShadows->SetItemText( nVSIdx, CuiResId( pnStrIds[ nVSIdx - 1 ] ) );
}
// show the control
@@ -1096,7 +1096,7 @@ void SvxBorderTabPage::FillLineListBox_Impl()
m_pLbLineStyle->SetSourceUnit( FUNIT_TWIP );
- m_pLbLineStyle->SetNone( SVX_RESSTR( RID_SVXSTR_NONE ) );
+ m_pLbLineStyle->SetNone( SvxResId( RID_SVXSTR_NONE ) );
for (size_t i = 0, n = SAL_N_ELEMENTS(aLines); i < n; ++i)
{
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index ae83f627e6f3..667e09955298 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -254,7 +254,7 @@ SvxCharNamePage::SvxCharNamePage( vcl::Window* pParent, const SfxItemSet& rInSet
: SvxCharBasePage(pParent, "CharNamePage", "cui/ui/charnamepage.ui", rInSet)
, m_pImpl(new SvxCharNamePage_Impl)
{
- m_pImpl->m_aNoStyleText = CUI_RES( RID_SVXSTR_CHARNAME_NOSTYLE );
+ m_pImpl->m_aNoStyleText = CuiResId( RID_SVXSTR_CHARNAME_NOSTYLE );
SvtLanguageOptions aLanguageOptions;
bool bShowCJK = aLanguageOptions.IsCJKFontEnabled();
@@ -319,18 +319,18 @@ SvxCharNamePage::SvxCharNamePage( vcl::Window* pParent, const SfxItemSet& rInSet
//In Windows the standard dialogs name font-name, font-style as
//Font, Style
#ifdef _WIN32
- OUString sFontFamilyString(CUI_RES(RID_SVXSTR_CHARNAME_FONT));
+ OUString sFontFamilyString(CuiResId(RID_SVXSTR_CHARNAME_FONT));
#else
- OUString sFontFamilyString(CUI_RES(RID_SVXSTR_CHARNAME_FAMILY));
+ OUString sFontFamilyString(CuiResId(RID_SVXSTR_CHARNAME_FAMILY));
#endif
m_pWestFontNameFT->SetText(sFontFamilyString);
m_pEastFontNameFT->SetText(sFontFamilyString);
m_pCTLFontNameFT->SetText(sFontFamilyString);
#ifdef MACOSX
- OUString sFontStyleString(CUI_RES(RID_SVXSTR_CHARNAME_TYPEFACE));
+ OUString sFontStyleString(CuiResId(RID_SVXSTR_CHARNAME_TYPEFACE));
#else
- OUString sFontStyleString(CUI_RES(RID_SVXSTR_CHARNAME_STYLE));
+ OUString sFontStyleString(CuiResId(RID_SVXSTR_CHARNAME_STYLE));
#endif
m_pWestFontStyleFT->SetText(sFontStyleString);
m_pEastFontStyleFT->SetText(sFontStyleString);
diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx
index ed1d7e6dfecd..f4d566875385 100644
--- a/cui/source/tabpages/connect.cxx
+++ b/cui/source/tabpages/connect.cxx
@@ -59,7 +59,7 @@ SvxConnectionDialog::SvxConnectionDialog( vcl::Window* pParent, const SfxItemSet
_pPage->Construct();
SetTabPage( _pPage );
- SetText(CUI_RES( RID_SVXSTR_CONNECTOR ));
+ SetText(CuiResId( RID_SVXSTR_CONNECTOR ));
}
/*************************************************************************
diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx
index 9df84cd66d4e..b0e0325e8995 100644
--- a/cui/source/tabpages/grfpage.cxx
+++ b/cui/source/tabpages/grfpage.cxx
@@ -708,7 +708,7 @@ void SvxGrfCropPage::GraphicHasChanged( bool bFound )
sal_Int32 ay = sal_Int32(floor((float)aOrigPixelSize.Height() /
((float)aOrigSize.Height()/TWIP_TO_INCH)+0.5));
sTemp += " ";
- sTemp += CUI_RES( RID_SVXSTR_PPI );
+ sTemp += CuiResId( RID_SVXSTR_PPI );
OUString sPPI = OUString::number(ax);
if (abs(ax - ay) > 1) {
sPPI += OUStringLiteral1(0x00D7) + OUString::number(ay);
diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx
index e6466fb640c2..8f90eac08a6d 100644
--- a/cui/source/tabpages/measure.cxx
+++ b/cui/source/tabpages/measure.cxx
@@ -69,7 +69,7 @@ SvxMeasureDialog::SvxMeasureDialog( vcl::Window* pParent, const SfxItemSet& rInA
_pPage->Construct();
SetTabPage(_pPage );
- SetText(CUI_RES(RID_SVXSTR_DIMENSION_LINE));
+ SetText(CuiResId(RID_SVXSTR_DIMENSION_LINE));
}
/*************************************************************************
@@ -804,7 +804,7 @@ void SvxMeasurePage::ChangeAttrHdl_Impl( void* p )
void SvxMeasurePage::FillUnitLB()
{
// fill ListBox with metrics
- SvxStringArray aMetricArr( SVX_RES( RID_SVXSTR_FIELDUNIT_TABLE ) );
+ SvxStringArray aMetricArr(ResId(RID_SVXSTR_FIELDUNIT_TABLE, DIALOG_MGR()));
sal_IntPtr nUnit = FUNIT_NONE;
OUString aStrMetric( m_pFtAutomatic->GetText());
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index 6a48ae3316d1..8e7944d5c625 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -237,7 +237,7 @@ SvxNumberFormatTabPage::SvxNumberFormatTabPage(vcl::Window* pParent,
, pNumItem(nullptr)
, pNumFmtShell(nullptr)
, nInitFormat(ULONG_MAX)
- , sAutomaticEntry(CUI_RES(RID_SVXSTR_AUTO_ENTRY))
+ , sAutomaticEntry(CuiResId(RID_SVXSTR_AUTO_ENTRY))
, pLastActivWindow(nullptr)
{
get(m_pFtCategory, "categoryft");
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index e6d35cf4e517..0c3d313c8686 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -990,7 +990,7 @@ IMPL_LINK_NOARG(SvxBitmapPickTabPage, ClickAddBrowseHdl_Impl, Button*, void)
{
sfx2::FileDialogHelper aFileDialog(0);
- aFileDialog.SetTitle(CUI_RES(RID_SVXSTR_ADD_IMAGE));
+ aFileDialog.SetTitle(CuiResId(RID_SVXSTR_ADD_IMAGE));
if ( aFileDialog.Execute() != ERRCODE_NONE )
return;
@@ -1178,7 +1178,7 @@ SvxNumOptionsTabPage::SvxNumOptionsTabPage(vcl::Window* pParent,
eCoreUnit = rSet.GetPool()->GetMetric(rSet.GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE));
// Fill ListBox with predefined / translated numbering types.
- ResStringArray aNames( SVX_RES( RID_SVXSTRARY_NUMBERINGTYPE ));
+ ResStringArray aNames(ResId(RID_SVXSTRARY_NUMBERINGTYPE, DIALOG_MGR()));
sal_uInt32 nCount = aNames.Count();
for (sal_uInt32 i = 0; i < nCount; ++i)
{
@@ -1950,7 +1950,7 @@ IMPL_LINK( SvxNumOptionsTabPage, GraphicHdl_Impl, MenuButton *, pButton, void )
OUString aGrfName;
Size aSize;
bool bSucc(false);
- SvxOpenGraphicDialog aGrfDlg( CUI_RES(RID_SVXSTR_EDIT_GRAPHIC) );
+ SvxOpenGraphicDialog aGrfDlg( CuiResId(RID_SVXSTR_EDIT_GRAPHIC) );
if(MN_GALLERY_ENTRY <= nItemId )
{
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index e0f701220d48..16100cc46413 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -218,11 +218,11 @@ SvxPageDescPage::SvxPageDescPage( vcl::Window* pParent, const SfxItemSet& rAttr
// fill text flow listbox with valid entries
- m_pTextFlowBox->InsertEntryValue( CUI_RES( RID_SVXSTR_PAGEDIR_LTR_HORI ), SvxFrameDirection::Horizontal_LR_TB );
+ m_pTextFlowBox->InsertEntryValue( CuiResId( RID_SVXSTR_PAGEDIR_LTR_HORI ), SvxFrameDirection::Horizontal_LR_TB );
if( bCTL )
- m_pTextFlowBox->InsertEntryValue( CUI_RES( RID_SVXSTR_PAGEDIR_RTL_HORI ), SvxFrameDirection::Horizontal_RL_TB );
+ m_pTextFlowBox->InsertEntryValue( CuiResId( RID_SVXSTR_PAGEDIR_RTL_HORI ), SvxFrameDirection::Horizontal_RL_TB );
// #109989# do not show vertical directions in Writer/Web
@@ -230,8 +230,8 @@ SvxPageDescPage::SvxPageDescPage( vcl::Window* pParent, const SfxItemSet& rAttr
{
if( bCJK )
{
- m_pTextFlowBox->InsertEntryValue( CUI_RES( RID_SVXSTR_PAGEDIR_RTL_VERT ), SvxFrameDirection::Vertical_RL_TB );
- m_pTextFlowBox->InsertEntryValue( CUI_RES( RID_SVXSTR_PAGEDIR_LTR_VERT ), SvxFrameDirection::Vertical_LR_TB );
+ m_pTextFlowBox->InsertEntryValue( CuiResId( RID_SVXSTR_PAGEDIR_RTL_VERT ), SvxFrameDirection::Vertical_RL_TB );
+ m_pTextFlowBox->InsertEntryValue( CuiResId( RID_SVXSTR_PAGEDIR_LTR_VERT ), SvxFrameDirection::Vertical_LR_TB );
}
}
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index fece2c82efe8..986f433852e0 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -1044,9 +1044,9 @@ SvxParaAlignTabPage::SvxParaAlignTabPage( vcl::Window* pParent, const SfxItemSet
m_pLastLineLB->SetSelectHdl( LINK( this, SvxParaAlignTabPage, LastLineHdl_Impl ) );
m_pTextDirectionLB->SetSelectHdl( LINK( this, SvxParaAlignTabPage, TextDirectionHdl_Impl ) );
- m_pTextDirectionLB->InsertEntryValue( CUI_RES( RID_SVXSTR_FRAMEDIR_SUPER ), SvxFrameDirection::Environment );
- m_pTextDirectionLB->InsertEntryValue( CUI_RES( RID_SVXSTR_FRAMEDIR_LTR ), SvxFrameDirection::Horizontal_LR_TB );
- m_pTextDirectionLB->InsertEntryValue( CUI_RES( RID_SVXSTR_FRAMEDIR_RTL ), SvxFrameDirection::Horizontal_RL_TB );
+ m_pTextDirectionLB->InsertEntryValue( CuiResId( RID_SVXSTR_FRAMEDIR_SUPER ), SvxFrameDirection::Environment );
+ m_pTextDirectionLB->InsertEntryValue( CuiResId( RID_SVXSTR_FRAMEDIR_LTR ), SvxFrameDirection::Horizontal_LR_TB );
+ m_pTextDirectionLB->InsertEntryValue( CuiResId( RID_SVXSTR_FRAMEDIR_RTL ), SvxFrameDirection::Horizontal_RL_TB );
setPreviewsToSamePlace(pParent, this);
}
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index 1bdbe8ac7752..d4f2513d8b98 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -557,7 +557,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickRenameHdl, SvxPresetListBox*, void)
if( nPos != VALUESET_ITEM_NOTFOUND )
{
- OUString aDesc( CUI_RES( RID_SVXSTR_DESC_NEW_BITMAP ) );
+ OUString aDesc( CuiResId( RID_SVXSTR_DESC_NEW_BITMAP ) );
OUString aName( m_pBitmapList->GetBitmap( nPos )->GetName() );
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index 848e476313cd..232dc45e2f64 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -352,8 +352,8 @@ IMPL_LINK(SvxColorTabPage, ModifiedHdl_Impl, Edit&, rEdit, void)
IMPL_LINK_NOARG(SvxColorTabPage, ClickAddHdl_Impl, Button*, void)
{
- OUString aNewName( SVX_RES( RID_SVXSTR_COLOR ) );
- OUString aDesc( CUI_RES( RID_SVXSTR_DESC_COLOR ) );
+ OUString aNewName( SvxResId( RID_SVXSTR_COLOR ) );
+ OUString aDesc( CuiResId( RID_SVXSTR_DESC_COLOR ) );
OUString aName;
long j = 1;
diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index c82d4bf4b5f7..f7f2de67e2ae 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -187,7 +187,7 @@ void SvxGradientTabPage::ActivatePage( const SfxItemSet& rSet )
// determining (and possibly cutting) the name and
// displaying it in the GroupBox
- OUString aString( CUI_RES( RID_SVXSTR_TABLE ) );
+ OUString aString( CuiResId( RID_SVXSTR_TABLE ) );
aString += ": ";
INetURLObject aURL( m_pGradientList->GetPath() );
@@ -360,8 +360,8 @@ void SvxGradientTabPage::ModifiedHdl_Impl( void* pControl )
IMPL_LINK_NOARG(SvxGradientTabPage, ClickAddHdl_Impl, Button*, void)
{
- OUString aNewName( SVX_RES( RID_SVXSTR_GRADIENT ) );
- OUString aDesc( CUI_RES( RID_SVXSTR_DESC_GRADIENT ) );
+ OUString aNewName( SvxResId( RID_SVXSTR_GRADIENT ) );
+ OUString aDesc( CuiResId( RID_SVXSTR_DESC_GRADIENT ) );
OUString aName;
long nCount = m_pGradientList->Count();
@@ -501,7 +501,7 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickRenameHdl_Impl, SvxPresetListBox*, void
if ( nPos != VALUESET_ITEM_NOTFOUND )
{
- OUString aDesc( CUI_RES( RID_SVXSTR_DESC_GRADIENT ) );
+ OUString aDesc( CuiResId( RID_SVXSTR_DESC_GRADIENT ) );
OUString aName( m_pGradientList->GetGradient( nPos )->GetName() );
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index 377400f56ce7..42e7c6e39231 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -174,7 +174,7 @@ void SvxHatchTabPage::ActivatePage( const SfxItemSet& rSet )
// determining (possibly cutting) the name
// and displaying it in the GroupBox
- OUString aString( CUI_RES( RID_SVXSTR_TABLE ) );
+ OUString aString( CuiResId( RID_SVXSTR_TABLE ) );
aString += ": ";
INetURLObject aURL( m_pHatchingList->GetPath() );
@@ -431,8 +431,8 @@ void SvxHatchTabPage::ChangeHatchHdl_Impl()
IMPL_LINK_NOARG(SvxHatchTabPage, ClickAddHdl_Impl, Button*, void)
{
- OUString aNewName( SVX_RES( RID_SVXSTR_HATCH ) );
- OUString aDesc( CUI_RES( RID_SVXSTR_DESC_HATCH ) );
+ OUString aNewName( SvxResId( RID_SVXSTR_HATCH ) );
+ OUString aDesc( CuiResId( RID_SVXSTR_DESC_HATCH ) );
OUString aName;
long nCount = m_pHatchingList->Count();
@@ -563,7 +563,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickRenameHdl_Impl, SvxPresetListBox*, void )
if( nPos != VALUESET_ITEM_NOTFOUND )
{
- OUString aDesc( CUI_RES( RID_SVXSTR_DESC_HATCH ) );
+ OUString aDesc( CuiResId( RID_SVXSTR_DESC_HATCH ) );
OUString aName( m_pHatchingList->GetHatch( nPos )->GetName() );
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index 437cda7f6cd6..52830e93919f 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -463,7 +463,7 @@ void SvxLineTabPage::SymbolSelected(MenuButton* pButton)
break;
default:
{
- SvxOpenGraphicDialog aGrfDlg(CUI_RES(RID_SVXSTR_EDIT_GRAPHIC));
+ SvxOpenGraphicDialog aGrfDlg(CuiResId(RID_SVXSTR_EDIT_GRAPHIC));
aGrfDlg.EnableLink(false);
aGrfDlg.AsLink(false);
if( !aGrfDlg.Execute() )
@@ -525,7 +525,7 @@ void SvxLineTabPage::FillListboxes()
m_pLbLineStyle->SelectEntryPos( nOldSelect );
// Line end style
- OUString sNone( SVX_RES( RID_SVXSTR_NONE ) );
+ OUString sNone( SvxResId( RID_SVXSTR_NONE ) );
nOldSelect = m_pLbStartStyle->GetSelectEntryPos();
m_pLbStartStyle->Clear();
m_pLbStartStyle->InsertEntry( sNone );
@@ -562,8 +562,8 @@ void SvxLineTabPage::ActivatePage( const SfxItemSet& rSet )
nPos = m_pLbLineStyle->GetSelectEntryPos();
m_pLbLineStyle->Clear();
- m_pLbLineStyle->InsertEntry( SVX_RESSTR( RID_SVXSTR_INVISIBLE ) );
- m_pLbLineStyle->InsertEntry( SVX_RESSTR( RID_SVXSTR_SOLID ) );
+ m_pLbLineStyle->InsertEntry( SvxResId( RID_SVXSTR_INVISIBLE ) );
+ m_pLbLineStyle->InsertEntry( SvxResId( RID_SVXSTR_SOLID ) );
m_pLbLineStyle->Fill( m_pDashList );
nCount = m_pLbLineStyle->GetEntryCount();
@@ -589,7 +589,7 @@ void SvxLineTabPage::ActivatePage( const SfxItemSet& rSet )
*m_pnLineEndListState = ChangeType::NONE;
nPos = m_pLbLineStyle->GetSelectEntryPos();
- OUString sNone( SVX_RES( RID_SVXSTR_NONE ) );
+ OUString sNone( SvxResId( RID_SVXSTR_NONE ) );
m_pLbStartStyle->Clear();
m_pLbStartStyle->InsertEntry( sNone );
diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx
index 1708ed4bf7d3..12aaf3c9c964 100644
--- a/cui/source/tabpages/tplnedef.cxx
+++ b/cui/source/tabpages/tplnedef.cxx
@@ -203,7 +203,7 @@ void SvxLineDefTabPage::ActivatePage( const SfxItemSet& )
// determining (and possibly cutting) the name
// and displaying it in the GroupBox
-// OUString aString( CUI_RES( RID_SVXSTR_TABLE ) );
+// OUString aString( CuiResId( RID_SVXSTR_TABLE ) );
// aString += ": ";
INetURLObject aURL( pDashList->GetPath() );
@@ -244,7 +244,7 @@ void SvxLineDefTabPage::CheckChanges_Impl()
ResMgr& rMgr = CUI_MGR();
Image aWarningBoxImage = WarningBox::GetStandardImage();
ScopedVclPtrInstance<SvxMessDialog> aMessDlg( GetParentDialog(),
- SVX_RESSTR( RID_SVXSTR_LINESTYLE ),
+ SvxResId( RID_SVXSTR_LINESTYLE ),
OUString( ResId( RID_SVXSTR_ASK_CHANGE_LINESTYLE, rMgr ) ),
&aWarningBoxImage );
DBG_ASSERT(aMessDlg, "Dialog creation failed!");
@@ -534,7 +534,7 @@ void SvxLineDefTabPage::SelectTypeHdl_Impl(ListBox* p)
IMPL_LINK_NOARG(SvxLineDefTabPage, ClickAddHdl_Impl, Button*, void)
{
ResMgr& rMgr = CUI_MGR();
- OUString aNewName( SVX_RES( RID_SVXSTR_LINESTYLE ) );
+ OUString aNewName( SvxResId( RID_SVXSTR_LINESTYLE ) );
OUString aDesc( ResId( RID_SVXSTR_DESC_LINESTYLE, rMgr ) );
OUString aName;
diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx
index 2eaac554ff91..924a9895dc70 100644
--- a/cui/source/tabpages/tplneend.cxx
+++ b/cui/source/tabpages/tplneend.cxx
@@ -419,7 +419,7 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickAddHdl_Impl, Button*, void)
SdrObject::Free( pConvPolyObj );
ResMgr& rMgr = CUI_MGR();
- OUString aNewName( SVX_RES( RID_SVXSTR_LINEEND ) );
+ OUString aNewName( SvxResId( RID_SVXSTR_LINEEND ) );
OUString aDesc( ResId( RID_SVXSTR_DESC_LINEEND, rMgr ) );
OUString aName;
diff --git a/cui/source/tabpages/tppattern.cxx b/cui/source/tabpages/tppattern.cxx
index 5bed8420105b..df6a58249fec 100644
--- a/cui/source/tabpages/tppattern.cxx
+++ b/cui/source/tabpages/tppattern.cxx
@@ -176,7 +176,7 @@ void SvxPatternTabPage::ActivatePage( const SfxItemSet& rSet )
// determining (possibly cutting) the name and
// displaying it in the GroupBox
- OUString aString( CUI_RES( RID_SVXSTR_TABLE ) );
+ OUString aString( CuiResId( RID_SVXSTR_TABLE ) );
aString += ": ";
INetURLObject aURL( m_pPatternList->GetPath() );
@@ -350,8 +350,8 @@ IMPL_LINK_NOARG(SvxPatternTabPage, ChangePatternHdl_Impl, ValueSet*, void)
IMPL_LINK_NOARG(SvxPatternTabPage, ClickAddHdl_Impl, Button*, void)
{
- OUString aNewName( SVX_RES( RID_SVXSTR_PATTERN_UNTITLED ) );
- OUString aDesc( CUI_RES( RID_SVXSTR_DESC_NEW_PATTERN ) );
+ OUString aNewName( SvxResId( RID_SVXSTR_PATTERN_UNTITLED ) );
+ OUString aDesc( CuiResId( RID_SVXSTR_DESC_NEW_PATTERN ) );
OUString aName;
long nCount = m_pPatternList->Count();
diff --git a/desktop/inc/dp_gui_shared.hxx b/desktop/inc/dp_gui_shared.hxx
index bd175cb3bfa5..63496c860867 100644
--- a/desktop/inc/dp_gui_shared.hxx
+++ b/desktop/inc/dp_gui_shared.hxx
@@ -33,13 +33,10 @@ struct DeploymentGuiResMgr :
}
};
-class DpGuiResId : public ResId
+inline OUString DpGuiResId(sal_uInt16 nId)
{
-public:
- explicit DpGuiResId( sal_uInt16 nId ):ResId( nId, *DeploymentGuiResMgr::get() ) {}
-};
-
-#define DPGUI_RESSTR(i) DpGuiResId(i).toString()
+ return ResId(nId, *DeploymentGuiResMgr::get());
+}
} // namespace dp_gui
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 627cf6a2db92..5ec52681c5a7 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -374,7 +374,7 @@ OUString GetMsgString(
{
ResMgr* resMgr = Desktop::GetDesktopResManager();
if ( resMgr )
- return ResId(nId, *resMgr).toString();
+ return ResId(nId, *resMgr);
}
return aFallbackMsg;
}
@@ -402,7 +402,7 @@ OUString MakeStartupConfigAccessErrorMessage( OUString const & aInternalErrMsg )
ResMgr* pResMgr = Desktop::GetDesktopResManager();
if ( pResMgr )
- aDiagnosticMessage.append( ResId(STR_BOOTSTRAP_ERR_CFG_DATAACCESS, *pResMgr).toString() );
+ aDiagnosticMessage.append( ResId(STR_BOOTSTRAP_ERR_CFG_DATAACCESS, *pResMgr) );
else
aDiagnosticMessage.append( "The program cannot be started." );
@@ -410,7 +410,7 @@ OUString MakeStartupConfigAccessErrorMessage( OUString const & aInternalErrMsg )
{
aDiagnosticMessage.append( "\n\n" );
if ( pResMgr )
- aDiagnosticMessage.append( ResId(STR_INTERNAL_ERRMSG, *pResMgr).toString() );
+ aDiagnosticMessage.append( ResId(STR_INTERNAL_ERRMSG, *pResMgr) );
else
aDiagnosticMessage.append( "The following internal error has occurred:\n\n" );
aDiagnosticMessage.append( aInternalErrMsg );
@@ -1163,7 +1163,7 @@ void restartOnMac(bool passArguments) {
#if HAVE_FEATURE_MACOSX_SANDBOX
(void) passArguments; // avoid warnings
ResMgr *resMgr = Desktop::GetDesktopResManager();
- OUString aMessage = ResId(STR_LO_MUST_BE_RESTARTED, *resMgr).toString();
+ OUString aMessage = ResId(STR_LO_MUST_BE_RESTARTED, *resMgr);
MessageDialog aRestartBox(NULL, aMessage);
aRestartBox.Execute();
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index a7ff752f9fa3..dc75acbb8264 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -92,7 +92,7 @@ struct StrAllFiles : public rtl::StaticWithInit< OUString, StrAllFiles >
const SolarMutexGuard guard;
std::unique_ptr< ResMgr > const resmgr( ResMgr::CreateResMgr( "fps_office" ) );
OSL_ASSERT( resmgr.get() != nullptr );
- return ResId(STR_FILTERNAME_ALL, *resmgr.get()).toString();
+ return ResId(STR_FILTERNAME_ALL, *resmgr.get());
}
};
@@ -358,7 +358,7 @@ ResId DialogHelper::getResId( sal_uInt16 nId )
OUString DialogHelper::getResourceString(sal_uInt16 id)
{
const SolarMutexGuard guard;
- OUString ret(ResId(id, *DeploymentGuiResMgr::get()).toString());
+ OUString ret(ResId(id, *DeploymentGuiResMgr::get()));
if (ret.indexOf("%PRODUCTNAME" ) != -1)
{
ret = ret.replaceAll("%PRODUCTNAME", utl::ConfigManager::getProductName());
diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
index a7970b81297e..d8f4abc5b06e 100644
--- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
@@ -436,15 +436,15 @@ void ProgressCmdEnv::handle( uno::Reference< task::XInteractionRequest > const &
//hypothetical: requires two instances of an extension with the same
//version to have different display names. Probably the developer forgot
//to change the version.
- s = ResId(RID_STR_WARNINGBOX_VERSION_EQUAL_DIFFERENT_NAMES, *DeploymentGuiResMgr::get()).toString();
+ s = ResId(RID_STR_WARNINGBOX_VERSION_EQUAL_DIFFERENT_NAMES, *DeploymentGuiResMgr::get());
}
else if (id == RID_STR_WARNING_VERSION_LESS)
{
- s = ResId(RID_STR_WARNINGBOX_VERSION_LESS_DIFFERENT_NAMES, *DeploymentGuiResMgr::get()).toString();
+ s = ResId(RID_STR_WARNINGBOX_VERSION_LESS_DIFFERENT_NAMES, *DeploymentGuiResMgr::get());
}
else if (id == RID_STR_WARNING_VERSION_GREATER)
{
- s = ResId(RID_STR_WARNINGBOX_VERSION_GREATER_DIFFERENT_NAMES, *DeploymentGuiResMgr::get()).toString();
+ s = ResId(RID_STR_WARNINGBOX_VERSION_GREATER_DIFFERENT_NAMES, *DeploymentGuiResMgr::get());
}
s = s.replaceAll("$NAME", verExc.NewDisplayName);
s = s.replaceAll("$OLDNAME", verExc.Deployed->getDisplayName());
@@ -477,7 +477,7 @@ void ProgressCmdEnv::handle( uno::Reference< task::XInteractionRequest > const &
else if (request >>= platExc)
{
SolarMutexGuard guard;
- OUString sMsg(ResId(RID_STR_UNSUPPORTED_PLATFORM, *DeploymentGuiResMgr::get()).toString());
+ OUString sMsg(ResId(RID_STR_UNSUPPORTED_PLATFORM, *DeploymentGuiResMgr::get()));
sMsg = sMsg.replaceAll("%Name", platExc.package->getDisplayName());
ScopedVclPtrInstance< MessageDialog > box(m_pDialogHelper? m_pDialogHelper->getWindow() : nullptr, sMsg);
box->Execute();
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
index 9f9760607725..51c213c5d97b 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
@@ -482,17 +482,17 @@ UpdateDialog::UpdateDialog(
std::vector< dp_gui::UpdateData > * updateData):
ModalDialog(parent, "UpdateDialog", "desktop/ui/updatedialog.ui"),
m_context(context),
- m_none(DPGUI_RESSTR(RID_DLG_UPDATE_NONE)),
- m_noInstallable(DPGUI_RESSTR(RID_DLG_UPDATE_NOINSTALLABLE)),
- m_failure(DPGUI_RESSTR(RID_DLG_UPDATE_FAILURE)),
- m_unknownError(DPGUI_RESSTR(RID_DLG_UPDATE_UNKNOWNERROR)),
- m_noDescription(DPGUI_RESSTR(RID_DLG_UPDATE_NODESCRIPTION)),
- m_noInstall(DPGUI_RESSTR(RID_DLG_UPDATE_NOINSTALL)),
- m_noDependency(DPGUI_RESSTR(RID_DLG_UPDATE_NODEPENDENCY)),
- m_noDependencyCurVer(DPGUI_RESSTR(RID_DLG_UPDATE_NODEPENDENCY_CUR_VER)),
- m_browserbased(DPGUI_RESSTR(RID_DLG_UPDATE_BROWSERBASED)),
- m_version(DPGUI_RESSTR(RID_DLG_UPDATE_VERSION)),
- m_ignoredUpdate(DPGUI_RESSTR(RID_DLG_UPDATE_IGNORED_UPDATE)),
+ m_none(DpGuiResId(RID_DLG_UPDATE_NONE)),
+ m_noInstallable(DpGuiResId(RID_DLG_UPDATE_NOINSTALLABLE)),
+ m_failure(DpGuiResId(RID_DLG_UPDATE_FAILURE)),
+ m_unknownError(DpGuiResId(RID_DLG_UPDATE_UNKNOWNERROR)),
+ m_noDescription(DpGuiResId(RID_DLG_UPDATE_NODESCRIPTION)),
+ m_noInstall(DpGuiResId(RID_DLG_UPDATE_NOINSTALL)),
+ m_noDependency(DpGuiResId(RID_DLG_UPDATE_NODEPENDENCY)),
+ m_noDependencyCurVer(DpGuiResId(RID_DLG_UPDATE_NODEPENDENCY_CUR_VER)),
+ m_browserbased(DpGuiResId(RID_DLG_UPDATE_BROWSERBASED)),
+ m_version(DpGuiResId(RID_DLG_UPDATE_VERSION)),
+ m_ignoredUpdate(DpGuiResId(RID_DLG_UPDATE_IGNORED_UPDATE)),
m_updateData(*updateData),
m_thread(
new UpdateDialog::Thread(
@@ -598,9 +598,9 @@ short UpdateDialog::Execute() {
UpdateDialog::CheckListBox::CheckListBox( vcl::Window* pParent, UpdateDialog & dialog):
SvxCheckListBox( pParent, WinBits(WB_BORDER) ),
- m_ignoreUpdate( DPGUI_RESSTR( RID_DLG_UPDATE_IGNORE ) ),
- m_ignoreAllUpdates( DPGUI_RESSTR( RID_DLG_UPDATE_IGNORE_ALL ) ),
- m_enableUpdate( DPGUI_RESSTR( RID_DLG_UPDATE_ENABLE ) ),
+ m_ignoreUpdate( DpGuiResId( RID_DLG_UPDATE_IGNORE ) ),
+ m_ignoreAllUpdates( DpGuiResId( RID_DLG_UPDATE_IGNORE_ALL ) ),
+ m_enableUpdate( DpGuiResId( RID_DLG_UPDATE_ENABLE ) ),
m_dialog(dialog)
{
SetNormalStaticImage(Image(BitmapEx(RID_DLG_UPDATE_NORMALALERT)));
diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
index 8f18c13c8060..ddadb5f7afd1 100644
--- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
@@ -205,14 +205,14 @@ UpdateInstallDialog::UpdateInstallDialog(
m_thread(new Thread(xCtx, *this, aVecUpdateData)),
m_bError(false),
m_bNoEntry(true),
- m_sInstalling(DPGUI_RESSTR(RID_DLG_UPDATE_INSTALL_INSTALLING)),
- m_sFinished(DPGUI_RESSTR(RID_DLG_UPDATE_INSTALL_FINISHED)),
- m_sNoErrors(DPGUI_RESSTR(RID_DLG_UPDATE_INSTALL_NO_ERRORS)),
- m_sErrorDownload(DPGUI_RESSTR(RID_DLG_UPDATE_INSTALL_ERROR_DOWNLOAD)),
- m_sErrorInstallation(DPGUI_RESSTR(RID_DLG_UPDATE_INSTALL_ERROR_INSTALLATION)),
- m_sErrorLicenseDeclined(DPGUI_RESSTR(RID_DLG_UPDATE_INSTALL_ERROR_LIC_DECLINED)),
- m_sNoInstall(DPGUI_RESSTR(RID_DLG_UPDATE_INSTALL_EXTENSION_NOINSTALL)),
- m_sThisErrorOccurred(DPGUI_RESSTR(RID_DLG_UPDATE_INSTALL_THIS_ERROR_OCCURRED))
+ m_sInstalling(DpGuiResId(RID_DLG_UPDATE_INSTALL_INSTALLING)),
+ m_sFinished(DpGuiResId(RID_DLG_UPDATE_INSTALL_FINISHED)),
+ m_sNoErrors(DpGuiResId(RID_DLG_UPDATE_INSTALL_NO_ERRORS)),
+ m_sErrorDownload(DpGuiResId(RID_DLG_UPDATE_INSTALL_ERROR_DOWNLOAD)),
+ m_sErrorInstallation(DpGuiResId(RID_DLG_UPDATE_INSTALL_ERROR_INSTALLATION)),
+ m_sErrorLicenseDeclined(DpGuiResId(RID_DLG_UPDATE_INSTALL_ERROR_LIC_DECLINED)),
+ m_sNoInstall(DpGuiResId(RID_DLG_UPDATE_INSTALL_EXTENSION_NOINSTALL)),
+ m_sThisErrorOccurred(DpGuiResId(RID_DLG_UPDATE_INSTALL_THIS_ERROR_OCCURRED))
{
get(m_pFt_action, "DOWNLOADING");
get(m_pStatusbar, "STATUSBAR");
diff --git a/desktop/source/deployment/misc/dp_dependencies.cxx b/desktop/source/deployment/misc/dp_dependencies.cxx
index 10d10f292765..6112ad114593 100644
--- a/desktop/source/deployment/misc/dp_dependencies.cxx
+++ b/desktop/source/deployment/misc/dp_dependencies.cxx
@@ -85,7 +85,7 @@ OUString produceErrorText(
{
return reason.replaceFirst("%VERSION",
(version.isEmpty()
- ? dp_misc::getResId(RID_DEPLOYMENT_DEPENDENCIES_UNKNOWN).toString()
+ ? dp_misc::getResId(RID_DEPLOYMENT_DEPENDENCIES_UNKNOWN)
: version));
}
@@ -156,27 +156,27 @@ OUString getErrorText(
if ( dependency->getNamespaceURI() == namespaceOpenOfficeOrg && dependency->getTagName() == minimalVersionOpenOfficeOrg )
{
return produceErrorText(
- dp_misc::getResId(RID_DEPLOYMENT_DEPENDENCIES_OOO_MIN).toString(),
+ dp_misc::getResId(RID_DEPLOYMENT_DEPENDENCIES_OOO_MIN),
dependency->getAttribute("value"));
} else if (dependency->getNamespaceURI() == namespaceOpenOfficeOrg && dependency->getTagName() == maximalVersionOpenOfficeOrg )
{
return produceErrorText(
- dp_misc::getResId(RID_DEPLOYMENT_DEPENDENCIES_OOO_MAX).toString(),
+ dp_misc::getResId(RID_DEPLOYMENT_DEPENDENCIES_OOO_MAX),
dependency->getAttribute("value"));
} else if (dependency->getNamespaceURI() == namespaceLibreOffice && dependency->getTagName() == minimalVersionLibreOffice )
{
return produceErrorText(
- dp_misc::getResId(RID_DEPLOYMENT_DEPENDENCIES_LO_MIN).toString(),
+ dp_misc::getResId(RID_DEPLOYMENT_DEPENDENCIES_LO_MIN),
dependency->getAttribute("value"));
} else if (dependency->hasAttributeNS(namespaceOpenOfficeOrg,
minimalVersionOpenOfficeOrg))
{
return produceErrorText(
- dp_misc::getResId(RID_DEPLOYMENT_DEPENDENCIES_OOO_MIN).toString(),
+ dp_misc::getResId(RID_DEPLOYMENT_DEPENDENCIES_OOO_MIN),
dependency->getAttributeNS(namespaceOpenOfficeOrg,
minimalVersionOpenOfficeOrg));
} else {
- return dp_misc::getResId(RID_DEPLOYMENT_DEPENDENCIES_UNKNOWN).toString();
+ return dp_misc::getResId(RID_DEPLOYMENT_DEPENDENCIES_UNKNOWN);
}
}
diff --git a/desktop/source/deployment/misc/dp_resource.cxx b/desktop/source/deployment/misc/dp_resource.cxx
index f03633df7fe8..b7f3739c85a2 100644
--- a/desktop/source/deployment/misc/dp_resource.cxx
+++ b/desktop/source/deployment/misc/dp_resource.cxx
@@ -68,7 +68,7 @@ ResId getResId( sal_uInt16 id )
OUString getResourceString( sal_uInt16 id )
{
const osl::MutexGuard guard(theResourceMutex::get());
- OUString ret(ResId(id, *DeploymentResMgr::get()).toString());
+ OUString ret(ResId(id, *DeploymentResMgr::get()));
return ret.replaceAll("%PRODUCTNAME", utl::ConfigManager::getProductName());
}
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 99bd66bbeea2..572bdd0eaef4 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2493,7 +2493,7 @@ static char* getStyles(LibreOfficeKitDocument* pThis, const char* pCommand)
{
boost::property_tree::ptree aChild;
- OUString sClearFormat = SVX_RESSTR( RID_SVXSTR_CLEARFORM );
+ OUString sClearFormat = SvxResId(RID_SVXSTR_CLEARFORM);
boost::property_tree::ptree aName;
aName.put("", sClearFormat.toUtf8());
diff --git a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx
index 80ed1bcec910..0eb7feff44e4 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx
@@ -137,15 +137,15 @@ void CommandEnvironmentImpl::printLicense(
const OUString & sName, const OUString& sLicense, bool & accept, bool &decline)
{
ResMgr * pResMgr = DeploymentResMgr::get();
- OUString s1tmp(ResId(RID_STR_UNOPKG_ACCEPT_LIC_1, *pResMgr).toString());
+ OUString s1tmp(ResId(RID_STR_UNOPKG_ACCEPT_LIC_1, *pResMgr));
OUString s1(s1tmp.replaceAll("$NAME", sName));
- OUString s2 = ResId(RID_STR_UNOPKG_ACCEPT_LIC_2, *pResMgr).toString();
- OUString s3 = ResId(RID_STR_UNOPKG_ACCEPT_LIC_3, *pResMgr).toString();
- OUString s4 = ResId(RID_STR_UNOPKG_ACCEPT_LIC_4, *pResMgr).toString();
- OUString sYES = ResId(RID_STR_UNOPKG_ACCEPT_LIC_YES, *pResMgr).toString();
- OUString sY = ResId(RID_STR_UNOPKG_ACCEPT_LIC_Y, *pResMgr).toString();
- OUString sNO = ResId(RID_STR_UNOPKG_ACCEPT_LIC_NO, *pResMgr).toString();
- OUString sN = ResId(RID_STR_UNOPKG_ACCEPT_LIC_N, *pResMgr).toString();
+ OUString s2 = ResId(RID_STR_UNOPKG_ACCEPT_LIC_2, *pResMgr);
+ OUString s3 = ResId(RID_STR_UNOPKG_ACCEPT_LIC_3, *pResMgr);
+ OUString s4 = ResId(RID_STR_UNOPKG_ACCEPT_LIC_4, *pResMgr);
+ OUString sYES = ResId(RID_STR_UNOPKG_ACCEPT_LIC_YES, *pResMgr);
+ OUString sY = ResId(RID_STR_UNOPKG_ACCEPT_LIC_Y, *pResMgr);
+ OUString sNO = ResId(RID_STR_UNOPKG_ACCEPT_LIC_NO, *pResMgr);
+ OUString sN = ResId(RID_STR_UNOPKG_ACCEPT_LIC_N, *pResMgr);
OUString sNewLine("\n");
@@ -264,7 +264,7 @@ void CommandEnvironmentImpl::handle(
}
else if (request >>= platExc)
{
- OUString sMsg(ResId(RID_STR_UNSUPPORTED_PLATFORM, *dp_gui::DeploymentGuiResMgr::get()).toString());
+ OUString sMsg(ResId(RID_STR_UNSUPPORTED_PLATFORM, *dp_gui::DeploymentGuiResMgr::get()));
sMsg = sMsg.replaceAll("%Name", platExc.package->getDisplayName());
dp_misc::writeConsole("\n" + sMsg + "\n\n");
approve = true;
diff --git a/extensions/source/abpilot/abspilot.cxx b/extensions/source/abpilot/abspilot.cxx
index 7859182105a6..4c56318fad8b 100644
--- a/extensions/source/abpilot/abspilot.cxx
+++ b/extensions/source/abpilot/abspilot.cxx
@@ -105,7 +105,7 @@ namespace abp
#else
m_aSettings.eType = AST_OTHER;
#endif
- m_aSettings.sDataSourceName = ModuleRes(RID_STR_DEFAULT_NAME).toString();
+ m_aSettings.sDataSourceName = ModuleRes(RID_STR_DEFAULT_NAME);
m_aSettings.bRegisterDataSource = false;
m_aSettings.bEmbedDataSource = false;
m_aSettings.bIgnoreNoTable = false;
@@ -116,7 +116,7 @@ namespace abp
typeSelectionChanged( m_aSettings.eType );
- OUString sDialogTitle = ModuleRes(RID_STR_ABSOURCEDIALOGTITLE).toString();
+ OUString sDialogTitle = ModuleRes(RID_STR_ABSOURCEDIALOGTITLE);
setTitleBase(sDialogTitle);
SetHelpId(HID_ABSPILOT);
}
@@ -137,7 +137,7 @@ namespace abp
OUString sDisplayName;
if ( nResId )
{
- sDisplayName = ModuleRes(nResId).toString();
+ sDisplayName = ModuleRes(nResId);
}
return sDisplayName;
diff --git a/extensions/source/abpilot/admininvokationimpl.cxx b/extensions/source/abpilot/admininvokationimpl.cxx
index efd3b6f6265c..71c459a7b5db 100644
--- a/extensions/source/abpilot/admininvokationimpl.cxx
+++ b/extensions/source/abpilot/admininvokationimpl.cxx
@@ -74,7 +74,7 @@ namespace abp
*pArguments++ <<= PropertyValue("ParentWindow", -1, makeAny(xDialogParent), PropertyState_DIRECT_VALUE);
// the title of the dialog
- OUString sAdminDialogTitle(ModuleRes(RID_STR_ADMINDIALOGTITLE).toString());
+ OUString sAdminDialogTitle(ModuleRes(RID_STR_ADMINDIALOGTITLE));
*pArguments++ <<= PropertyValue("Title", -1, makeAny(sAdminDialogTitle), PropertyState_DIRECT_VALUE);
// the name of the new data source
diff --git a/extensions/source/abpilot/datasourcehandling.cxx b/extensions/source/abpilot/datasourcehandling.cxx
index d8d5ec7d03b1..b7a2c3492e7c 100644
--- a/extensions/source/abpilot/datasourcehandling.cxx
+++ b/extensions/source/abpilot/datasourcehandling.cxx
@@ -584,8 +584,8 @@ namespace abp
{
// prepend some context info
SQLContext aDetailedError;
- aDetailedError.Message = ModuleRes(RID_STR_NOCONNECTION).toString();
- aDetailedError.Details = ModuleRes(RID_STR_PLEASECHECKSETTINGS).toString();
+ aDetailedError.Message = ModuleRes(RID_STR_NOCONNECTION);
+ aDetailedError.Details = ModuleRes(RID_STR_PLEASECHECKSETTINGS);
aDetailedError.NextException = aError;
// handle (aka display) the new context info
xInteractions->handle( new OInteractionRequest( makeAny( aDetailedError ) ) );
diff --git a/extensions/source/abpilot/fieldmappingimpl.cxx b/extensions/source/abpilot/fieldmappingimpl.cxx
index a4f1c5376a8c..1aba04832332 100644
--- a/extensions/source/abpilot/fieldmappingimpl.cxx
+++ b/extensions/source/abpilot/fieldmappingimpl.cxx
@@ -73,7 +73,7 @@ namespace abp
// create an instance of the dialog service
Reference< XWindow > xDialogParent = VCLUnoHelper::GetInterface( _pParent );
- OUString sTitle(ModuleRes(RID_STR_FIELDDIALOGTITLE).toString());
+ OUString sTitle(ModuleRes(RID_STR_FIELDDIALOGTITLE));
Reference< XExecutableDialog > xDialog = AddressBookSourceDialog::createWithDataSource(_rxORB,
// the parent window
xDialogParent,
diff --git a/extensions/source/abpilot/fieldmappingpage.cxx b/extensions/source/abpilot/fieldmappingpage.cxx
index 93ebe3f22710..0c357bf8d996 100644
--- a/extensions/source/abpilot/fieldmappingpage.cxx
+++ b/extensions/source/abpilot/fieldmappingpage.cxx
@@ -67,7 +67,7 @@ namespace abp
const AddressSettings& rSettings = getSettings();
OUString sHint;
if ( rSettings.aFieldMapping.empty() )
- sHint = ModuleRes(RID_STR_NOFIELDSASSIGNED).toString();
+ sHint = ModuleRes(RID_STR_NOFIELDSASSIGNED);
m_pHint->SetText( sHint );
}
diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx
index a30f9cf81bc3..86d2cf3c71af 100644
--- a/extensions/source/bibliography/bibload.cxx
+++ b/extensions/source/bibliography/bibload.cxx
@@ -233,7 +233,7 @@ void BibliographyLoader::load(const Reference< XFrame > & rFrame, const OUString
if(xPrSet.is())
{
Any aTitle;
- aTitle <<= BibResId(RID_BIB_STR_FRAME_TITLE).toString();
+ aTitle <<= BibResId(RID_BIB_STR_FRAME_TITLE);
xPrSet->setPropertyValue("Title", aTitle);
}
if(aPartName == "View" || aPartName == "View1")
diff --git a/extensions/source/bibliography/bibmod.cxx b/extensions/source/bibliography/bibmod.cxx
index 60ec774d3797..06638a88f7d1 100644
--- a/extensions/source/bibliography/bibmod.cxx
+++ b/extensions/source/bibliography/bibmod.cxx
@@ -60,11 +60,13 @@ void CloseBibModul(HdlBibModul ppBibModul)
}
}
-BibResId::BibResId( sal_uInt16 nId ) :
- ResId( nId, *pBibModul->GetResMgr() )
+OUString BibResId(sal_uInt16 nId)
{
+ return ResId(nId, *pBibModul->GetResMgr());
}
+
BibConfig* BibModul::pBibConfig = nullptr;
+
BibModul::BibModul()
{
pResMgr = ResMgr::CreateResMgr( "bib" );
diff --git a/extensions/source/bibliography/bibresid.hxx b/extensions/source/bibliography/bibresid.hxx
index f3a393c3b576..1855a8427b88 100644
--- a/extensions/source/bibliography/bibresid.hxx
+++ b/extensions/source/bibliography/bibresid.hxx
@@ -20,16 +20,9 @@
#ifndef INCLUDED_EXTENSIONS_SOURCE_BIBLIOGRAPHY_BIBRESID_HXX
#define INCLUDED_EXTENSIONS_SOURCE_BIBLIOGRAPHY_BIBRESID_HXX
-#include <tools/resid.hxx>
+#include <rtl/ustring.hxx>
-
-class BibResId : public ResId
-{
- public:
- explicit BibResId(sal_uInt16 nId);
-};
-
-#define BIB_RESSTR(i) BibResId(i).toString()
+OUString BibResId(sal_uInt16 nId);
#endif // INCLUDED_EXTENSIONS_SOURCE_BIBLIOGRAPHY_BIBRESID_HXX
diff --git a/extensions/source/bibliography/bibview.cxx b/extensions/source/bibliography/bibview.cxx
index 32739be7ce4b..ae993379c67f 100644
--- a/extensions/source/bibliography/bibview.cxx
+++ b/extensions/source/bibliography/bibview.cxx
@@ -140,7 +140,7 @@ namespace bib
else if(bExecute)
{
sErrorString += "\n";
- sErrorString += BIB_RESSTR(RID_MAP_QUESTION);
+ sErrorString += BibResId(RID_MAP_QUESTION);
ScopedVclPtrInstance< QueryBox > aQuery(this, WB_YES_NO, sErrorString);
aQuery->SetDefaultCheckBoxText();
short nResult = aQuery->Execute();
diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx
index a6c5deba6924..756d488078b9 100644
--- a/extensions/source/bibliography/datman.cxx
+++ b/extensions/source/bibliography/datman.cxx
@@ -258,7 +258,7 @@ static sal_uInt16 lcl_FindLogicalName(BibConfig* pConfig ,
MappingDialog_Impl::MappingDialog_Impl(vcl::Window* pParent, BibDataManager* pMan)
: ModalDialog(pParent, "MappingDialog", "modules/sbibliography/ui/mappingdialog.ui")
, pDatMan(pMan)
- , sNone(BIB_RESSTR(RID_BIB_STR_NONE))
+ , sNone(BibResId(RID_BIB_STR_NONE))
, bModified(false)
{
get(pOKBT, "ok");
@@ -1336,28 +1336,28 @@ Reference< awt::XControlModel > BibDataManager::loadControlModel(
uno::Sequence<OUString> aValues(TYPE_COUNT + 1);
OUString* pValuesArr = aValues.getArray();
- pValuesArr[0] = BIB_RESSTR(ST_TYPE_ARTICLE);
- pValuesArr[1] = BIB_RESSTR(ST_TYPE_BOOK);
- pValuesArr[2] = BIB_RESSTR(ST_TYPE_BOOKLET);
- pValuesArr[3] = BIB_RESSTR(ST_TYPE_CONFERENCE);
- pValuesArr[4] = BIB_RESSTR(ST_TYPE_INBOOK );
- pValuesArr[5] = BIB_RESSTR(ST_TYPE_INCOLLECTION);
- pValuesArr[6] = BIB_RESSTR(ST_TYPE_INPROCEEDINGS);
- pValuesArr[7] = BIB_RESSTR(ST_TYPE_JOURNAL );
- pValuesArr[8] = BIB_RESSTR(ST_TYPE_MANUAL );
- pValuesArr[9] = BIB_RESSTR(ST_TYPE_MASTERSTHESIS);
- pValuesArr[10] = BIB_RESSTR(ST_TYPE_MISC );
- pValuesArr[11] = BIB_RESSTR(ST_TYPE_PHDTHESIS );
- pValuesArr[12] = BIB_RESSTR(ST_TYPE_PROCEEDINGS );
- pValuesArr[13] = BIB_RESSTR(ST_TYPE_TECHREPORT );
- pValuesArr[14] = BIB_RESSTR(ST_TYPE_UNPUBLISHED );
- pValuesArr[15] = BIB_RESSTR(ST_TYPE_EMAIL );
- pValuesArr[16] = BIB_RESSTR(ST_TYPE_WWW );
- pValuesArr[17] = BIB_RESSTR(ST_TYPE_CUSTOM1 );
- pValuesArr[18] = BIB_RESSTR(ST_TYPE_CUSTOM2 );
- pValuesArr[19] = BIB_RESSTR(ST_TYPE_CUSTOM3 );
- pValuesArr[20] = BIB_RESSTR(ST_TYPE_CUSTOM4 );
- pValuesArr[21] = BIB_RESSTR(ST_TYPE_CUSTOM5 );
+ pValuesArr[0] = BibResId(ST_TYPE_ARTICLE);
+ pValuesArr[1] = BibResId(ST_TYPE_BOOK);
+ pValuesArr[2] = BibResId(ST_TYPE_BOOKLET);
+ pValuesArr[3] = BibResId(ST_TYPE_CONFERENCE);
+ pValuesArr[4] = BibResId(ST_TYPE_INBOOK );
+ pValuesArr[5] = BibResId(ST_TYPE_INCOLLECTION);
+ pValuesArr[6] = BibResId(ST_TYPE_INPROCEEDINGS);
+ pValuesArr[7] = BibResId(ST_TYPE_JOURNAL );
+ pValuesArr[8] = BibResId(ST_TYPE_MANUAL );
+ pValuesArr[9] = BibResId(ST_TYPE_MASTERSTHESIS);
+ pValuesArr[10] = BibResId(ST_TYPE_MISC );
+ pValuesArr[11] = BibResId(ST_TYPE_PHDTHESIS );
+ pValuesArr[12] = BibResId(ST_TYPE_PROCEEDINGS );
+ pValuesArr[13] = BibResId(ST_TYPE_TECHREPORT );
+ pValuesArr[14] = BibResId(ST_TYPE_UNPUBLISHED );
+ pValuesArr[15] = BibResId(ST_TYPE_EMAIL );
+ pValuesArr[16] = BibResId(ST_TYPE_WWW );
+ pValuesArr[17] = BibResId(ST_TYPE_CUSTOM1 );
+ pValuesArr[18] = BibResId(ST_TYPE_CUSTOM2 );
+ pValuesArr[19] = BibResId(ST_TYPE_CUSTOM3 );
+ pValuesArr[20] = BibResId(ST_TYPE_CUSTOM4 );
+ pValuesArr[21] = BibResId(ST_TYPE_CUSTOM5 );
// empty string if an invalid value no values is set
pValuesArr[TYPE_COUNT].clear();
diff --git a/extensions/source/bibliography/general.cxx b/extensions/source/bibliography/general.cxx
index 9a3866c991b2..9eccfef67a0d 100644
--- a/extensions/source/bibliography/general.cxx
+++ b/extensions/source/bibliography/general.cxx
@@ -167,7 +167,7 @@ void BibPosListener::disposing(const lang::EventObject& /*Source*/)
BibGeneralPage::BibGeneralPage(vcl::Window* pParent, BibDataManager* pMan):
TabPage(pParent, "GeneralPage", "modules/sbibliography/ui/generalpage.ui"),
BibShortCutHandler( this ),
- sErrorPrefix(BIB_RESSTR(ST_ERROR_PREFIX)),
+ sErrorPrefix(BibResId(ST_ERROR_PREFIX)),
mxBibGeneralPageFocusListener(new BibGeneralPageFocusListener(this)),
pDatMan(pMan)
{
@@ -334,7 +334,7 @@ BibGeneralPage::BibGeneralPage(vcl::Window* pParent, BibDataManager* pMan):
if(!sTableErrorString.isEmpty())
sTableErrorString = sErrorPrefix + sTableErrorString;
- SetText(BIB_RESSTR(ST_TYPE_TITLE));
+ SetText(BibResId(ST_TYPE_TITLE));
Size aSize(LogicToPixel(Size(0, 209), MapMode(MapUnit::MapAppFont)));
set_height_request(aSize.Height());
diff --git a/extensions/source/dbpilots/controlwizard.cxx b/extensions/source/dbpilots/controlwizard.cxx
index 68bc88dae26a..6d4d476c173c 100644
--- a/extensions/source/dbpilots/controlwizard.cxx
+++ b/extensions/source/dbpilots/controlwizard.cxx
@@ -231,7 +231,7 @@ namespace dbp
nCommandTypeResourceId = RID_STR_TYPE_COMMAND;
break;
}
- m_pFormContentType->SetText(ModuleRes(nCommandTypeResourceId).toString());
+ m_pFormContentType->SetText(ModuleRes(nCommandTypeResourceId));
}
OControlWizardPage_Base::initializePage();
@@ -607,7 +607,7 @@ namespace dbp
// prepend an extra SQLContext explaining what we were doing
SQLContext aContext;
- aContext.Message = ModuleRes(RID_STR_COULDNOTOPENTABLE).toString();
+ aContext.Message = ModuleRes(RID_STR_COULDNOTOPENTABLE);
aContext.NextException = aSQLException;
// create an interaction handler to display this exception
diff --git a/extensions/source/dbpilots/gridwizard.cxx b/extensions/source/dbpilots/gridwizard.cxx
index 8be4a22e91e9..9db743904aa4 100644
--- a/extensions/source/dbpilots/gridwizard.cxx
+++ b/extensions/source/dbpilots/gridwizard.cxx
@@ -60,7 +60,7 @@ namespace dbp
m_pNextPage->SetHelpId(HID_GRIDWIZARD_NEXT);
m_pCancel->SetHelpId(HID_GRIDWIZARD_CANCEL);
m_pFinish->SetHelpId(HID_GRIDWIZARD_FINISH);
- setTitleBase(ModuleRes(RID_STR_GRIDWIZARD_TITLE).toString());
+ setTitleBase(ModuleRes(RID_STR_GRIDWIZARD_TITLE));
// if we do not need the data source selection page ...
if (!needDatasourceSelection())
@@ -160,11 +160,11 @@ namespace dbp
case DataType::TIMESTAMP:
aColumnServiceNames.push_back(OUString("DateField"));
- aColumnLabelPostfixes.push_back(ModuleRes(RID_STR_DATEPOSTFIX).toString());
+ aColumnLabelPostfixes.push_back(ModuleRes(RID_STR_DATEPOSTFIX));
aFormFieldNames.push_back(*pSelectedFields);
aColumnServiceNames.push_back(OUString("TimeField"));
- aColumnLabelPostfixes.push_back(ModuleRes(RID_STR_TIMEPOSTFIX).toString());
+ aColumnLabelPostfixes.push_back(ModuleRes(RID_STR_TIMEPOSTFIX));
break;
default:
diff --git a/extensions/source/dbpilots/groupboxwiz.cxx b/extensions/source/dbpilots/groupboxwiz.cxx
index ddb34e420b60..ab44cefe5bb1 100644
--- a/extensions/source/dbpilots/groupboxwiz.cxx
+++ b/extensions/source/dbpilots/groupboxwiz.cxx
@@ -55,7 +55,7 @@ namespace dbp
m_pNextPage->SetHelpId(HID_GROUPWIZARD_NEXT);
m_pCancel->SetHelpId(HID_GROUPWIZARD_CANCEL);
m_pFinish->SetHelpId(HID_GROUPWIZARD_FINISH);
- setTitleBase(ModuleRes(RID_STR_GROUPWIZARD_TITLE).toString());
+ setTitleBase(ModuleRes(RID_STR_GROUPWIZARD_TITLE));
}
@@ -468,7 +468,7 @@ namespace dbp
OOptionDBFieldPage::OOptionDBFieldPage( OControlWizard* _pParent )
:ODBFieldPage(_pParent)
{
- setDescriptionText(ModuleRes(RID_STR_GROUPWIZ_DBFIELD).toString());
+ setDescriptionText(ModuleRes(RID_STR_GROUPWIZ_DBFIELD));
}
diff --git a/extensions/source/dbpilots/listcombowizard.cxx b/extensions/source/dbpilots/listcombowizard.cxx
index d935d0a98b0c..b3bb2e6ffbad 100644
--- a/extensions/source/dbpilots/listcombowizard.cxx
+++ b/extensions/source/dbpilots/listcombowizard.cxx
@@ -73,11 +73,11 @@ namespace dbp
{
case FormComponentType::LISTBOX:
m_bListBox = true;
- setTitleBase(ModuleRes(RID_STR_LISTWIZARD_TITLE).toString());
+ setTitleBase(ModuleRes(RID_STR_LISTWIZARD_TITLE));
return true;
case FormComponentType::COMBOBOX:
m_bListBox = false;
- setTitleBase(ModuleRes(RID_STR_COMBOWIZARD_TITLE).toString());
+ setTitleBase(ModuleRes(RID_STR_COMBOWIZARD_TITLE));
return true;
}
return false;
@@ -354,7 +354,7 @@ namespace dbp
get(m_pSelectTableField, "selectfield");
get(m_pDisplayedField, "displayfield");
get(m_pInfo, "info");
- m_pInfo->SetText(ModuleRes( isListBox() ? RID_STR_FIELDINFO_LISTBOX : RID_STR_FIELDINFO_COMBOBOX).toString());
+ m_pInfo->SetText(ModuleRes( isListBox() ? RID_STR_FIELDINFO_LISTBOX : RID_STR_FIELDINFO_COMBOBOX));
m_pSelectTableField->SetSelectHdl(LINK(this, OContentFieldSelection, OnFieldSelected));
m_pSelectTableField->SetDoubleClickHdl(LINK(this, OContentFieldSelection, OnTableDoubleClicked));
}
@@ -505,7 +505,7 @@ namespace dbp
OComboDBFieldPage::OComboDBFieldPage( OControlWizard* _pParent )
:ODBFieldPage(_pParent)
{
- setDescriptionText(ModuleRes(RID_STR_COMBOWIZ_DBFIELD).toString());
+ setDescriptionText(ModuleRes(RID_STR_COMBOWIZ_DBFIELD));
}
diff --git a/extensions/source/propctrlr/defaultforminspection.cxx b/extensions/source/propctrlr/defaultforminspection.cxx
index b08ad0843f6c..0527b1268590 100644
--- a/extensions/source/propctrlr/defaultforminspection.cxx
+++ b/extensions/source/propctrlr/defaultforminspection.cxx
@@ -173,7 +173,7 @@ namespace pcr
for ( sal_Int32 i=0; i<nCategories; ++i, ++pReturn )
{
pReturn->ProgrammaticName = OUString::createFromAscii( aCategories[i].programmaticName );
- pReturn->UIName = PcrRes( aCategories[i].uiNameResId ).toString();
+ pReturn->UIName = PcrRes( aCategories[i].uiNameResId );
pReturn->HelpURL = HelpIdUrl::getHelpURL( aCategories[i].helpId );
}
diff --git a/extensions/source/propctrlr/eformshelper.cxx b/extensions/source/propctrlr/eformshelper.cxx
index ce25451ef572..c468edd23fa2 100644
--- a/extensions/source/propctrlr/eformshelper.cxx
+++ b/extensions/source/propctrlr/eformshelper.cxx
@@ -542,7 +542,7 @@ namespace pcr
if ( xBinding.is() )
{
// find a nice name for it
- OUString sBaseName(PcrRes(RID_STR_BINDING_UI_NAME).toString());
+ OUString sBaseName(PcrRes(RID_STR_BINDING_UI_NAME));
sBaseName += " ";
OUString sNewName;
sal_Int32 nNumber = 1;
diff --git a/extensions/source/propctrlr/eventhandler.cxx b/extensions/source/propctrlr/eventhandler.cxx
index 025199837fbf..964c3ee1e800 100644
--- a/extensions/source/propctrlr/eventhandler.cxx
+++ b/extensions/source/propctrlr/eventhandler.cxx
@@ -138,7 +138,7 @@ namespace pcr
EventDescription::EventDescription( EventId _nId, const sal_Char* _pListenerNamespaceAscii, const sal_Char* _pListenerClassAsciiName,
const sal_Char* _pListenerMethodAsciiName, sal_uInt16 _nDisplayNameResId, const OString& _sHelpId, const OString& _sUniqueBrowseId )
- :sDisplayName(PcrRes( _nDisplayNameResId ).toString())
+ :sDisplayName(PcrRes( _nDisplayNameResId ))
,sListenerMethodName( OUString::createFromAscii( _pListenerMethodAsciiName ) )
,sHelpId( _sHelpId )
,sUniqueBrowseId( _sUniqueBrowseId )
diff --git a/extensions/source/propctrlr/formbrowsertools.cxx b/extensions/source/propctrlr/formbrowsertools.cxx
index 12a5d4afec70..fd01daebb8af 100644
--- a/extensions/source/propctrlr/formbrowsertools.cxx
+++ b/extensions/source/propctrlr/formbrowsertools.cxx
@@ -48,12 +48,12 @@ namespace pcr
{
Reference< XInterface > xIFace;
aUnoObj >>= xIFace;
- sClassName = PcrRes(RID_STR_PROPTITLE_EDIT).toString();
+ sClassName = PcrRes(RID_STR_PROPTITLE_EDIT);
if (xIFace.is())
{ // we have a chance to check if it's a formatted field model
Reference< XServiceInfo > xInfo(xIFace, UNO_QUERY);
if (xInfo.is() && (xInfo->supportsService(SERVICE_COMPONENT_FORMATTEDFIELD)))
- sClassName = PcrRes(RID_STR_PROPTITLE_FORMATTED).toString();
+ sClassName = PcrRes(RID_STR_PROPTITLE_FORMATTED);
else if (!xInfo.is())
{
// couldn't distinguish between formatted and edit with the service name, so try with the properties
@@ -62,7 +62,7 @@ namespace pcr
{
Reference< XPropertySetInfo > xPropsInfo = xProps->getPropertySetInfo();
if (xPropsInfo.is() && xPropsInfo->hasPropertyByName(PROPERTY_FORMATSSUPPLIER))
- sClassName = PcrRes(RID_STR_PROPTITLE_FORMATTED).toString();
+ sClassName = PcrRes(RID_STR_PROPTITLE_FORMATTED);
}
}
}
@@ -70,44 +70,44 @@ namespace pcr
break;
case FormComponentType::COMMANDBUTTON:
- sClassName = PcrRes(RID_STR_PROPTITLE_PUSHBUTTON).toString(); break;
+ sClassName = PcrRes(RID_STR_PROPTITLE_PUSHBUTTON); break;
case FormComponentType::RADIOBUTTON:
- sClassName = PcrRes(RID_STR_PROPTITLE_RADIOBUTTON).toString(); break;
+ sClassName = PcrRes(RID_STR_PROPTITLE_RADIOBUTTON); break;
case FormComponentType::CHECKBOX:
- sClassName = PcrRes(RID_STR_PROPTITLE_CHECKBOX).toString(); break;
+ sClassName = PcrRes(RID_STR_PROPTITLE_CHECKBOX); break;
case FormComponentType::LISTBOX:
- sClassName = PcrRes(RID_STR_PROPTITLE_LISTBOX).toString(); break;
+ sClassName = PcrRes(RID_STR_PROPTITLE_LISTBOX); break;
case FormComponentType::COMBOBOX:
- sClassName = PcrRes(RID_STR_PROPTITLE_COMBOBOX).toString(); break;
+ sClassName = PcrRes(RID_STR_PROPTITLE_COMBOBOX); break;
case FormComponentType::GROUPBOX:
- sClassName = PcrRes(RID_STR_PROPTITLE_GROUPBOX).toString(); break;
+ sClassName = PcrRes(RID_STR_PROPTITLE_GROUPBOX); break;
case FormComponentType::IMAGEBUTTON:
- sClassName = PcrRes(RID_STR_PROPTITLE_IMAGEBUTTON).toString(); break;
+ sClassName = PcrRes(RID_STR_PROPTITLE_IMAGEBUTTON); break;
case FormComponentType::FIXEDTEXT:
- sClassName = PcrRes(RID_STR_PROPTITLE_FIXEDTEXT).toString(); break;
+ sClassName = PcrRes(RID_STR_PROPTITLE_FIXEDTEXT); break;
case FormComponentType::GRIDCONTROL:
- sClassName = PcrRes(RID_STR_PROPTITLE_DBGRID).toString(); break;
+ sClassName = PcrRes(RID_STR_PROPTITLE_DBGRID); break;
case FormComponentType::FILECONTROL:
- sClassName = PcrRes(RID_STR_PROPTITLE_FILECONTROL).toString(); break;
+ sClassName = PcrRes(RID_STR_PROPTITLE_FILECONTROL); break;
case FormComponentType::DATEFIELD:
- sClassName = PcrRes(RID_STR_PROPTITLE_DATEFIELD).toString(); break;
+ sClassName = PcrRes(RID_STR_PROPTITLE_DATEFIELD); break;
case FormComponentType::TIMEFIELD:
- sClassName = PcrRes(RID_STR_PROPTITLE_TIMEFIELD).toString(); break;
+ sClassName = PcrRes(RID_STR_PROPTITLE_TIMEFIELD); break;
case FormComponentType::NUMERICFIELD:
- sClassName = PcrRes(RID_STR_PROPTITLE_NUMERICFIELD).toString(); break;
+ sClassName = PcrRes(RID_STR_PROPTITLE_NUMERICFIELD); break;
case FormComponentType::CURRENCYFIELD:
- sClassName = PcrRes(RID_STR_PROPTITLE_CURRENCYFIELD).toString(); break;
+ sClassName = PcrRes(RID_STR_PROPTITLE_CURRENCYFIELD); break;
case FormComponentType::PATTERNFIELD:
- sClassName = PcrRes(RID_STR_PROPTITLE_PATTERNFIELD).toString(); break;
+ sClassName = PcrRes(RID_STR_PROPTITLE_PATTERNFIELD); break;
case FormComponentType::IMAGECONTROL:
- sClassName = PcrRes(RID_STR_PROPTITLE_IMAGECONTROL).toString(); break;
+ sClassName = PcrRes(RID_STR_PROPTITLE_IMAGECONTROL); break;
case FormComponentType::HIDDENCONTROL:
- sClassName = PcrRes(RID_STR_PROPTITLE_HIDDENCONTROL).toString(); break;
+ sClassName = PcrRes(RID_STR_PROPTITLE_HIDDENCONTROL); break;
case FormComponentType::CONTROL:
default:
- sClassName = PcrRes(RID_STR_PROPTITLE_UNKNOWNCONTROL).toString(); break;
+ sClassName = PcrRes(RID_STR_PROPTITLE_UNKNOWNCONTROL); break;
}
return sClassName;
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index 71fb21a05f43..b3e760c447c5 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -144,7 +144,7 @@ namespace pcr
FormComponentPropertyHandler::FormComponentPropertyHandler( const Reference< XComponentContext >& _rxContext )
:FormComponentPropertyHandler_Base( _rxContext )
,::comphelper::OPropertyContainer(FormComponentPropertyHandler_Base::rBHelper)
- ,m_sDefaultValueString( PcrRes(RID_STR_STANDARD).toString() )
+ ,m_sDefaultValueString( PcrRes(RID_STR_STANDARD) )
,m_eComponentClass( eUnknown )
,m_bComponentIsSubForm( false )
,m_bHaveListSource( false )
@@ -551,7 +551,7 @@ namespace pcr
OUString sControlValue;
OSL_VERIFY( _rControlValue >>= sControlValue );
// Don't convert a placeholder
- if ( nPropId == PROPERTY_ID_IMAGE_URL && sControlValue.equals( PcrRes(RID_EMBED_IMAGE_PLACEHOLDER).toString() ) )
+ if ( nPropId == PROPERTY_ID_IMAGE_URL && sControlValue.equals( PcrRes(RID_EMBED_IMAGE_PLACEHOLDER) ) )
aPropertyValue <<= sControlValue;
else
{
@@ -747,7 +747,7 @@ namespace pcr
OUStringBuffer displayName;
if ( aFont.Name.isEmpty() )
{
- displayName.append( PcrRes(RID_STR_FONT_DEFAULT).toString() );
+ displayName.append( PcrRes(RID_STR_FONT_DEFAULT) );
}
else
{
@@ -770,7 +770,7 @@ namespace pcr
if ( eWeight > WEIGHT_NORMAL )
nStyleResID = RID_STR_FONTSTYLE_BOLD;
}
- displayName.append(PcrRes(nStyleResID).toString());
+ displayName.append(PcrRes(nStyleResID));
// font size
if ( aFont.Height )
@@ -2680,7 +2680,7 @@ namespace pcr
SvNumberFormatter* pFormatter = pSupplier->GetNumberFormatter();
double dPreviewVal = OFormatSampleControl::getPreviewValue(pFormatter,nFormatKey);
- SvxNumberInfoItem aFormatter( pFormatter, dPreviewVal, PcrRes(RID_STR_TEXT_FORMAT).toString(), SID_ATTR_NUMBERFORMAT_INFO );
+ SvxNumberInfoItem aFormatter( pFormatter, dPreviewVal, PcrRes(RID_STR_TEXT_FORMAT), SID_ATTR_NUMBERFORMAT_INFO );
aCoreSet.Put( aFormatter );
// a tab dialog with a single page
diff --git a/extensions/source/propctrlr/formlinkdialog.cxx b/extensions/source/propctrlr/formlinkdialog.cxx
index 5a1b0f71bcc7..601e4585b1d8 100644
--- a/extensions/source/propctrlr/formlinkdialog.cxx
+++ b/extensions/source/propctrlr/formlinkdialog.cxx
@@ -296,7 +296,7 @@ namespace pcr
{
if ( m_sDetailLabel.isEmpty() )
{
- m_sDetailLabel = PcrRes(STR_DETAIL_FORM).toString();
+ m_sDetailLabel = PcrRes(STR_DETAIL_FORM);
}
sDetailType = m_sDetailLabel;
}
@@ -308,7 +308,7 @@ namespace pcr
{
if ( m_sMasterLabel.isEmpty() )
{
- m_sMasterLabel = PcrRes(STR_MASTER_FORM).toString();
+ m_sMasterLabel = PcrRes(STR_MASTER_FORM);
}
sMasterType = m_sMasterLabel;
}
@@ -450,7 +450,7 @@ namespace pcr
{
OUString sErrorMessage;
{
- sErrorMessage = PcrRes(STR_ERROR_RETRIEVING_COLUMNS).toString();
+ sErrorMessage = PcrRes(STR_ERROR_RETRIEVING_COLUMNS);
sErrorMessage = sErrorMessage.replaceFirst("#", sCommand);
}
diff --git a/extensions/source/propctrlr/inspectorhelpwindow.cxx b/extensions/source/propctrlr/inspectorhelpwindow.cxx
index bb4edca2a414..d15a8190c824 100644
--- a/extensions/source/propctrlr/inspectorhelpwindow.cxx
+++ b/extensions/source/propctrlr/inspectorhelpwindow.cxx
@@ -36,7 +36,7 @@ namespace pcr
{
SetBackground();
SetPaintTransparent(true);
- m_aSeparator->SetText( PcrRes(RID_STR_HELP_SECTION_LABEL).toString() );
+ m_aSeparator->SetText( PcrRes(RID_STR_HELP_SECTION_LABEL) );
m_aSeparator->SetBackground();
m_aSeparator->Show();
diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx
index 296bcfb2f20b..6f150c9d4622 100644
--- a/extensions/source/propctrlr/propcontroller.cxx
+++ b/extensions/source/propctrlr/propcontroller.cxx
@@ -1345,7 +1345,7 @@ namespace pcr
{
try
{
- OUString sPlcHolder = PcrRes(RID_EMBED_IMAGE_PLACEHOLDER).toString();
+ OUString sPlcHolder = PcrRes(RID_EMBED_IMAGE_PLACEHOLDER);
bool bIsPlaceHolderValue = false;
if ( rName == PROPERTY_IMAGE_URL )
diff --git a/extensions/source/propctrlr/selectlabeldialog.cxx b/extensions/source/propctrlr/selectlabeldialog.cxx
index ffec0db1ca00..36edf9b6313e 100644
--- a/extensions/source/propctrlr/selectlabeldialog.cxx
+++ b/extensions/source/propctrlr/selectlabeldialog.cxx
@@ -112,7 +112,7 @@ namespace pcr
// insert the root
Image aRootImage(BitmapEx(RID_EXTBMP_FORMS));
- SvTreeListEntry* pRoot = m_pControlTree->InsertEntry(PcrRes(RID_STR_FORMS).toString(), aRootImage, aRootImage);
+ SvTreeListEntry* pRoot = m_pControlTree->InsertEntry(PcrRes(RID_STR_FORMS), aRootImage, aRootImage);
// build the tree
m_pInitialSelection = nullptr;
diff --git a/extensions/source/propctrlr/usercontrol.cxx b/extensions/source/propctrlr/usercontrol.cxx
index c5c7c1e85ae7..b05f78860d58 100644
--- a/extensions/source/propctrlr/usercontrol.cxx
+++ b/extensions/source/propctrlr/usercontrol.cxx
@@ -107,7 +107,7 @@ namespace pcr
const bool bIsTextFormat = ( pEntry && pEntry->IsTextFormat() );
if ( bIsTextFormat )
- getTypedControlWindow()->SetText( PcrRes( RID_STR_TEXT_FORMAT ).toString() );
+ getTypedControlWindow()->SetText( PcrRes( RID_STR_TEXT_FORMAT ) );
else
getTypedControlWindow()->SetValue( pEntry ? getPreviewValue( *pEntry ) : 1234.56789 );
}
@@ -265,7 +265,7 @@ namespace pcr
:OFileUrlControl_Base( PropertyControlType::Unknown, pParent, WB_TABSTOP | WB_BORDER | WB_DROPDOWN )
{
getTypedControlWindow()->SetDropDownLineCount( 10 );
- getTypedControlWindow()->SetPlaceHolder( PcrRes( RID_EMBED_IMAGE_PLACEHOLDER ).toString() ) ;
+ getTypedControlWindow()->SetPlaceHolder( PcrRes( RID_EMBED_IMAGE_PLACEHOLDER ) ) ;
}
diff --git a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
index 598f6f0bbed5..9b81f7b9dff0 100644
--- a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
+++ b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
@@ -523,7 +523,7 @@ namespace pcr
}
// confirmation message
- OUString sConfirmation( PcrRes( RID_STR_CONFIRM_DELETE_DATA_TYPE ).toString() );
+ OUString sConfirmation( PcrRes( RID_STR_CONFIRM_DELETE_DATA_TYPE ) );
sConfirmation = sConfirmation.replaceFirst( "#type#", pType->getName() );
ScopedVclPtrInstance<QueryBox> aQuery( nullptr, WB_YES_NO, sConfirmation ); // TODO/eForms: proper parent
if ( aQuery->Execute() != RET_YES )
diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx
index dc9112c74a12..cad566aeb667 100644
--- a/filter/source/graphicfilter/eps/eps.cxx
+++ b/filter/source/graphicfilter/eps/eps.cxx
@@ -446,7 +446,7 @@ bool PSWriter::WritePS( const Graphic& rGraphic, SvStream& rTargetStream, Filter
pResMgr = ResMgr::CreateResMgr( "eps", Application::GetSettings().GetUILanguageTag() );
if( pResMgr )
{
- ScopedVclPtrInstance< InfoBox > aInfoBox( nullptr, ResId(KEY_VERSION_CHECK, *pResMgr).toString() );
+ ScopedVclPtrInstance< InfoBox > aInfoBox( nullptr, ResId(KEY_VERSION_CHECK, *pResMgr) );
aInfoBox->Execute();
delete pResMgr;
}
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
index 6bcd6f24fc7e..31051679b3c5 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
@@ -84,8 +84,13 @@ EnsureResMgr::~EnsureResMgr()
pXSLTResMgr = nullptr;
}
-#define RESID(x) ResId(x, *getXSLTDialogResMgr())
-#define RESIDSTR(x) RESID(x).toString()
+namespace
+{
+ OUString XsltResId(sal_uInt16 nId)
+ {
+ return ResId(nId, *getXSLTDialogResMgr());
+ }
+}
XMLFilterSettingsDialog::XMLFilterSettingsDialog(vcl::Window* pParent,
const css::uno::Reference<css::uno::XComponentContext>& rxContext,
@@ -109,7 +114,7 @@ XMLFilterSettingsDialog::XMLFilterSettingsDialog(vcl::Window* pParent,
m_pFilterListBox->SetSelectHdl( LINK( this, XMLFilterSettingsDialog, SelectionChangedHdl_Impl ) );
m_pFilterListBox->SetDeselectHdl( LINK( this, XMLFilterSettingsDialog, SelectionChangedHdl_Impl ) );
m_pFilterListBox->SetDoubleClickHdl( LINK( this, XMLFilterSettingsDialog, DoubleClickHdl_Impl ) );
- m_pFilterListBox->SetAccessibleName(RESIDSTR(STR_XML_FILTER_LISTBOX));
+ m_pFilterListBox->SetAccessibleName(XsltResId(STR_XML_FILTER_LISTBOX));
m_pFilterListBox->SetHelpId(m_pCtrlFilterList->GetHelpId());
m_pPBNew->SetClickHdl(LINK( this, XMLFilterSettingsDialog, ClickHdl_Impl ) );
@@ -248,13 +253,13 @@ void XMLFilterSettingsDialog::onNew()
filter_info_impl aTempInfo;
// create a unique filter name
- aTempInfo.maFilterName = createUniqueFilterName(RESIDSTR(STR_DEFAULT_FILTER_NAME));
+ aTempInfo.maFilterName = createUniqueFilterName(XsltResId(STR_DEFAULT_FILTER_NAME));
// init default extension
aTempInfo.maExtension = STR_DEFAULT_EXTENSION;
// set default ui name
- aTempInfo.maInterfaceName = createUniqueInterfaceName(RESIDSTR(STR_DEFAULT_UI_NAME));
+ aTempInfo.maInterfaceName = createUniqueInterfaceName(XsltResId(STR_DEFAULT_UI_NAME));
// set default application
aTempInfo.maDocumentService = "com.sun.star.text.TextDocument";
@@ -802,7 +807,7 @@ void XMLFilterSettingsDialog::onDelete()
filter_info_impl* pInfo = static_cast<filter_info_impl*>(pEntry->GetUserData());
OUString aPlaceHolder( "%s" );
- OUString aMessage(RESIDSTR(STR_WARN_DELETE));
+ OUString aMessage(XsltResId(STR_WARN_DELETE));
aMessage = aMessage.replaceFirst( aPlaceHolder, pInfo->maFilterName );
ScopedVclPtrInstance< WarningBox > aWarnBox(this, (WinBits)(WB_YES_NO | WB_DEF_YES), aMessage );
@@ -904,7 +909,7 @@ void XMLFilterSettingsDialog::onSave()
css::ui::dialogs::TemplateDescription::FILESAVE_AUTOEXTENSION );
OUString aExtensions( "*.jar" );
- OUString aFilterName(RESIDSTR(STR_FILTER_PACKAGE));
+ OUString aFilterName(XsltResId(STR_FILTER_PACKAGE));
aFilterName += " (" + aExtensions + ")";
aDlg.AddFilter( aFilterName, aExtensions );
@@ -921,13 +926,13 @@ void XMLFilterSettingsDialog::onSave()
OUString aMsg;
if( nFilters > 0 )
{
- aMsg = RESIDSTR(STR_FILTERS_HAVE_BEEN_SAVED);
+ aMsg = XsltResId(STR_FILTERS_HAVE_BEEN_SAVED);
aMsg = aMsg.replaceFirst( sPlaceholder, OUString::number( nFilters ) );
aMsg = aMsg.replaceFirst( sPlaceholder, aURL.GetName() );
}
else
{
- aMsg = RESIDSTR(STR_FILTER_HAS_BEEN_SAVED);
+ aMsg = XsltResId(STR_FILTER_HAS_BEEN_SAVED);
aMsg = aMsg.replaceFirst( sPlaceholder, (*aFilters.begin())->maFilterName );
aMsg = aMsg.replaceFirst( sPlaceholder, aURL.GetName() );
}
@@ -946,7 +951,7 @@ void XMLFilterSettingsDialog::onOpen()
css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE );
OUString aExtensions( "*.jar" );
- OUString aFilterName(RESIDSTR(STR_FILTER_PACKAGE));
+ OUString aFilterName(XsltResId(STR_FILTER_PACKAGE));
aFilterName += " (" + aExtensions + ")";
aDlg.AddFilter( aFilterName, aExtensions );
@@ -981,18 +986,18 @@ void XMLFilterSettingsDialog::onOpen()
if( nFilters == 0 )
{
INetURLObject aURLObj( aURL );
- aMsg = RESIDSTR(STR_NO_FILTERS_FOUND);
+ aMsg = XsltResId(STR_NO_FILTERS_FOUND);
aMsg = aMsg.replaceFirst( sPlaceholder, aURLObj.GetName() );
}
else if( nFilters == 1 )
{
- aMsg = RESIDSTR(STR_FILTER_INSTALLED);
+ aMsg = XsltResId(STR_FILTER_INSTALLED);
aMsg = aMsg.replaceFirst( sPlaceholder, aFilterName );
}
else
{
- aMsg = RESIDSTR(STR_FILTERS_INSTALLED);
+ aMsg = XsltResId(STR_FILTERS_INSTALLED);
aMsg = aMsg.replaceFirst( sPlaceholder, OUString::number( nFilters ) );
}
@@ -1306,7 +1311,7 @@ OUString getApplicationUIName( const OUString& rServiceName )
}
else
{
- OUString aRet = RESIDSTR(STR_UNKNOWN_APPLICATION);
+ OUString aRet = XsltResId(STR_UNKNOWN_APPLICATION);
if( !rServiceName.isEmpty() )
{
aRet += " (" + rServiceName + ")";
@@ -1410,8 +1415,8 @@ XMLFilterListBox::XMLFilterListBox(Window* pParent, SvxPathControl* pPathControl
m_pHeaderBar->SetEndDragHdl( LINK( this, XMLFilterListBox, HeaderEndDrag_Impl ) );
- OUString aStr1(RESIDSTR(STR_COLUMN_HEADER_NAME));
- OUString aStr2(RESIDSTR(STR_COLUMN_HEADER_TYPE));
+ OUString aStr1(XsltResId(STR_COLUMN_HEADER_NAME));
+ OUString aStr2(XsltResId(STR_COLUMN_HEADER_TYPE));
long nTabSize = aBoxSize.Width() / 2;
@@ -1510,20 +1515,20 @@ OUString XMLFilterListBox::getEntryString( const filter_info_impl* pInfo )
{
if( pInfo->maFlags & 2 )
{
- aEntryStr += RESIDSTR(STR_IMPORT_EXPORT);
+ aEntryStr += XsltResId(STR_IMPORT_EXPORT);
}
else
{
- aEntryStr += RESIDSTR(STR_IMPORT_ONLY);
+ aEntryStr += XsltResId(STR_IMPORT_ONLY);
}
}
else if( pInfo->maFlags & 2 )
{
- aEntryStr += RESIDSTR(STR_EXPORT_ONLY);
+ aEntryStr += XsltResId(STR_EXPORT_ONLY);
}
else
{
- aEntryStr += RESIDSTR(STR_UNDEFINED_FILTER);
+ aEntryStr += XsltResId(STR_UNDEFINED_FILTER);
}
return aEntryStr;
diff --git a/include/editeng/eerdll.hxx b/include/editeng/eerdll.hxx
index 05ad3d64dce7..4af426358849 100644
--- a/include/editeng/eerdll.hxx
+++ b/include/editeng/eerdll.hxx
@@ -35,7 +35,7 @@ class EDITENG_DLLPUBLIC EditResId: public ResId
public:
EditResId( sal_uInt16 nId );
static OUString GetString(sal_uInt16 nId)
- { return EditResId(nId).toString(); }
+ { return EditResId(nId); }
};
class EditDLL
diff --git a/include/sfx2/sfxresid.hxx b/include/sfx2/sfxresid.hxx
index f66fc8014a2f..945d79939cdb 100644
--- a/include/sfx2/sfxresid.hxx
+++ b/include/sfx2/sfxresid.hxx
@@ -22,15 +22,16 @@
#include <sfx2/dllapi.h>
#include <tools/resid.hxx>
-class SFX2_DLLPUBLIC SfxResId: public ResId
+struct SFX2_DLLPUBLIC SfxResMgr
{
-public:
- SfxResId( sal_uInt16 nId );
static ResMgr* GetResMgr();
static void DeleteResMgr();
};
-#define SFX2_RESSTR(x) SfxResId(x).toString()
+inline OUString SfxResId(sal_uInt16 nId)
+{
+ return ResId(nId, *SfxResMgr::GetResMgr());
+}
#endif
diff --git a/include/svtools/svtresid.hxx b/include/svtools/svtresid.hxx
index f238b298c2c0..374406b1e455 100644
--- a/include/svtools/svtresid.hxx
+++ b/include/svtools/svtresid.hxx
@@ -24,14 +24,16 @@
#include <tools/resid.hxx>
#include <com/sun/star/lang/Locale.hpp>
-class SVT_DLLPUBLIC SvtResId: public ResId
+struct SVT_DLLPUBLIC SvtResMgr
{
-public:
- SvtResId(sal_uInt16 nId);
+ static ResMgr* GetResMgr();
static void DeleteResMgr();
};
-#define SVT_RESSTR(i) SvtResId(i).toString()
+inline OUString SvtResId(sal_uInt16 nId)
+{
+ return ResId(nId, *SvtResMgr::GetResMgr());
+}
#endif // INCLUDED_SVTOOLS_SVTRESID_HXX
diff --git a/include/svx/dialmgr.hxx b/include/svx/dialmgr.hxx
index 0aadfbdc6d60..54951aaee993 100644
--- a/include/svx/dialmgr.hxx
+++ b/include/svx/dialmgr.hxx
@@ -24,15 +24,17 @@
// forward ---------------------------------------------------------------
-class ResMgr;
struct SVX_DLLPUBLIC DialogsResMgr
{
static ResMgr* GetResMgr();
};
#define DIALOG_MGR() (*DialogsResMgr::GetResMgr())
-#define SVX_RES(i) ResId(i,DIALOG_MGR())
-#define SVX_RESSTR(i) SVX_RES(i).toString()
+
+inline OUString SvxResId(sal_uInt16 nId)
+{
+ return ResId(nId, DIALOG_MGR());
+}
#endif
diff --git a/include/svx/galmisc.hxx b/include/svx/galmisc.hxx
index 3fb3929b154d..ce89ab0ec5de 100644
--- a/include/svx/galmisc.hxx
+++ b/include/svx/galmisc.hxx
@@ -31,6 +31,7 @@
#include <svx/svxdllapi.h>
#include <tools/date.hxx>
#include <tools/time.hxx>
+#include <tools/resid.hxx>
class GalleryTheme;
class SotStorageStream;
@@ -62,8 +63,15 @@ enum class SgaObjKind
#define ID_IMAPINFO 2
-#define GAL_RES(nId) ResId(nId, *GetGalleryResMgr())
-#define GAL_RESSTR(nId) GAL_RES(nId).toString()
+class ResMgr;
+
+SVX_DLLPUBLIC ResMgr* GetGalleryResMgr();
+
+inline OUString GalResId(sal_uInt16 nId)
+{
+ return ResId(nId, *GetGalleryResMgr());
+}
+
#define STREAMBUF_SIZE 16384L
enum class GalleryGraphicImportRet
@@ -77,15 +85,12 @@ enum class GalleryGraphicImportRet
#define GALLERY_BG_COLOR Application::GetSettings().GetStyleSettings().GetWindowColor()
#define GALLERY_DLG_COLOR Application::GetSettings().GetStyleSettings().GetDialogColor()
-class ResMgr;
class SvStream;
class Graphic;
class FmFormModel;
class ImageMap;
class Gallery;
-SVX_DLLPUBLIC ResMgr*
- GetGalleryResMgr();
GalleryGraphicImportRet GalleryGraphicImport( const INetURLObject& rURL, Graphic& rGraphic, OUString& rFilterName, bool bShowProgress = false );
bool GallerySvDrawImport( SvStream& rIStm, SdrModel& rModel );
bool CreateIMapGraphic( const FmFormModel& rModel, Graphic& rGraphic, ImageMap& rImageMap );
diff --git a/sc/inc/scresid.hxx b/sc/inc/scresid.hxx
index d74c870d8101..d754f8eeea8f 100644
--- a/sc/inc/scresid.hxx
+++ b/sc/inc/scresid.hxx
@@ -20,16 +20,10 @@
#ifndef INCLUDED_SC_INC_SCRESID_HXX
#define INCLUDED_SC_INC_SCRESID_HXX
-#include <tools/resid.hxx>
+#include <rtl/ustring.hxx>
#include "scdllapi.h"
-class SC_DLLPUBLIC ScResId : public ResId
-{
- public:
- ScResId( sal_uInt16 nId ); // in scdll.cxx
-};
-
-#define SC_RESSTR(x) ScResId(x).toString()
+OUString SC_DLLPUBLIC ScResId(sal_uInt16 nId);
#endif // SC_SCRESMGR_HXX
diff --git a/sc/qa/unit/screenshots/screenshots.cxx b/sc/qa/unit/screenshots/screenshots.cxx
index ee6441535450..9e6b65ec4a5f 100644
--- a/sc/qa/unit/screenshots/screenshots.cxx
+++ b/sc/qa/unit/screenshots/screenshots.cxx
@@ -206,7 +206,7 @@ VclPtr<VclAbstractDialog> ScScreenshotTest::createDialogByID(sal_uInt32 nID)
{
const OString aEmpty("");
pReturnDialog = mpFact->CreateScStringInputDlg(mpViewShell->GetDialogParent(),
- OUString(ScResId(SCSTR_APDTABLE)), OUString(ScResId(SCSTR_NAME)),
+ ScResId(SCSTR_APDTABLE), ScResId(SCSTR_NAME),
aDefaultSheetName, aEmpty, aEmpty );
break;
}
@@ -214,8 +214,8 @@ VclPtr<VclAbstractDialog> ScScreenshotTest::createDialogByID(sal_uInt32 nID)
case 9: // "modules/scalc/ui/tabcolordialog.ui"
{
pReturnDialog = mpFact->CreateScTabBgColorDlg(mpViewShell->GetDialogParent(),
- OUString(ScResId(SCSTR_SET_TAB_BG_COLOR)),
- OUString(ScResId(SCSTR_NO_TAB_BG_COLOR)), Color(0xff00ff) );
+ ScResId(SCSTR_SET_TAB_BG_COLOR),
+ ScResId(SCSTR_NO_TAB_BG_COLOR), Color(0xff00ff) );
break;
}
diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx
index 4c6b9b51a19b..418de1e29fa1 100644
--- a/sc/source/core/data/documen8.cxx
+++ b/sc/source/core/data/documen8.cxx
@@ -814,7 +814,7 @@ void ScDocument::UpdateExternalRefLinks(vcl::Window* pWin)
sc::WaitPointerSwitch aWaitSwitch(pWin);
pExternalRefMgr->enableDocTimer(false);
- ScProgress aProgress(GetDocumentShell(), ScResId(SCSTR_UPDATE_EXTDOCS).toString(), aRefLinks.size(), true);
+ ScProgress aProgress(GetDocumentShell(), ScResId(SCSTR_UPDATE_EXTDOCS), aRefLinks.size(), true);
for (size_t i = 0, n = aRefLinks.size(); i < n; ++i)
{
aProgress.SetState(i+1);
@@ -835,7 +835,7 @@ void ScDocument::UpdateExternalRefLinks(vcl::Window* pWin)
aFile = aUrl.GetMainURL(INetURLObject::DecodeMechanism::Unambiguous);
OUStringBuffer aBuf;
- aBuf.append(OUString(ScResId(SCSTR_EXTDOC_NOT_LOADED)));
+ aBuf.append(ScResId(SCSTR_EXTDOC_NOT_LOADED));
aBuf.append("\n\n");
aBuf.append(aFile);
ScopedVclPtrInstance< MessageDialog > aBox(pWin, aBuf.makeStringAndClear());
diff --git a/sc/source/core/data/dpdimsave.cxx b/sc/source/core/data/dpdimsave.cxx
index 1a67cb577fc4..3ecc2ee04e75 100644
--- a/sc/source/core/data/dpdimsave.cxx
+++ b/sc/source/core/data/dpdimsave.cxx
@@ -26,6 +26,7 @@
#include <com/sun/star/sheet/DataPilotFieldGroupBy.hpp>
#include <svl/zforlist.hxx>
+#include <osl/diagnose.h>
#include <rtl/math.hxx>
#include <algorithm>
diff --git a/sc/source/core/data/dpoutput.cxx b/sc/source/core/data/dpoutput.cxx
index b8c02b9d4963..d9fe4a1aaadd 100644
--- a/sc/source/core/data/dpoutput.cxx
+++ b/sc/source/core/data/dpoutput.cxx
@@ -977,13 +977,13 @@ void ScDPOutput::Output()
FieldCell(nHdrCol, nHdrRow, nTab, pPageFields[nField], false);
SCCOL nFldCol = nHdrCol + 1;
- OUString aPageValue = ScResId(SCSTR_ALL).toString();
+ OUString aPageValue = ScResId(SCSTR_ALL);
const uno::Sequence<sheet::MemberResult>& rRes = pPageFields[nField].maResult;
sal_Int32 n = rRes.getLength();
if (n == 1)
aPageValue = rRes[0].Caption;
else if (n > 1)
- aPageValue = ScResId(SCSTR_MULTIPLE).toString();
+ aPageValue = ScResId(SCSTR_MULTIPLE);
ScSetStringParam aParam;
aParam.setTextInput();
diff --git a/sc/source/core/data/funcdesc.cxx b/sc/source/core/data/funcdesc.cxx
index a5c825a462dc..012308cc99bc 100644
--- a/sc/source/core/data/funcdesc.cxx
+++ b/sc/source/core/data/funcdesc.cxx
@@ -810,7 +810,7 @@ ScFunctionList::ScFunctionList()
// OpCodes, which is utopian...
for (sal_uInt16 i = 0; i <= SC_OPCODE_LAST_OPCODE_ID; ++i)
{
- ScResId aRes(RID_SC_FUNC_DESCRIPTIONS_START + i);
+ ResId aRes(RID_SC_FUNC_DESCRIPTIONS_START + i, *SC_MOD()->GetResMgr());
aRes.SetRT(RSC_STRINGARRAY);
// Opcode Resource available?
if (SC_MOD()->GetResMgr()->IsAvailable(aRes))
@@ -1179,7 +1179,7 @@ OUString ScFunctionMgr::GetCategoryName(sal_uInt32 _nCategoryNumber )
return OUString();
}
- ResStringArray aStringArray(ScResId(RID_FUNCTION_CATEGORIES));
+ ResStringArray aStringArray(ResId(RID_FUNCTION_CATEGORIES, *SC_MOD()->GetResMgr()));
return aStringArray.GetString(_nCategoryNumber);
}
diff --git a/sc/source/core/tool/autoform.cxx b/sc/source/core/tool/autoform.cxx
index 045581c3d4ba..6b7cd8b84452 100644
--- a/sc/source/core/tool/autoform.cxx
+++ b/sc/source/core/tool/autoform.cxx
@@ -773,7 +773,7 @@ bool ScAutoFormatData::Load( SvStream& rStream, const ScAfVersions& rVersions )
if( RID_SVXSTR_TBLAFMT_BEGIN <= nId &&
nId < RID_SVXSTR_TBLAFMT_END )
{
- aName = SVX_RESSTR( nId );
+ aName = SvxResId( nId );
}
else
nStrResId = USHRT_MAX;
diff --git a/sc/source/core/tool/inputopt.cxx b/sc/source/core/tool/inputopt.cxx
index 4337194a425a..b2cdf34646b4 100644
--- a/sc/source/core/tool/inputopt.cxx
+++ b/sc/source/core/tool/inputopt.cxx
@@ -19,6 +19,7 @@
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/uno/Sequence.hxx>
+#include <osl/diagnose.h>
#include "cfgids.hxx"
#include "inputopt.hxx"
diff --git a/sc/source/core/tool/rangeutl.cxx b/sc/source/core/tool/rangeutl.cxx
index ea0dbf962be8..0d8ee77dd82d 100644
--- a/sc/source/core/tool/rangeutl.cxx
+++ b/sc/source/core/tool/rangeutl.cxx
@@ -18,6 +18,7 @@
*/
#include <memory>
+#include <osl/diagnose.h>
#include "rangeutl.hxx"
#include "document.hxx"
#include "global.hxx"
diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx
index 2fbabe9efa36..e2336902a3bd 100644
--- a/sc/source/ui/Accessibility/AccessibleDocument.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx
@@ -1566,7 +1566,7 @@ void ScAccessibleDocument::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
{
mpTempAccEdit = new ScAccessibleEditObject(this, rViewData.GetEditView(meSplitPos),
mpViewShell->GetWindowByPos(meSplitPos), GetCurrentCellName(),
- OUString(ScResId(STR_ACC_EDITLINE_DESCR)), ScAccessibleEditObject::CellInEditMode);
+ ScResId(STR_ACC_EDITLINE_DESCR), ScAccessibleEditObject::CellInEditMode);
uno::Reference<XAccessible> xAcc = mpTempAccEdit;
AddChild(xAcc, true);
@@ -2120,7 +2120,7 @@ OUString SAL_CALL
{
SolarMutexGuard aGuard;
IsObjectValid();
- OUString sName = OUString(ScResId(STR_ACC_DOC_NAME));
+ OUString sName = ScResId(STR_ACC_DOC_NAME);
sal_Int32 nNumber(sal_Int32(meSplitPos) + 1);
sName += OUString::number(nNumber);
return sName;
@@ -2238,7 +2238,7 @@ void ScAccessibleDocument::RemoveChild(const uno::Reference<XAccessible>& xAcc,
OUString ScAccessibleDocument::GetCurrentCellName() const
{
- OUString sName(SC_RESSTR(STR_ACC_CELL_NAME));
+ OUString sName(ScResId(STR_ACC_CELL_NAME));
if (mpViewShell)
{
// Document not needed, because only the cell address, but not the tablename is needed
diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
index 21e84ddaaca7..4a76e4abb9f5 100644
--- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
@@ -1521,7 +1521,7 @@ OUString SAL_CALL ScAccessibleDocumentPagePreview::createAccessibleDescription()
OUString SAL_CALL ScAccessibleDocumentPagePreview::createAccessibleName()
{
- OUString sName = OUString(ScResId(STR_ACC_PREVIEWDOC_NAME));
+ OUString sName = ScResId(STR_ACC_PREVIEWDOC_NAME);
return sName;
}
diff --git a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx
index 7bc640910bdf..80f33b6e9516 100644
--- a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx
@@ -299,13 +299,13 @@ uno::Sequence<OUString> SAL_CALL ScAccessiblePageHeader::getSupportedServiceName
OUString SAL_CALL ScAccessiblePageHeader::createAccessibleDescription()
{
OUString sDesc(mbHeader ? OUString(STR_ACC_HEADER_DESCR) : OUString(STR_ACC_FOOTER_DESCR));
- return sDesc.replaceFirst("%1", SC_RESSTR(SCSTR_UNKNOWN));
+ return sDesc.replaceFirst("%1", ScResId(SCSTR_UNKNOWN));
}
OUString SAL_CALL ScAccessiblePageHeader::createAccessibleName()
{
- OUString sName(SC_RESSTR(mbHeader ? STR_ACC_HEADER_NAME : STR_ACC_FOOTER_NAME));
- return sName.replaceFirst("%1", SC_RESSTR(SCSTR_UNKNOWN));
+ OUString sName(ScResId(mbHeader ? STR_ACC_HEADER_NAME : STR_ACC_FOOTER_NAME));
+ return sName.replaceFirst("%1", ScResId(SCSTR_UNKNOWN));
}
tools::Rectangle ScAccessiblePageHeader::GetBoundingBoxOnScreen() const
diff --git a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx
index 5f05a33da2cb..da2c3bcc02c3 100644
--- a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx
@@ -229,13 +229,13 @@ OUString SAL_CALL ScAccessiblePageHeaderArea::createAccessibleName()
switch (meAdjust)
{
case SvxAdjust::Left :
- sName = OUString(ScResId(STR_ACC_LEFTAREA_NAME));
+ sName = ScResId(STR_ACC_LEFTAREA_NAME);
break;
case SvxAdjust::Right:
- sName = OUString(ScResId(STR_ACC_RIGHTAREA_NAME));
+ sName = ScResId(STR_ACC_RIGHTAREA_NAME);
break;
case SvxAdjust::Center:
- sName = OUString(ScResId(STR_ACC_CENTERAREA_NAME));
+ sName = ScResId(STR_ACC_CENTERAREA_NAME);
break;
default:
OSL_FAIL("wrong adjustment found");
diff --git a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx
index e4b47a759da7..7354b92bf90e 100644
--- a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx
@@ -586,7 +586,7 @@ OUString SAL_CALL ScAccessiblePreviewTable::createAccessibleDescription()
OUString SAL_CALL ScAccessiblePreviewTable::createAccessibleName()
{
- OUString sName(SC_RESSTR(STR_ACC_TABLE_NAME));
+ OUString sName(ScResId(STR_ACC_TABLE_NAME));
if (mpViewShell)
{
diff --git a/sc/source/ui/Accessibility/AccessibleTableBase.cxx b/sc/source/ui/Accessibility/AccessibleTableBase.cxx
index e83a421e542c..b598dba0953a 100644
--- a/sc/source/ui/Accessibility/AccessibleTableBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleTableBase.cxx
@@ -349,7 +349,7 @@ OUString SAL_CALL
OUString SAL_CALL ScAccessibleTableBase::createAccessibleName()
{
- OUString sName(SC_RESSTR(STR_ACC_TABLE_NAME));
+ OUString sName(ScResId(STR_ACC_TABLE_NAME));
OUString sCoreName;
if (mpDoc && mpDoc->GetName( maRange.aStart.Tab(), sCoreName ))
sName = sName.replaceFirst("%1", sCoreName);
diff --git a/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx b/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx
index 26918937235f..4c62091840f8 100644
--- a/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx
@@ -182,7 +182,7 @@ void ScAnalysisOfVarianceDialog::RowColumn(ScRangeList& rRangeList, AddressWalke
else
{
sal_Int16 aLabelId = (aGroupedBy == BY_COLUMN) ? STR_COLUMN_LABEL_TEMPLATE : STR_ROW_LABEL_TEMPLATE;
- OUString aLabelTemplate(SC_RESSTR(aLabelId));
+ OUString aLabelTemplate(ScResId(aLabelId));
for (size_t i = 0; i < rRangeList.size(); i++)
{
@@ -198,11 +198,11 @@ void ScAnalysisOfVarianceDialog::RowColumn(ScRangeList& rRangeList, AddressWalke
void ScAnalysisOfVarianceDialog::AnovaSingleFactor(AddressWalkerWriter& output, FormulaTemplate& aTemplate)
{
- output.writeBoldString(SC_RESSTR(STR_ANOVA_SINGLE_FACTOR_LABEL));
+ output.writeBoldString(ScResId(STR_ANOVA_SINGLE_FACTOR_LABEL));
output.newLine();
double aAlphaValue = mpAlphaField->GetValue() / 100.0;
- output.writeString(SC_RESSTR(STR_LABEL_ALPHA));
+ output.writeString(ScResId(STR_LABEL_ALPHA));
output.nextColumn();
output.writeValue(aAlphaValue);
aTemplate.autoReplaceAddress("%ALPHA%", output.current());
@@ -212,7 +212,7 @@ void ScAnalysisOfVarianceDialog::AnovaSingleFactor(AddressWalkerWriter& output,
// Write labels
for(sal_Int32 i = 0; lclBasicStatistics[i].aLabelId != 0; i++)
{
- output.writeString(SC_RESSTR(lclBasicStatistics[i].aLabelId));
+ output.writeString(ScResId(lclBasicStatistics[i].aLabelId));
output.nextColumn();
}
output.newLine();
@@ -244,7 +244,7 @@ void ScAnalysisOfVarianceDialog::AnovaSingleFactor(AddressWalkerWriter& output,
output.resetColumn();
for(sal_Int32 i = 0; lclAnovaLabels[i] != 0; i++)
{
- output.writeString(SC_RESSTR(lclAnovaLabels[i]));
+ output.writeString(ScResId(lclAnovaLabels[i]));
output.nextColumn();
}
output.nextRow();
@@ -255,7 +255,7 @@ void ScAnalysisOfVarianceDialog::AnovaSingleFactor(AddressWalkerWriter& output,
{
// Label
output.resetColumn();
- output.writeString(SC_RESSTR(STR_ANOVA_LABEL_BETWEEN_GROUPS));
+ output.writeString(ScResId(STR_ANOVA_LABEL_BETWEEN_GROUPS));
output.nextColumn();
// Sum of Squares
@@ -301,7 +301,7 @@ void ScAnalysisOfVarianceDialog::AnovaSingleFactor(AddressWalkerWriter& output,
{
// Label
output.resetColumn();
- output.writeString(SC_RESSTR(STR_ANOVA_LABEL_WITHIN_GROUPS));
+ output.writeString(ScResId(STR_ANOVA_LABEL_WITHIN_GROUPS));
output.nextColumn();
// Sum of Squares
@@ -328,7 +328,7 @@ void ScAnalysisOfVarianceDialog::AnovaSingleFactor(AddressWalkerWriter& output,
{
// Label
output.resetColumn();
- output.writeString(SC_RESSTR(STR_ANOVA_LABEL_TOTAL));
+ output.writeString(ScResId(STR_ANOVA_LABEL_TOTAL));
output.nextColumn();
// Sum of Squares
@@ -346,7 +346,7 @@ void ScAnalysisOfVarianceDialog::AnovaSingleFactor(AddressWalkerWriter& output,
void ScAnalysisOfVarianceDialog::AnovaTwoFactor(AddressWalkerWriter& output, FormulaTemplate& aTemplate)
{
- output.writeBoldString(SC_RESSTR(STR_ANOVA_TWO_FACTOR_LABEL));
+ output.writeBoldString(ScResId(STR_ANOVA_TWO_FACTOR_LABEL));
output.newLine();
double aAlphaValue = mpAlphaField->GetValue() / 100.0;
@@ -360,7 +360,7 @@ void ScAnalysisOfVarianceDialog::AnovaTwoFactor(AddressWalkerWriter& output, For
// Write labels
for(sal_Int32 i = 0; lclBasicStatistics[i].aLabelId != 0; i++)
{
- output.writeString(SC_RESSTR(lclBasicStatistics[i].aLabelId));
+ output.writeString(ScResId(lclBasicStatistics[i].aLabelId));
output.nextColumn();
}
output.newLine();
@@ -409,7 +409,7 @@ void ScAnalysisOfVarianceDialog::AnovaTwoFactor(AddressWalkerWriter& output, For
// Write ANOVA labels
for(sal_Int32 i = 0; lclAnovaLabels[i] != 0; i++)
{
- output.writeString(SC_RESSTR(lclAnovaLabels[i]));
+ output.writeString(ScResId(lclAnovaLabels[i]));
output.nextColumn();
}
output.nextRow();
diff --git a/sc/source/ui/StatisticsDialogs/ChiSquareTestDialog.cxx b/sc/source/ui/StatisticsDialogs/ChiSquareTestDialog.cxx
index 0e5e1b3df014..1a7591a121e1 100644
--- a/sc/source/ui/StatisticsDialogs/ChiSquareTestDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/ChiSquareTestDialog.cxx
@@ -31,7 +31,7 @@ ScChiSquareTestDialog::ScChiSquareTestDialog(
pSfxBindings, pChildWindow, pParent, pViewData,
"ChiSquareTestDialog", "modules/scalc/ui/chisquaretestdialog.ui" )
{
- SetText(SC_RESSTR(STR_CHI_SQUARE_TEST));
+ SetText(ScResId(STR_CHI_SQUARE_TEST));
}
ScChiSquareTestDialog::~ScChiSquareTestDialog()
@@ -55,18 +55,18 @@ ScRange ScChiSquareTestDialog::ApplyOutput(ScDocShell* pDocShell)
aTemplate.autoReplaceRange("%RANGE%", mInputRange);
- aOutput.writeBoldString(SC_RESSTR(STR_CHI_SQUARE_TEST));
+ aOutput.writeBoldString(ScResId(STR_CHI_SQUARE_TEST));
aOutput.newLine();
// Alpha
- aOutput.writeString(SC_RESSTR(STR_LABEL_ALPHA));
+ aOutput.writeString(ScResId(STR_LABEL_ALPHA));
aOutput.nextColumn();
aOutput.writeValue(0.05);
aTemplate.autoReplaceAddress("%ALPHA%", aOutput.current());
aOutput.newLine();
// DF
- aOutput.writeString(SC_RESSTR(STR_DEGREES_OF_FREEDOM_LABEL));
+ aOutput.writeString(ScResId(STR_DEGREES_OF_FREEDOM_LABEL));
aOutput.nextColumn();
aTemplate.setTemplate("=(COLUMNS(%RANGE%) - 1) * (ROWS(%RANGE%) - 1)");
aTemplate.autoReplaceAddress("%DEGREES_OF_FREEDOM%", aOutput.current());
@@ -74,7 +74,7 @@ ScRange ScChiSquareTestDialog::ApplyOutput(ScDocShell* pDocShell)
aOutput.newLine();
// p Value
- aOutput.writeString(SC_RESSTR(STR_P_VALUE_LABEL));
+ aOutput.writeString(ScResId(STR_P_VALUE_LABEL));
aOutput.nextColumn();
aTemplate.setTemplate("=CHITEST(%RANGE%; MMULT(MMULT(%RANGE%;TRANSPOSE(IF(COLUMN(%RANGE%))));MMULT(TRANSPOSE(IF(ROW(%RANGE%)));%RANGE%)) / SUM(%RANGE%))");
aTemplate.autoReplaceAddress("%P_VALUE%", aOutput.current());
@@ -82,14 +82,14 @@ ScRange ScChiSquareTestDialog::ApplyOutput(ScDocShell* pDocShell)
aOutput.newLine();
// Test Statistic
- aOutput.writeString(SC_RESSTR(STR_TEST_STATISTIC_LABEL));
+ aOutput.writeString(ScResId(STR_TEST_STATISTIC_LABEL));
aOutput.nextColumn();
aTemplate.setTemplate("=CHIINV(%P_VALUE%; %DEGREES_OF_FREEDOM%)");
aOutput.writeFormula(aTemplate.getTemplate());
aOutput.newLine();
// Critical value
- aOutput.writeString(SC_RESSTR(STR_CRITICAL_VALUE_LABEL));
+ aOutput.writeString(ScResId(STR_CRITICAL_VALUE_LABEL));
aOutput.nextColumn();
aTemplate.setTemplate("=CHIINV(%ALPHA%; %DEGREES_OF_FREEDOM%)");
aOutput.writeFormula(aTemplate.getTemplate());
diff --git a/sc/source/ui/StatisticsDialogs/CorrelationDialog.cxx b/sc/source/ui/StatisticsDialogs/CorrelationDialog.cxx
index 09254e39af72..7eafe239aa40 100644
--- a/sc/source/ui/StatisticsDialogs/CorrelationDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/CorrelationDialog.cxx
@@ -28,7 +28,7 @@ bool ScCorrelationDialog::Close()
const OUString ScCorrelationDialog::getLabel()
{
- return SC_RESSTR(STR_CORRELATION_LABEL);
+ return ScResId(STR_CORRELATION_LABEL);
}
const OUString ScCorrelationDialog::getTemplate()
diff --git a/sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx b/sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx
index bb35aa7dce0e..5506444bfd41 100644
--- a/sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx
@@ -33,7 +33,7 @@ bool ScCovarianceDialog::Close()
const OUString ScCovarianceDialog::getLabel()
{
- return SC_RESSTR(STR_COVARIANCE_LABEL);
+ return ScResId(STR_COVARIANCE_LABEL);
}
const OUString ScCovarianceDialog::getTemplate()
diff --git a/sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx b/sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx
index ce309cb135e9..2dcc463a840e 100644
--- a/sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx
@@ -97,9 +97,9 @@ ScRange ScDescriptiveStatisticsDialog::ApplyOutput(ScDocShell* pDocShell)
for( ; pIterator->hasNext(); pIterator->next() )
{
if (mGroupedBy == BY_COLUMN)
- aTemplate.setTemplate(SC_RESSTR(STR_COLUMN_LABEL_TEMPLATE));
+ aTemplate.setTemplate(ScResId(STR_COLUMN_LABEL_TEMPLATE));
else
- aTemplate.setTemplate(SC_RESSTR(STR_ROW_LABEL_TEMPLATE));
+ aTemplate.setTemplate(ScResId(STR_ROW_LABEL_TEMPLATE));
aTemplate.applyNumber("%NUMBER%", pIterator->index() + 1);
aOutput.writeBoldString(aTemplate.getTemplate());
@@ -112,7 +112,7 @@ ScRange ScDescriptiveStatisticsDialog::ApplyOutput(ScDocShell* pDocShell)
// Write calculation labels
for(sal_Int32 i = 0; lclCalcDefinitions[i].aFormula != nullptr; i++)
{
- OUString aLabel(SC_RESSTR(lclCalcDefinitions[i].aCalculationNameId));
+ OUString aLabel(ScResId(lclCalcDefinitions[i].aCalculationNameId));
aOutput.writeString(aLabel);
aOutput.nextRow();
}
diff --git a/sc/source/ui/StatisticsDialogs/ExponentialSmoothingDialog.cxx b/sc/source/ui/StatisticsDialogs/ExponentialSmoothingDialog.cxx
index 0a7e5785340b..f5d679c3d339 100644
--- a/sc/source/ui/StatisticsDialogs/ExponentialSmoothingDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/ExponentialSmoothingDialog.cxx
@@ -66,7 +66,7 @@ ScRange ScExponentialSmoothingDialog::ApplyOutput(ScDocShell* pDocShell)
double aSmoothingFactor = mpSmoothingFactor->GetValue() / 100.0;
// Alpha
- output.writeBoldString(SC_RESSTR(STR_LABEL_ALPHA));
+ output.writeBoldString(ScResId(STR_LABEL_ALPHA));
output.nextRow();
// Alpha Value
@@ -91,9 +91,9 @@ ScRange ScExponentialSmoothingDialog::ApplyOutput(ScDocShell* pDocShell)
// Write column label
if (mGroupedBy == BY_COLUMN)
- aTemplate.setTemplate(SC_RESSTR(STR_COLUMN_LABEL_TEMPLATE));
+ aTemplate.setTemplate(ScResId(STR_COLUMN_LABEL_TEMPLATE));
else
- aTemplate.setTemplate(SC_RESSTR(STR_ROW_LABEL_TEMPLATE));
+ aTemplate.setTemplate(ScResId(STR_ROW_LABEL_TEMPLATE));
aTemplate.applyNumber("%NUMBER%", pIterator->index() + 1);
output.writeBoldString(aTemplate.getTemplate());
output.nextRow();
diff --git a/sc/source/ui/StatisticsDialogs/FTestDialog.cxx b/sc/source/ui/StatisticsDialogs/FTestDialog.cxx
index 57b4ac77e0f0..a3cc2cb8b2b1 100644
--- a/sc/source/ui/StatisticsDialogs/FTestDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/FTestDialog.cxx
@@ -32,7 +32,7 @@ ScFTestDialog::ScFTestDialog(
pSfxBindings, pChildWindow, pParent, pViewData,
"TTestDialog", "modules/scalc/ui/ttestdialog.ui" )
{
- SetText(SC_RESSTR(STR_FTEST));
+ SetText(ScResId(STR_FTEST));
}
ScFTestDialog::~ScFTestDialog()
@@ -69,23 +69,23 @@ ScRange ScFTestDialog::ApplyOutput(ScDocShell* pDocShell)
aTemplate.autoReplaceRange("%VARIABLE1_RANGE%", pVariable1Iterator->get());
aTemplate.autoReplaceRange("%VARIABLE2_RANGE%", pVariable2Iterator->get());
- aOutput.writeBoldString(SC_RESSTR(STR_FTEST_UNDO_NAME));
+ aOutput.writeBoldString(ScResId(STR_FTEST_UNDO_NAME));
aOutput.newLine();
// Alpha
- aOutput.writeString(SC_RESSTR(STR_LABEL_ALPHA));
+ aOutput.writeString(ScResId(STR_LABEL_ALPHA));
aOutput.nextColumn();
aOutput.writeValue(0.05);
aTemplate.autoReplaceAddress("%ALPHA%", aOutput.current());
aOutput.newLine();
aOutput.nextColumn();
- aOutput.writeBoldString(SC_RESSTR(STR_VARIABLE_1_LABEL));
+ aOutput.writeBoldString(ScResId(STR_VARIABLE_1_LABEL));
aOutput.nextColumn();
- aOutput.writeBoldString(SC_RESSTR(STR_VARIABLE_2_LABEL));
+ aOutput.writeBoldString(ScResId(STR_VARIABLE_2_LABEL));
aOutput.newLine();
- aOutput.writeString(SC_RESSTR(STRID_CALC_MEAN));
+ aOutput.writeString(ScResId(STRID_CALC_MEAN));
aOutput.nextColumn();
aTemplate.setTemplate("=AVERAGE(%VARIABLE1_RANGE%)");
aOutput.writeFormula(aTemplate.getTemplate());
@@ -94,7 +94,7 @@ ScRange ScFTestDialog::ApplyOutput(ScDocShell* pDocShell)
aOutput.writeFormula(aTemplate.getTemplate());
aOutput.newLine();
- aOutput.writeString(SC_RESSTR(STRID_CALC_VARIANCE));
+ aOutput.writeString(ScResId(STRID_CALC_VARIANCE));
aOutput.nextColumn();
aTemplate.setTemplate("=VAR(%VARIABLE1_RANGE%)");
aOutput.writeFormula(aTemplate.getTemplate());
@@ -105,7 +105,7 @@ ScRange ScFTestDialog::ApplyOutput(ScDocShell* pDocShell)
aTemplate.autoReplaceAddress("%VARIABLE2_VARIANCE%", aOutput.current());
aOutput.newLine();
- aOutput.writeString(SC_RESSTR(STR_OBSERVATIONS_LABEL));
+ aOutput.writeString(ScResId(STR_OBSERVATIONS_LABEL));
aOutput.nextColumn();
aTemplate.setTemplate("=COUNT(%VARIABLE1_RANGE%)");
aOutput.writeFormula(aTemplate.getTemplate());
@@ -116,7 +116,7 @@ ScRange ScFTestDialog::ApplyOutput(ScDocShell* pDocShell)
aTemplate.autoReplaceAddress("%VARIABLE2_OBSERVATIONS%", aOutput.current());
aOutput.newLine();
- aOutput.writeString(SC_RESSTR(STR_ANOVA_LABEL_DF));
+ aOutput.writeString(ScResId(STR_ANOVA_LABEL_DF));
aOutput.nextColumn();
aTemplate.setTemplate("=%VARIABLE1_OBSERVATIONS% - 1");
aOutput.writeFormula(aTemplate.getTemplate());
@@ -127,46 +127,46 @@ ScRange ScFTestDialog::ApplyOutput(ScDocShell* pDocShell)
aTemplate.autoReplaceAddress("%VARIABLE2_DEGREE_OF_FREEDOM%", aOutput.current());
aOutput.newLine();
- aOutput.writeString(SC_RESSTR(STR_ANOVA_LABEL_F));
+ aOutput.writeString(ScResId(STR_ANOVA_LABEL_F));
aOutput.nextColumn();
aTemplate.setTemplate("=%VARIABLE1_VARIANCE% / %VARIABLE2_VARIANCE%");
aOutput.writeFormula(aTemplate.getTemplate());
aTemplate.autoReplaceAddress("%F_VALUE%", aOutput.current());
aOutput.newLine();
- aOutput.writeString(SC_RESSTR(STR_FTEST_P_RIGHT_TAIL));
+ aOutput.writeString(ScResId(STR_FTEST_P_RIGHT_TAIL));
aOutput.nextColumn();
aTemplate.setTemplate("=FDIST(%F_VALUE%; %VARIABLE1_DEGREE_OF_FREEDOM%; %VARIABLE2_DEGREE_OF_FREEDOM%)");
aOutput.writeFormula(aTemplate.getTemplate());
aTemplate.autoReplaceAddress("%P_RIGHT_TAIL_VALUE%", aOutput.current());
aOutput.newLine();
- aOutput.writeString(SC_RESSTR(STR_FTEST_F_CRITICAL_RIGHT_TAIL));
+ aOutput.writeString(ScResId(STR_FTEST_F_CRITICAL_RIGHT_TAIL));
aOutput.nextColumn();
aTemplate.setTemplate("=FINV(%ALPHA%; %VARIABLE1_DEGREE_OF_FREEDOM%; %VARIABLE2_DEGREE_OF_FREEDOM%)");
aOutput.writeFormula(aTemplate.getTemplate());
aOutput.newLine();
- aOutput.writeString(SC_RESSTR(STR_FTEST_P_LEFT_TAIL));
+ aOutput.writeString(ScResId(STR_FTEST_P_LEFT_TAIL));
aOutput.nextColumn();
aTemplate.setTemplate("=1 - %P_RIGHT_TAIL_VALUE%");
aOutput.writeFormula(aTemplate.getTemplate());
aTemplate.autoReplaceAddress("%P_LEFT_TAIL_VALUE%", aOutput.current());
aOutput.newLine();
- aOutput.writeString(SC_RESSTR(STR_FTEST_F_CRITICAL_LEFT_TAIL));
+ aOutput.writeString(ScResId(STR_FTEST_F_CRITICAL_LEFT_TAIL));
aOutput.nextColumn();
aTemplate.setTemplate("=FINV(1-%ALPHA%; %VARIABLE1_DEGREE_OF_FREEDOM%; %VARIABLE2_DEGREE_OF_FREEDOM%)");
aOutput.writeFormula(aTemplate.getTemplate());
aOutput.newLine();
- aOutput.writeString(SC_RESSTR(STR_FTEST_P_TWO_TAIL));
+ aOutput.writeString(ScResId(STR_FTEST_P_TWO_TAIL));
aOutput.nextColumn();
aTemplate.setTemplate("=2*MIN(%P_RIGHT_TAIL_VALUE%; %P_LEFT_TAIL_VALUE%)");
aOutput.writeFormula(aTemplate.getTemplate());
aOutput.newLine();
- aOutput.writeString(SC_RESSTR(STR_FTEST_F_CRITICAL_TWO_TAIL));
+ aOutput.writeString(ScResId(STR_FTEST_F_CRITICAL_TWO_TAIL));
aOutput.nextColumn();
aTemplate.setTemplate("=FINV(1-(%ALPHA%/2); %VARIABLE1_DEGREE_OF_FREEDOM%; %VARIABLE2_DEGREE_OF_FREEDOM%)");
aOutput.writeFormula(aTemplate.getTemplate());
diff --git a/sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx b/sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx
index 413e8c9be2ab..5d02286c98e9 100644
--- a/sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx
+++ b/sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx
@@ -86,9 +86,9 @@ ScRange ScMatrixComparisonGenerator::ApplyOutput(ScDocShell* pDocShell)
for (size_t i = 0; i < aRangeList.size(); i++)
{
if (mGroupedBy == BY_COLUMN)
- aTemplate.setTemplate(SC_RESSTR(STR_COLUMN_LABEL_TEMPLATE));
+ aTemplate.setTemplate(ScResId(STR_COLUMN_LABEL_TEMPLATE));
else
- aTemplate.setTemplate(SC_RESSTR(STR_ROW_LABEL_TEMPLATE));
+ aTemplate.setTemplate(ScResId(STR_ROW_LABEL_TEMPLATE));
aTemplate.applyNumber(strWildcardNumber, i + 1);
output.writeString(aTemplate.getTemplate());
@@ -101,9 +101,9 @@ ScRange ScMatrixComparisonGenerator::ApplyOutput(ScDocShell* pDocShell)
for (size_t i = 0; i < aRangeList.size(); i++)
{
if (mGroupedBy == BY_COLUMN)
- aTemplate.setTemplate(SC_RESSTR(STR_COLUMN_LABEL_TEMPLATE));
+ aTemplate.setTemplate(ScResId(STR_COLUMN_LABEL_TEMPLATE));
else
- aTemplate.setTemplate(SC_RESSTR(STR_ROW_LABEL_TEMPLATE));
+ aTemplate.setTemplate(ScResId(STR_ROW_LABEL_TEMPLATE));
aTemplate.applyNumber(strWildcardNumber, i + 1);
output.writeString(aTemplate.getTemplate());
diff --git a/sc/source/ui/StatisticsDialogs/MovingAverageDialog.cxx b/sc/source/ui/StatisticsDialogs/MovingAverageDialog.cxx
index 7ea5fadbbff5..540dd33e721c 100644
--- a/sc/source/ui/StatisticsDialogs/MovingAverageDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/MovingAverageDialog.cxx
@@ -77,9 +77,9 @@ ScRange ScMovingAverageDialog::ApplyOutput(ScDocShell* pDocShell)
// Write label
if (mGroupedBy == BY_COLUMN)
- aTemplate.setTemplate(SC_RESSTR(STR_COLUMN_LABEL_TEMPLATE));
+ aTemplate.setTemplate(ScResId(STR_COLUMN_LABEL_TEMPLATE));
else
- aTemplate.setTemplate(SC_RESSTR(STR_ROW_LABEL_TEMPLATE));
+ aTemplate.setTemplate(ScResId(STR_ROW_LABEL_TEMPLATE));
aTemplate.applyNumber("%NUMBER%", pIterator->index() + 1);
output.writeBoldString(aTemplate.getTemplate());
diff --git a/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx b/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx
index eb639e60cc92..1c6e40b5a60a 100644
--- a/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx
@@ -281,8 +281,8 @@ void ScRandomNumberGeneratorDialog::SelectGeneratorAndGenerateNumbers()
template<class RNG>
void ScRandomNumberGeneratorDialog::GenerateNumbers(RNG& randomGenerator, const sal_Int16 aDistributionStringId, boost::optional<sal_Int8> aDecimalPlaces)
{
- OUString aUndo = SC_RESSTR(STR_UNDO_DISTRIBUTION_TEMPLATE);
- OUString aDistributionName = SC_RESSTR(aDistributionStringId);
+ OUString aUndo = ScResId(STR_UNDO_DISTRIBUTION_TEMPLATE);
+ OUString aDistributionName = ScResId(aDistributionStringId);
aUndo = aUndo.replaceAll("$(DISTRIBUTION)", aDistributionName);
ScDocShell* pDocShell = mpViewData->GetDocShell();
@@ -435,19 +435,19 @@ IMPL_LINK_NOARG(ScRandomNumberGeneratorDialog, DistributionChanged, ListBox&, vo
{
case DIST_UNIFORM:
{
- mpParameter1Text->SetText(SC_RESSTR(STR_RNG_PARAMETER_MINIMUM));
- mpParameter2Text->SetText(SC_RESSTR(STR_RNG_PARAMETER_MAXIMUM));
+ mpParameter1Text->SetText(ScResId(STR_RNG_PARAMETER_MINIMUM));
+ mpParameter2Text->SetText(ScResId(STR_RNG_PARAMETER_MAXIMUM));
mpParameter2Text->Show();
mpParameter2Value->Show();
break;
}
case DIST_UNIFORM_INTEGER:
{
- mpParameter1Text->SetText(SC_RESSTR(STR_RNG_PARAMETER_MINIMUM));
+ mpParameter1Text->SetText(ScResId(STR_RNG_PARAMETER_MINIMUM));
mpParameter1Value->SetDecimalDigits(0);
mpParameter1Value->SetSpinSize(1);
- mpParameter2Text->SetText(SC_RESSTR(STR_RNG_PARAMETER_MAXIMUM));
+ mpParameter2Text->SetText(ScResId(STR_RNG_PARAMETER_MAXIMUM));
mpParameter2Value->SetDecimalDigits(0);
mpParameter2Value->SetSpinSize(1);
@@ -457,16 +457,16 @@ IMPL_LINK_NOARG(ScRandomNumberGeneratorDialog, DistributionChanged, ListBox&, vo
}
case DIST_NORMAL:
{
- mpParameter1Text->SetText(SC_RESSTR(STR_RNG_PARAMETER_MEAN));
- mpParameter2Text->SetText(SC_RESSTR(STR_RNG_PARAMETER_STANDARD_DEVIATION));
+ mpParameter1Text->SetText(ScResId(STR_RNG_PARAMETER_MEAN));
+ mpParameter2Text->SetText(ScResId(STR_RNG_PARAMETER_STANDARD_DEVIATION));
mpParameter2Text->Show();
mpParameter2Value->Show();
break;
}
case DIST_CAUCHY:
{
- mpParameter1Text->SetText(SC_RESSTR(STR_RNG_PARAMETER_STANDARD_MEDIAN));
- mpParameter2Text->SetText(SC_RESSTR(STR_RNG_PARAMETER_STANDARD_SIGMA));
+ mpParameter1Text->SetText(ScResId(STR_RNG_PARAMETER_STANDARD_MEDIAN));
+ mpParameter2Text->SetText(ScResId(STR_RNG_PARAMETER_STANDARD_SIGMA));
mpParameter2Text->Show();
mpParameter2Value->Show();
break;
@@ -474,7 +474,7 @@ IMPL_LINK_NOARG(ScRandomNumberGeneratorDialog, DistributionChanged, ListBox&, vo
case DIST_BERNOULLI:
case DIST_GEOMETRIC:
{
- mpParameter1Text->SetText(SC_RESSTR(STR_RNG_PARAMETER_STANDARD_PROBABILITY));
+ mpParameter1Text->SetText(ScResId(STR_RNG_PARAMETER_STANDARD_PROBABILITY));
mpParameter1Value->SetMin( 0 );
mpParameter1Value->SetMax( PERCISION );
mpParameter1Value->SetSpinSize(1000);
@@ -486,12 +486,12 @@ IMPL_LINK_NOARG(ScRandomNumberGeneratorDialog, DistributionChanged, ListBox&, vo
case DIST_BINOMIAL:
case DIST_NEGATIVE_BINOMIAL:
{
- mpParameter1Text->SetText(SC_RESSTR(STR_RNG_PARAMETER_STANDARD_PROBABILITY));
+ mpParameter1Text->SetText(ScResId(STR_RNG_PARAMETER_STANDARD_PROBABILITY));
mpParameter1Value->SetMin( 0 );
mpParameter1Value->SetMax( PERCISION );
mpParameter1Value->SetSpinSize(1000);
- mpParameter2Text->SetText(SC_RESSTR(STR_RNG_PARAMETER_STANDARD_NUMBER_OF_TRIALS));
+ mpParameter2Text->SetText(ScResId(STR_RNG_PARAMETER_STANDARD_NUMBER_OF_TRIALS));
mpParameter2Value->SetDecimalDigits(0);
mpParameter2Value->SetSpinSize(1);
mpParameter2Value->SetMin(0);
@@ -502,7 +502,7 @@ IMPL_LINK_NOARG(ScRandomNumberGeneratorDialog, DistributionChanged, ListBox&, vo
}
case DIST_CHI_SQUARED:
{
- mpParameter1Text->SetText(SC_RESSTR(STR_RNG_PARAMETER_STANDARD_NU_VALUE));
+ mpParameter1Text->SetText(ScResId(STR_RNG_PARAMETER_STANDARD_NU_VALUE));
mpParameter2Text->Hide();
mpParameter2Value->Hide();
diff --git a/sc/source/ui/StatisticsDialogs/RegressionDialog.cxx b/sc/source/ui/StatisticsDialogs/RegressionDialog.cxx
index 272b4b541c1f..6950c8dea61f 100644
--- a/sc/source/ui/StatisticsDialogs/RegressionDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/RegressionDialog.cxx
@@ -128,31 +128,31 @@ ScRange ScRegressionDialog::ApplyOutput(ScDocShell* pDocShell)
aTemplate.autoReplaceRange("%VARIABLE1_RANGE%", pVariable1Iterator->get());
aTemplate.autoReplaceRange("%VARIABLE2_RANGE%", pVariable2Iterator->get());
- aOutput.writeBoldString(SC_RESSTR(STR_REGRESSION));
+ aOutput.writeBoldString(ScResId(STR_REGRESSION));
aOutput.newLine();
aOutput.newLine();
aOutput.push();
// REGRESSION MODEL
- aOutput.writeString(SC_RESSTR(STR_LABEL_REGRESSION_MODEL));
+ aOutput.writeString(ScResId(STR_LABEL_REGRESSION_MODEL));
aOutput.nextRow();
// RSQUARED
- aOutput.writeString(SC_RESSTR(STR_LABEL_RSQUARED));
+ aOutput.writeString(ScResId(STR_LABEL_RSQUARED));
aOutput.nextRow();
// Standard Error
- aOutput.writeString(SC_RESSTR(STRID_CALC_STD_ERROR));
+ aOutput.writeString(ScResId(STRID_CALC_STD_ERROR));
aOutput.nextRow();
aOutput.nextRow();
// Slope
- aOutput.writeString(SC_RESSTR(STR_LABEL_SLOPE));
+ aOutput.writeString(ScResId(STR_LABEL_SLOPE));
aOutput.nextRow();
// Intercept
- aOutput.writeString(SC_RESSTR(STR_LABEL_INTERCEPT));
+ aOutput.writeString(ScResId(STR_LABEL_INTERCEPT));
aOutput.nextRow();
aOutput.nextRow();
@@ -192,7 +192,7 @@ ScRange ScRegressionDialog::ApplyOutput(ScDocShell* pDocShell)
nColumn += 1;
// REGRESSION MODEL
- aOutput.writeString(SC_RESSTR(constRegressionModel[nRegressionIndex]));
+ aOutput.writeString(ScResId(constRegressionModel[nRegressionIndex]));
aOutput.nextRow();
// RSQUARED
diff --git a/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx b/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx
index dd31179d3bcf..7f683556bb65 100644
--- a/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx
@@ -265,7 +265,7 @@ ScRange ScSamplingDialog::PerformRandomSampling(ScDocShell* pDocShell)
void ScSamplingDialog::PerformSampling()
{
- OUString aUndo(SC_RESSTR(STR_SAMPLING_UNDO_NAME));
+ OUString aUndo(ScResId(STR_SAMPLING_UNDO_NAME));
ScDocShell* pDocShell = mViewData->GetDocShell();
svl::IUndoManager* pUndoManager = pDocShell->GetUndoManager();
diff --git a/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx b/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx
index 5d6025ac7449..ef60c05147e2 100644
--- a/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx
@@ -283,7 +283,7 @@ IMPL_LINK_NOARG( ScStatisticsInputOutputDialog, RefInputModifyHandler, Edit&, vo
void ScStatisticsInputOutputDialog::CalculateInputAndWriteToOutput()
{
- OUString aUndo(SC_RESSTR(GetUndoNameId()));
+ OUString aUndo(ScResId(GetUndoNameId()));
ScDocShell* pDocShell = mViewData->GetDocShell();
svl::IUndoManager* pUndoManager = pDocShell->GetUndoManager();
pUndoManager->EnterListAction( aUndo, aUndo, 0, mViewData->GetViewShell()->GetViewShellId() );
diff --git a/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx b/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx
index 90dcea171573..c66d7173ac84 100644
--- a/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx
@@ -322,7 +322,7 @@ IMPL_LINK_NOARG( ScStatisticsTwoVariableDialog, RefInputModifyHandler, Edit&, vo
void ScStatisticsTwoVariableDialog::CalculateInputAndWriteToOutput()
{
- OUString aUndo(SC_RESSTR(GetUndoNameId()));
+ OUString aUndo(ScResId(GetUndoNameId()));
ScDocShell* pDocShell = mViewData->GetDocShell();
svl::IUndoManager* pUndoManager = pDocShell->GetUndoManager();
pUndoManager->EnterListAction( aUndo, aUndo, 0, mViewData->GetViewShell()->GetViewShellId() );
diff --git a/sc/source/ui/StatisticsDialogs/TTestDialog.cxx b/sc/source/ui/StatisticsDialogs/TTestDialog.cxx
index 8509f72d6226..a94c82943dd6 100644
--- a/sc/source/ui/StatisticsDialogs/TTestDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/TTestDialog.cxx
@@ -32,7 +32,7 @@ ScTTestDialog::ScTTestDialog(
pSfxBindings, pChildWindow, pParent, pViewData,
"TTestDialog", "modules/scalc/ui/ttestdialog.ui" )
{
- SetText(SC_RESSTR(STR_TTEST));
+ SetText(ScResId(STR_TTEST));
}
ScTTestDialog::~ScTTestDialog()
@@ -69,30 +69,30 @@ ScRange ScTTestDialog::ApplyOutput(ScDocShell* pDocShell)
aTemplate.autoReplaceRange("%VARIABLE1_RANGE%", pVariable1Iterator->get());
aTemplate.autoReplaceRange("%VARIABLE2_RANGE%", pVariable2Iterator->get());
- aOutput.writeBoldString(SC_RESSTR(STR_TTEST_UNDO_NAME));
+ aOutput.writeBoldString(ScResId(STR_TTEST_UNDO_NAME));
aOutput.newLine();
// Alpha
- aOutput.writeString(SC_RESSTR(STR_LABEL_ALPHA));
+ aOutput.writeString(ScResId(STR_LABEL_ALPHA));
aOutput.nextColumn();
aOutput.writeValue(0.05);
aTemplate.autoReplaceAddress("%ALPHA%", aOutput.current());
aOutput.newLine();
// Hypothesized mean difference
- aOutput.writeString(SC_RESSTR(STR_HYPOTHESIZED_MEAN_DIFFERENCE_LABEL));
+ aOutput.writeString(ScResId(STR_HYPOTHESIZED_MEAN_DIFFERENCE_LABEL));
aOutput.nextColumn();
aOutput.writeValue(0);
aTemplate.autoReplaceAddress("%HYPOTHESIZED_MEAN_DIFFERENCE%", aOutput.current());
aOutput.newLine();
aOutput.nextColumn();
- aOutput.writeBoldString(SC_RESSTR(STR_VARIABLE_1_LABEL));
+ aOutput.writeBoldString(ScResId(STR_VARIABLE_1_LABEL));
aOutput.nextColumn();
- aOutput.writeBoldString(SC_RESSTR(STR_VARIABLE_2_LABEL));
+ aOutput.writeBoldString(ScResId(STR_VARIABLE_2_LABEL));
aOutput.newLine();
- aOutput.writeString(SC_RESSTR(STRID_CALC_MEAN));
+ aOutput.writeString(ScResId(STRID_CALC_MEAN));
aOutput.nextColumn();
aTemplate.setTemplate("=AVERAGE(%VARIABLE1_RANGE%)");
aOutput.writeFormula(aTemplate.getTemplate());
@@ -101,7 +101,7 @@ ScRange ScTTestDialog::ApplyOutput(ScDocShell* pDocShell)
aOutput.writeFormula(aTemplate.getTemplate());
aOutput.newLine();
- aOutput.writeString(SC_RESSTR(STRID_CALC_VARIANCE));
+ aOutput.writeString(ScResId(STRID_CALC_VARIANCE));
aOutput.nextColumn();
aTemplate.setTemplate("=VAR(%VARIABLE1_RANGE%)");
aOutput.writeFormula(aTemplate.getTemplate());
@@ -111,7 +111,7 @@ ScRange ScTTestDialog::ApplyOutput(ScDocShell* pDocShell)
aOutput.newLine();
// Observations
- aOutput.writeString(SC_RESSTR(STR_OBSERVATIONS_LABEL));
+ aOutput.writeString(ScResId(STR_OBSERVATIONS_LABEL));
aOutput.nextColumn();
aTemplate.setTemplate("=COUNT(%VARIABLE1_RANGE%)");
aOutput.writeFormula(aTemplate.getTemplate());
@@ -121,14 +121,14 @@ ScRange ScTTestDialog::ApplyOutput(ScDocShell* pDocShell)
aOutput.newLine();
// Pearson Correlation
- aOutput.writeString(SC_RESSTR(STR_TTEST_PEARSON_CORRELATION));
+ aOutput.writeString(ScResId(STR_TTEST_PEARSON_CORRELATION));
aOutput.nextColumn();
aTemplate.setTemplate("=CORREL(%VARIABLE1_RANGE%;%VARIABLE2_RANGE%)");
aOutput.writeFormula(aTemplate.getTemplate());
aOutput.newLine();
// Observed mean difference
- aOutput.writeString(SC_RESSTR(STR_OBSERVED_MEAN_DIFFERENCE_LABEL));
+ aOutput.writeString(ScResId(STR_OBSERVED_MEAN_DIFFERENCE_LABEL));
aOutput.nextColumn();
aTemplate.setTemplate("=AVERAGE(IF(ISODD(IF(ISNUMBER(%VARIABLE1_RANGE%); 1; 0) * IF(ISNUMBER(%VARIABLE2_RANGE%); 1; 0)); %VARIABLE1_RANGE% - %VARIABLE2_RANGE%; \"NA\"))");
aOutput.writeMatrixFormula(aTemplate.getTemplate());
@@ -136,7 +136,7 @@ ScRange ScTTestDialog::ApplyOutput(ScDocShell* pDocShell)
aOutput.newLine();
// Variance of the Differences
- aOutput.writeString(SC_RESSTR(STR_TTEST_VARIANCE_OF_THE_DIFFERENCES));
+ aOutput.writeString(ScResId(STR_TTEST_VARIANCE_OF_THE_DIFFERENCES));
aOutput.nextColumn();
aTemplate.setTemplate("=VAR(IF(ISODD(IF(ISNUMBER(%VARIABLE1_RANGE%); 1; 0) * IF(ISNUMBER(%VARIABLE2_RANGE%); 1; 0)); %VARIABLE1_RANGE% - %VARIABLE2_RANGE%; \"NA\"))");
aOutput.writeMatrixFormula(aTemplate.getTemplate());
@@ -144,7 +144,7 @@ ScRange ScTTestDialog::ApplyOutput(ScDocShell* pDocShell)
aOutput.newLine();
// df
- aOutput.writeString(SC_RESSTR(STR_ANOVA_LABEL_DF));
+ aOutput.writeString(ScResId(STR_ANOVA_LABEL_DF));
aOutput.nextColumn();
aTemplate.setTemplate("=SUM(IF(ISNUMBER(%VARIABLE1_RANGE%); 1; 0) * IF(ISNUMBER(%VARIABLE2_RANGE%); 1; 0)) - 1");
aOutput.writeMatrixFormula(aTemplate.getTemplate());
@@ -152,7 +152,7 @@ ScRange ScTTestDialog::ApplyOutput(ScDocShell* pDocShell)
aOutput.newLine();
// t stat
- aOutput.writeString(SC_RESSTR(STR_TTEST_T_STAT));
+ aOutput.writeString(ScResId(STR_TTEST_T_STAT));
aOutput.nextColumn();
aTemplate.setTemplate("=(%OBSERVED_MEAN_DIFFERENCE% - %HYPOTHESIZED_MEAN_DIFFERENCE%) / (%VARIANCE_OF_DIFFERENCES% / ( %DEGREE_OF_FREEDOM% + 1)) ^ 0.5");
aOutput.writeFormula(aTemplate.getTemplate());
@@ -160,28 +160,28 @@ ScRange ScTTestDialog::ApplyOutput(ScDocShell* pDocShell)
aOutput.newLine();
// P one-tail
- aOutput.writeString(SC_RESSTR(STR_TTEST_P_ONE_TAIL));
+ aOutput.writeString(ScResId(STR_TTEST_P_ONE_TAIL));
aOutput.nextColumn();
aTemplate.setTemplate("=TDIST(ABS(%T_STAT%); %DEGREE_OF_FREEDOM%; 1)");
aOutput.writeFormula(aTemplate.getTemplate());
aOutput.newLine();
// T critical one-tail
- aOutput.writeString(SC_RESSTR(STR_TTEST_T_CRITICAL_ONE_TAIL));
+ aOutput.writeString(ScResId(STR_TTEST_T_CRITICAL_ONE_TAIL));
aOutput.nextColumn();
aTemplate.setTemplate("=TINV(2*%ALPHA%; %DEGREE_OF_FREEDOM%)");
aOutput.writeFormula(aTemplate.getTemplate());
aOutput.newLine();
// P two-tail
- aOutput.writeString(SC_RESSTR(STR_TTEST_P_TWO_TAIL));
+ aOutput.writeString(ScResId(STR_TTEST_P_TWO_TAIL));
aOutput.nextColumn();
aTemplate.setTemplate("=TDIST(ABS(%T_STAT%); %DEGREE_OF_FREEDOM%; 2)");
aOutput.writeFormula(aTemplate.getTemplate());
aOutput.newLine();
// T critical two-tail
- aOutput.writeString(SC_RESSTR(STR_TTEST_T_CRITICAL_TWO_TAIL));
+ aOutput.writeString(ScResId(STR_TTEST_T_CRITICAL_TWO_TAIL));
aOutput.nextColumn();
aTemplate.setTemplate("=TINV(%ALPHA%; %DEGREE_OF_FREEDOM%)");
aOutput.writeFormula(aTemplate.getTemplate());
diff --git a/sc/source/ui/StatisticsDialogs/ZTestDialog.cxx b/sc/source/ui/StatisticsDialogs/ZTestDialog.cxx
index 91460d3778c7..b7a3f67ebd71 100644
--- a/sc/source/ui/StatisticsDialogs/ZTestDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/ZTestDialog.cxx
@@ -32,7 +32,7 @@ ScZTestDialog::ScZTestDialog(
pSfxBindings, pChildWindow, pParent, pViewData,
"ZTestDialog", "modules/scalc/ui/ztestdialog.ui" )
{
- SetText(SC_RESSTR(STR_ZTEST));
+ SetText(ScResId(STR_ZTEST));
}
ScZTestDialog::~ScZTestDialog()
@@ -69,18 +69,18 @@ ScRange ScZTestDialog::ApplyOutput(ScDocShell* pDocShell)
aTemplate.autoReplaceRange("%VARIABLE1_RANGE%", pVariable1Iterator->get());
aTemplate.autoReplaceRange("%VARIABLE2_RANGE%", pVariable2Iterator->get());
- aOutput.writeBoldString(SC_RESSTR(STR_ZTEST));
+ aOutput.writeBoldString(ScResId(STR_ZTEST));
aOutput.newLine();
// Alpha
- aOutput.writeString(SC_RESSTR(STR_LABEL_ALPHA));
+ aOutput.writeString(ScResId(STR_LABEL_ALPHA));
aOutput.nextColumn();
aOutput.writeValue(0.05);
aTemplate.autoReplaceAddress("%ALPHA%", aOutput.current());
aOutput.newLine();
// Hypothesized mean difference
- aOutput.writeString(SC_RESSTR(STR_HYPOTHESIZED_MEAN_DIFFERENCE_LABEL));
+ aOutput.writeString(ScResId(STR_HYPOTHESIZED_MEAN_DIFFERENCE_LABEL));
aOutput.nextColumn();
aOutput.writeValue(0);
aTemplate.autoReplaceAddress("%HYPOTHESIZED_MEAN_DIFFERENCE%", aOutput.current());
@@ -88,13 +88,13 @@ ScRange ScZTestDialog::ApplyOutput(ScDocShell* pDocShell)
// Variable Label
aOutput.nextColumn();
- aOutput.writeBoldString(SC_RESSTR(STR_VARIABLE_1_LABEL));
+ aOutput.writeBoldString(ScResId(STR_VARIABLE_1_LABEL));
aOutput.nextColumn();
- aOutput.writeBoldString(SC_RESSTR(STR_VARIABLE_2_LABEL));
+ aOutput.writeBoldString(ScResId(STR_VARIABLE_2_LABEL));
aOutput.newLine();
// Known Variance
- aOutput.writeString(SC_RESSTR(STR_ZTEST_KNOWN_VARIANCE));
+ aOutput.writeString(ScResId(STR_ZTEST_KNOWN_VARIANCE));
aOutput.nextColumn();
aOutput.writeValue(0);
aTemplate.autoReplaceAddress("%KNOWN_VARIANCE_VARIABLE1%", aOutput.current());
@@ -104,7 +104,7 @@ ScRange ScZTestDialog::ApplyOutput(ScDocShell* pDocShell)
aOutput.newLine();
// Mean
- aOutput.writeString(SC_RESSTR(STRID_CALC_MEAN));
+ aOutput.writeString(ScResId(STRID_CALC_MEAN));
aOutput.nextColumn();
aTemplate.setTemplate("=AVERAGE(%VARIABLE1_RANGE%)");
aTemplate.autoReplaceAddress("%MEAN_VARIABLE1%", aOutput.current());
@@ -116,7 +116,7 @@ ScRange ScZTestDialog::ApplyOutput(ScDocShell* pDocShell)
aOutput.newLine();
// Observations
- aOutput.writeString(SC_RESSTR(STR_OBSERVATIONS_LABEL));
+ aOutput.writeString(ScResId(STR_OBSERVATIONS_LABEL));
aOutput.nextColumn();
aTemplate.setTemplate("=COUNT(%VARIABLE1_RANGE%)");
aOutput.writeFormula(aTemplate.getTemplate());
@@ -128,7 +128,7 @@ ScRange ScZTestDialog::ApplyOutput(ScDocShell* pDocShell)
aOutput.newLine();
// Observed mean difference
- aOutput.writeString(SC_RESSTR(STR_OBSERVED_MEAN_DIFFERENCE_LABEL));
+ aOutput.writeString(ScResId(STR_OBSERVED_MEAN_DIFFERENCE_LABEL));
aOutput.nextColumn();
aTemplate.setTemplate("=%MEAN_VARIABLE1% - %MEAN_VARIABLE2%");
aOutput.writeMatrixFormula(aTemplate.getTemplate());
@@ -136,7 +136,7 @@ ScRange ScZTestDialog::ApplyOutput(ScDocShell* pDocShell)
aOutput.newLine();
// z
- aOutput.writeString(SC_RESSTR(STR_ZTEST_Z_VALUE));
+ aOutput.writeString(ScResId(STR_ZTEST_Z_VALUE));
aOutput.nextColumn();
aTemplate.setTemplate("=(%OBSERVED_MEAN_DIFFERENCE% - %HYPOTHESIZED_MEAN_DIFFERENCE%) / SQRT( %KNOWN_VARIANCE_VARIABLE1% / %OBSERVATION_VARIABLE1% + %KNOWN_VARIANCE_VARIABLE2% / %OBSERVATION_VARIABLE2% )");
aOutput.writeFormula(aTemplate.getTemplate());
@@ -144,28 +144,28 @@ ScRange ScZTestDialog::ApplyOutput(ScDocShell* pDocShell)
aOutput.newLine();
// P one-tail
- aOutput.writeString(SC_RESSTR(STR_ZTEST_P_ONE_TAIL));
+ aOutput.writeString(ScResId(STR_ZTEST_P_ONE_TAIL));
aOutput.nextColumn();
aTemplate.setTemplate("=1 - NORMSDIST(ABS(%Z_STAT%))");
aOutput.writeFormula(aTemplate.getTemplate());
aOutput.newLine();
// z critical one-tail
- aOutput.writeString(SC_RESSTR(STR_ZTEST_Z_CRITICAL_ONE_TAIL));
+ aOutput.writeString(ScResId(STR_ZTEST_Z_CRITICAL_ONE_TAIL));
aOutput.nextColumn();
aTemplate.setTemplate("=-NORMSINV(%ALPHA%)");
aOutput.writeFormula(aTemplate.getTemplate());
aOutput.newLine();
// P two-tail
- aOutput.writeString(SC_RESSTR(STR_ZTEST_P_TWO_TAIL));
+ aOutput.writeString(ScResId(STR_ZTEST_P_TWO_TAIL));
aOutput.nextColumn();
aTemplate.setTemplate("=2 * NORMSDIST(-ABS(%Z_STAT%))");
aOutput.writeFormula(aTemplate.getTemplate());
aOutput.newLine();
// z critical two-tail
- aOutput.writeString(SC_RESSTR(STR_ZTEST_Z_CRITICAL_TWO_TAIL));
+ aOutput.writeString(ScResId(STR_ZTEST_Z_CRITICAL_TWO_TAIL));
aOutput.nextColumn();
aTemplate.setTemplate("=-NORMSINV(%ALPHA%/2)");
aOutput.writeFormula(aTemplate.getTemplate());
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 15dd433c418a..70957b3aa601 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -1721,8 +1721,8 @@ void ScTextWnd::ImplInitSettings()
css::uno::Reference< css::accessibility::XAccessible > ScTextWnd::CreateAccessible()
{
return new ScAccessibleEditObject(GetAccessibleParentWindow()->GetAccessible(), nullptr, this,
- OUString(ScResId(STR_ACC_EDITLINE_NAME)),
- OUString(ScResId(STR_ACC_EDITLINE_DESCR)), ScAccessibleEditObject::EditLine);
+ ScResId(STR_ACC_EDITLINE_NAME),
+ ScResId(STR_ACC_EDITLINE_DESCR), ScAccessibleEditObject::EditLine);
}
void ScTextWnd::InsertAccessibleTextData( ScAccessibleEditLineTextData& rTextData )
diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx
index 18ec897177fa..d75a481b1a3d 100644
--- a/sc/source/ui/app/scdll.cxx
+++ b/sc/source/ui/app/scdll.cxx
@@ -106,9 +106,9 @@
#include <o3tl/make_unique.hxx>
#include "scabstdlg.hxx"
-ScResId::ScResId( sal_uInt16 nId ) :
- ResId( nId, *SC_MOD()->GetResMgr() )
+OUString ScResId(sal_uInt16 nId)
{
+ return ResId(nId, *SC_MOD()->GetResMgr());
}
void ScDLL::Init()
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index 5778f38725ff..863f328c28e7 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -2283,12 +2283,12 @@ SfxStyleFamilies* ScModule::CreateStyleFamilies()
pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Para,
ScGlobal::GetRscString(STR_STYLE_FAMILY_CELL),
Image(BitmapEx(BMP_STYLES_FAMILY_CELL)),
- ScResId(RID_CELLSTYLEFAMILY)));
+ ResId(RID_CELLSTYLEFAMILY, *SC_MOD()->GetResMgr())));
pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Page,
ScGlobal::GetRscString(STR_STYLE_FAMILY_PAGE),
Image(BitmapEx(BMP_STYLES_FAMILY_PAGE)),
- ScResId(RID_PAGESTYLEFAMILY)));
+ ResId(RID_PAGESTYLEFAMILY, *SC_MOD()->GetResMgr())));
return pStyleFamilies;
}
diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx
index 347021ca3757..d3ed848145da 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -1082,7 +1082,7 @@ void ScCheckListMenuWindow::packWindow()
maEdSearch->SetPosSizePixel(aPos, aSize);
maEdSearch->SetFont(getLabelFont());
maEdSearch->SetControlBackground(rStyle.GetFieldColor());
- maEdSearch->SetPlaceholderText(SC_RESSTR(STR_EDIT_SEARCH_ITEMS));
+ maEdSearch->SetPlaceholderText(ScResId(STR_EDIT_SEARCH_ITEMS));
maEdSearch->SetModifyHdl( LINK(this, ScCheckListMenuWindow, EdModifyHdl) );
maEdSearch->Show();
@@ -1095,7 +1095,7 @@ void ScCheckListMenuWindow::packWindow()
getSectionPosSize(aPos, aSize, CHECK_TOGGLE_ALL);
maChkToggleAll->SetPosSizePixel(aPos, aSize);
maChkToggleAll->SetFont(getLabelFont());
- maChkToggleAll->SetText(SC_RESSTR(STR_BTN_TOGGLE_ALL));
+ maChkToggleAll->SetText(ScResId(STR_BTN_TOGGLE_ALL));
maChkToggleAll->SetTextColor(rStyle.GetMenuTextColor());
maChkToggleAll->SetControlBackground(rStyle.GetMenuColor());
maChkToggleAll->SetClickHdl( LINK(this, ScCheckListMenuWindow, TriStateHdl) );
@@ -1110,7 +1110,7 @@ void ScCheckListMenuWindow::packWindow()
getSectionPosSize(aPos, aSize, BTN_SINGLE_SELECT);
maBtnSelectSingle->SetPosSizePixel(aPos, aSize);
- maBtnSelectSingle->SetQuickHelpText(SC_RESSTR(STR_BTN_SELECT_CURRENT));
+ maBtnSelectSingle->SetQuickHelpText(ScResId(STR_BTN_SELECT_CURRENT));
maBtnSelectSingle->SetModeImage(aSingleSelect);
maBtnSelectSingle->SetClickHdl( LINK(this, ScCheckListMenuWindow, ButtonHdl) );
maBtnSelectSingle->Show();
@@ -1122,7 +1122,7 @@ void ScCheckListMenuWindow::packWindow()
getSectionPosSize(aPos, aSize, BTN_SINGLE_UNSELECT);
maBtnUnselectSingle->SetPosSizePixel(aPos, aSize);
- maBtnUnselectSingle->SetQuickHelpText(SC_RESSTR(STR_BTN_UNSELECT_CURRENT));
+ maBtnUnselectSingle->SetQuickHelpText(ScResId(STR_BTN_UNSELECT_CURRENT));
maBtnUnselectSingle->SetModeImage(aSingleUnselect);
maBtnUnselectSingle->SetClickHdl( LINK(this, ScCheckListMenuWindow, ButtonHdl) );
maBtnUnselectSingle->Show();
diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx
index 241838ef171d..d52452b6391c 100644
--- a/sc/source/ui/condformat/condformatdlgentry.cxx
+++ b/sc/source/ui/condformat/condformatdlgentry.cxx
@@ -42,7 +42,7 @@ ScCondFrmtEntry::ScCondFrmtEntry(vcl::Window* pParent, ScDocument* pDoc, const S
: VclContainer(pParent, WB_CLIPCHILDREN | WB_BORDER)
, mbActive(false)
, mnIndex(0)
- , maStrCondition(ScResId(SCSTR_CONDITION).toString())
+ , maStrCondition(ScResId(SCSTR_CONDITION))
, mpDoc(pDoc)
, maPos(rPos)
{
diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx
index 69dfa163c1b6..6ce9b10bed84 100644
--- a/sc/source/ui/dbgui/filtdlg.cxx
+++ b/sc/source/ui/dbgui/filtdlg.cxx
@@ -52,11 +52,11 @@ ScFilterDlg::ScFilterDlg(SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pPar
const SfxItemSet& rArgSet)
: ScAnyRefDlg ( pB, pCW, pParent, "StandardFilterDialog",
"modules/scalc/ui/standardfilterdialog.ui" )
- , aStrUndefined(SC_RESSTR(SCSTR_UNDEFINED))
- , aStrNone(SC_RESSTR(SCSTR_NONE))
- , aStrEmpty(SC_RESSTR(SCSTR_FILTER_EMPTY))
- , aStrNotEmpty(SC_RESSTR(SCSTR_FILTER_NOTEMPTY))
- , aStrColumn(SC_RESSTR(SCSTR_COLUMN))
+ , aStrUndefined(ScResId(SCSTR_UNDEFINED))
+ , aStrNone(ScResId(SCSTR_NONE))
+ , aStrEmpty(ScResId(SCSTR_FILTER_EMPTY))
+ , aStrNotEmpty(ScResId(SCSTR_FILTER_NOTEMPTY))
+ , aStrColumn(ScResId(SCSTR_COLUMN))
, pOptionsMgr(nullptr)
, nWhichQuery(rArgSet.GetPool()->GetWhich(SID_QUERY))
, theQueryData(static_cast<const ScQueryItem&>(rArgSet.Get(nWhichQuery)).GetQueryData())
diff --git a/sc/source/ui/dbgui/pfiltdlg.cxx b/sc/source/ui/dbgui/pfiltdlg.cxx
index e0f0e9ec3b06..209b7ceed17f 100644
--- a/sc/source/ui/dbgui/pfiltdlg.cxx
+++ b/sc/source/ui/dbgui/pfiltdlg.cxx
@@ -44,10 +44,10 @@ ScPivotFilterDlg::ScPivotFilterDlg(vcl::Window* pParent, const SfxItemSet& rArgS
"modules/scalc/ui/pivotfilterdialog.ui" )
,
- aStrNone ( SC_RESSTR(SCSTR_NONE) ),
- aStrEmpty ( SC_RESSTR(SCSTR_FILTER_EMPTY) ),
- aStrNotEmpty ( SC_RESSTR(SCSTR_FILTER_NOTEMPTY) ),
- aStrColumn ( SC_RESSTR(SCSTR_COLUMN) ),
+ aStrNone ( ScResId(SCSTR_NONE) ),
+ aStrEmpty ( ScResId(SCSTR_FILTER_EMPTY) ),
+ aStrNotEmpty ( ScResId(SCSTR_FILTER_NOTEMPTY) ),
+ aStrColumn ( ScResId(SCSTR_COLUMN) ),
nWhichQuery ( rArgSet.GetPool()->GetWhich( SID_QUERY ) ),
theQueryData ( static_cast<const ScQueryItem&>(
diff --git a/sc/source/ui/dbgui/pvfundlg.cxx b/sc/source/ui/dbgui/pvfundlg.cxx
index 7bf29db6c805..042ddc4907d3 100644
--- a/sc/source/ui/dbgui/pvfundlg.cxx
+++ b/sc/source/ui/dbgui/pvfundlg.cxx
@@ -35,6 +35,7 @@
#include "dpobject.hxx"
#include "dpsave.hxx"
#include "scres.hrc"
+#include "scmod.hxx"
#include "globstr.hrc"
#include "dputil.hxx"
@@ -180,7 +181,7 @@ void ScDPFunctionListBox::FillFunctionNames()
{
OSL_ENSURE( !GetEntryCount(), "ScDPMultiFuncListBox::FillFunctionNames - do not add texts to resource" );
Clear();
- ResStringArray aArr( ScResId( SCSTR_DPFUNCLISTBOX ) );
+ ResStringArray aArr(ResId(SCSTR_DPFUNCLISTBOX, *SC_MOD()->GetResMgr()));
for( sal_uInt16 nIndex = 0, nCount = sal::static_int_cast<sal_uInt16>(aArr.Count()); nIndex < nCount; ++nIndex )
InsertEntry( aArr.GetString( nIndex ) );
assert(GetEntryCount() == SAL_N_ELEMENTS(spnFunctions));
diff --git a/sc/source/ui/dbgui/scuiimoptdlg.cxx b/sc/source/ui/dbgui/scuiimoptdlg.cxx
index dbd9132c6a59..cb45ed52b803 100644
--- a/sc/source/ui/dbgui/scuiimoptdlg.cxx
+++ b/sc/source/ui/dbgui/scuiimoptdlg.cxx
@@ -135,8 +135,8 @@ ScImportOptionsDlg::ScImportOptionsDlg(
get(m_pBtnOk, "ok");
OUString sFieldSep(SCSTR_FIELDSEP);
- sFieldSep = sFieldSep.replaceFirst( "%TAB", SC_RESSTR(SCSTR_FIELDSEP_TAB) );
- sFieldSep = sFieldSep.replaceFirst( "%SPACE", SC_RESSTR(SCSTR_FIELDSEP_SPACE) );
+ sFieldSep = sFieldSep.replaceFirst( "%TAB", ScResId(SCSTR_FIELDSEP_TAB) );
+ sFieldSep = sFieldSep.replaceFirst( "%SPACE", ScResId(SCSTR_FIELDSEP_SPACE) );
// not possible in the Ctor initializer (MSC cannot do that):
pFieldSepTab = new ScDelimiterTable(sFieldSep);
diff --git a/sc/source/ui/dbgui/sfiltdlg.cxx b/sc/source/ui/dbgui/sfiltdlg.cxx
index be4c9a06cd91..59a7caceb59c 100644
--- a/sc/source/ui/dbgui/sfiltdlg.cxx
+++ b/sc/source/ui/dbgui/sfiltdlg.cxx
@@ -47,7 +47,7 @@ ScSpecialFilterDlg::ScSpecialFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, vc
: ScAnyRefDlg ( pB, pCW, pParent, "AdvancedFilterDialog", "modules/scalc/ui/advancedfilterdialog.ui" ),
- aStrUndefined ( SC_RESSTR(SCSTR_UNDEFINED) ),
+ aStrUndefined ( ScResId(SCSTR_UNDEFINED) ),
pOptionsMgr ( nullptr ),
nWhichQuery ( rArgSet.GetPool()->GetWhich( SID_QUERY ) ),
theQueryData ( static_cast<const ScQueryItem&>(
diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx
index 78bfa428a6b1..3ee1093e18a3 100644
--- a/sc/source/ui/dbgui/tpsort.cxx
+++ b/sc/source/ui/dbgui/tpsort.cxx
@@ -73,9 +73,9 @@ ScTabPageSortFields::ScTabPageSortFields(vcl::Window* pParent,
"modules/scalc/ui/sortcriteriapage.ui", &rArgSet)
,
- aStrUndefined ( SC_RESSTR( SCSTR_UNDEFINED ) ),
- aStrColumn ( SC_RESSTR( SCSTR_COLUMN ) ),
- aStrRow ( SC_RESSTR( SCSTR_ROW ) ),
+ aStrUndefined ( ScResId( SCSTR_UNDEFINED ) ),
+ aStrColumn ( ScResId( SCSTR_COLUMN ) ),
+ aStrRow ( ScResId( SCSTR_ROW ) ),
nWhichSort ( rArgSet.GetPool()->GetWhich( SID_SORT ) ),
pDlg ( static_cast<ScSortDlg*>(GetParentDialog()) ),
@@ -488,9 +488,9 @@ ScTabPageSortOptions::ScTabPageSortOptions( vcl::Window* pParent,
const SfxItemSet& rArgSet )
: SfxTabPage(pParent, "SortOptionsPage",
"modules/scalc/ui/sortoptionspage.ui", &rArgSet)
- , aStrRowLabel(SC_RESSTR(SCSTR_ROW_LABEL))
- , aStrColLabel(SC_RESSTR(SCSTR_COL_LABEL))
- , aStrUndefined(SC_RESSTR(SCSTR_UNDEFINED))
+ , aStrRowLabel(ScResId(SCSTR_ROW_LABEL))
+ , aStrColLabel(ScResId(SCSTR_COL_LABEL))
+ , aStrUndefined(ScResId(SCSTR_UNDEFINED))
, nWhichSort(rArgSet.GetPool()->GetWhich(SID_SORT))
, aSortData(static_cast<const ScSortItem&>(rArgSet.Get(nWhichSort)).GetSortData())
, pViewData(nullptr)
diff --git a/sc/source/ui/dbgui/tpsubt.cxx b/sc/source/ui/dbgui/tpsubt.cxx
index 5771d16e4d13..0d3b1e1747b9 100644
--- a/sc/source/ui/dbgui/tpsubt.cxx
+++ b/sc/source/ui/dbgui/tpsubt.cxx
@@ -39,8 +39,8 @@ ScTpSubTotalGroup::ScTpSubTotalGroup( vcl::Window* pParent,
: SfxTabPage ( pParent,
"SubTotalGrpPage", "modules/scalc/ui/subtotalgrppage.ui",
&rArgSet ),
- aStrNone ( SC_RESSTR( SCSTR_NONE ) ),
- aStrColumn ( SC_RESSTR( SCSTR_COLUMN ) ),
+ aStrNone ( ScResId( SCSTR_NONE ) ),
+ aStrColumn ( ScResId( SCSTR_COLUMN ) ),
pViewData ( nullptr ),
pDoc ( nullptr ),
nWhichSubTotals ( rArgSet.GetPool()->GetWhich( SID_SUBTOTALS ) ),
diff --git a/sc/source/ui/dialogs/searchresults.cxx b/sc/source/ui/dialogs/searchresults.cxx
index 4f8e65a71b75..d0f343035a72 100644
--- a/sc/source/ui/dialogs/searchresults.cxx
+++ b/sc/source/ui/dialogs/searchresults.cxx
@@ -37,7 +37,7 @@ SearchResultsDlg::SearchResultsDlg( SfxBindings* _pBindings, vcl::Window* pParen
mpList = VclPtr<SvSimpleTable>::Create(*pContainer);
long nTabs[] = {3, 0, 40, 60};
mpList->SetTabs(&nTabs[0]);
- mpList->InsertHeaderEntry(SC_RESSTR(STR_SHEET) + "\t" + SC_RESSTR(STR_CELL) + "\t" + SC_RESSTR(STR_CONTENT));
+ mpList->InsertHeaderEntry(ScResId(STR_SHEET) + "\t" + ScResId(STR_CELL) + "\t" + ScResId(STR_CONTENT));
mpList->SetSelectHdl( LINK(this, SearchResultsDlg, ListSelectHdl) );
}
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index c1097630d48b..77db8cd073f4 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -194,7 +194,7 @@ void ScDocShell::FillClass( SvGlobalName* pClassName,
*pClassName = SvGlobalName( SO3_SC_CLASSID_60 );
*pFormat = bTemplate ? SotClipboardFormatId::STARCALC_8_TEMPLATE : SotClipboardFormatId::STARCALC_8;
*pFullTypeName = "calc8";
- *pShortTypeName = ScResId(SCSTR_SHORT_SCDOC_NAME).toString();
+ *pShortTypeName = ScResId(SCSTR_SHORT_SCDOC_NAME);
}
else
{
diff --git a/sc/source/ui/docshell/documentlinkmgr.cxx b/sc/source/ui/docshell/documentlinkmgr.cxx
index 71b7fba56d3b..cdabc4674044 100644
--- a/sc/source/ui/docshell/documentlinkmgr.cxx
+++ b/sc/source/ui/docshell/documentlinkmgr.cxx
@@ -177,7 +177,7 @@ bool DocumentLinkManager::updateDdeOrOleLinks( vcl::Window* pWin )
OUString aType = pDdeLink->GetAppl();
OUStringBuffer aBuf;
- aBuf.append(OUString(ScResId(SCSTR_DDEDOC_NOT_LOADED)));
+ aBuf.append(ScResId(SCSTR_DDEDOC_NOT_LOADED));
aBuf.append("\n\n");
aBuf.append("Source : ");
aBuf.append(aFile);
diff --git a/sc/source/ui/drawfunc/fuconrec.cxx b/sc/source/ui/drawfunc/fuconrec.cxx
index d9e476260573..3e0742bc5c6f 100644
--- a/sc/source/ui/drawfunc/fuconrec.cxx
+++ b/sc/source/ui/drawfunc/fuconrec.cxx
@@ -64,7 +64,7 @@ namespace {
if( pLineEndList.is() )
{
- OUString aArrowName( SVX_RES(nResId) );
+ OUString aArrowName( SvxResId(nResId) );
long nCount = pLineEndList->Count();
long nIndex;
for( nIndex = 0L; nIndex < nCount; nIndex++ )
@@ -279,9 +279,9 @@ void FuConstRectangle::SetLineEnds(SfxItemSet& rAttr, SdrObject* pObj, sal_uInt1
case SID_LINE_ARROWS:
{
// connector with arrow ends
- rAttr.Put(XLineStartItem(SVX_RESSTR(RID_SVXSTR_ARROW), aArrow));
+ rAttr.Put(XLineStartItem(SvxResId(RID_SVXSTR_ARROW), aArrow));
rAttr.Put(XLineStartWidthItem(nWidth));
- rAttr.Put(XLineEndItem(SVX_RESSTR(RID_SVXSTR_ARROW), aArrow));
+ rAttr.Put(XLineEndItem(SvxResId(RID_SVXSTR_ARROW), aArrow));
rAttr.Put(XLineEndWidthItem(nWidth));
}
break;
@@ -291,7 +291,7 @@ void FuConstRectangle::SetLineEnds(SfxItemSet& rAttr, SdrObject* pObj, sal_uInt1
case SID_LINE_ARROW_SQUARE:
{
// connector with arrow start
- rAttr.Put(XLineStartItem(SVX_RESSTR(RID_SVXSTR_ARROW), aArrow));
+ rAttr.Put(XLineStartItem(SvxResId(RID_SVXSTR_ARROW), aArrow));
rAttr.Put(XLineStartWidthItem(nWidth));
}
break;
@@ -301,7 +301,7 @@ void FuConstRectangle::SetLineEnds(SfxItemSet& rAttr, SdrObject* pObj, sal_uInt1
case SID_LINE_SQUARE_ARROW:
{
// connector with arrow end
- rAttr.Put(XLineEndItem(SVX_RESSTR(RID_SVXSTR_ARROW), aArrow));
+ rAttr.Put(XLineEndItem(SvxResId(RID_SVXSTR_ARROW), aArrow));
rAttr.Put(XLineEndWidthItem(nWidth));
}
break;
@@ -313,7 +313,7 @@ void FuConstRectangle::SetLineEnds(SfxItemSet& rAttr, SdrObject* pObj, sal_uInt1
case SID_LINE_ARROW_CIRCLE:
{
// circle end
- rAttr.Put(XLineEndItem(SVX_RESSTR(RID_SVXSTR_CIRCLE), aCircle));
+ rAttr.Put(XLineEndItem(SvxResId(RID_SVXSTR_CIRCLE), aCircle));
rAttr.Put(XLineEndWidthItem(nWidth));
}
break;
@@ -321,7 +321,7 @@ void FuConstRectangle::SetLineEnds(SfxItemSet& rAttr, SdrObject* pObj, sal_uInt1
case SID_LINE_CIRCLE_ARROW:
{
// circle start
- rAttr.Put(XLineStartItem(SVX_RESSTR(RID_SVXSTR_CIRCLE), aCircle));
+ rAttr.Put(XLineStartItem(SvxResId(RID_SVXSTR_CIRCLE), aCircle));
rAttr.Put(XLineStartWidthItem(nWidth));
}
break;
@@ -329,7 +329,7 @@ void FuConstRectangle::SetLineEnds(SfxItemSet& rAttr, SdrObject* pObj, sal_uInt1
case SID_LINE_ARROW_SQUARE:
{
// square end
- rAttr.Put(XLineEndItem(SVX_RESSTR(RID_SVXSTR_SQUARE), aSquare));
+ rAttr.Put(XLineEndItem(SvxResId(RID_SVXSTR_SQUARE), aSquare));
rAttr.Put(XLineEndWidthItem(nWidth));
}
break;
@@ -337,7 +337,7 @@ void FuConstRectangle::SetLineEnds(SfxItemSet& rAttr, SdrObject* pObj, sal_uInt1
case SID_LINE_SQUARE_ARROW:
{
// square start
- rAttr.Put(XLineStartItem(SVX_RESSTR(RID_SVXSTR_SQUARE), aSquare));
+ rAttr.Put(XLineStartItem(SvxResId(RID_SVXSTR_SQUARE), aSquare));
rAttr.Put(XLineStartWidthItem(nWidth));
}
break;
diff --git a/sc/source/ui/drawfunc/graphsh.cxx b/sc/source/ui/drawfunc/graphsh.cxx
index 7077711154fa..9c1dfe325e49 100644
--- a/sc/source/ui/drawfunc/graphsh.cxx
+++ b/sc/source/ui/drawfunc/graphsh.cxx
@@ -123,7 +123,7 @@ void ScGraphicShell::ExecuteFilter( SfxRequest& rReq )
if( pPageView )
{
SdrGrafObj* pFilteredObj = static_cast<SdrGrafObj*>(pObj->Clone());
- OUString aStr = pView->GetDescriptionOfMarkedObjects() + " " + OUString(ScResId( SCSTR_UNDO_GRAFFILTER ));
+ OUString aStr = pView->GetDescriptionOfMarkedObjects() + " " + ScResId(SCSTR_UNDO_GRAFFILTER);
pView->BegUndo( aStr );
pFilteredObj->SetGraphicObject( aFilterObj );
pView->ReplaceObjectAtView( pObj, *pPageView, pFilteredObj );
diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx
index 996f0719c2d7..e7f2c3964722 100644
--- a/sc/source/ui/miscdlgs/acredlin.cxx
+++ b/sc/source/ui/miscdlgs/acredlin.cxx
@@ -81,22 +81,22 @@ ScAcceptChgDlg::ScAcceptChgDlg(SfxBindings* pB, SfxChildWindow* pCW, vcl::Window
m_xPopup(get_menu("calcmenu")),
pViewData ( ptrViewData ),
pDoc ( ptrViewData->GetDocument() ),
- aStrInsertCols (SC_RESSTR(STR_CHG_INSERT_COLS)),
- aStrInsertRows (SC_RESSTR(STR_CHG_INSERT_ROWS)),
- aStrInsertTabs (SC_RESSTR(STR_CHG_INSERT_TABS)),
- aStrDeleteCols (SC_RESSTR(STR_CHG_DELETE_COLS)),
- aStrDeleteRows (SC_RESSTR(STR_CHG_DELETE_ROWS)),
- aStrDeleteTabs (SC_RESSTR(STR_CHG_DELETE_TABS)),
- aStrMove (SC_RESSTR(STR_CHG_MOVE)),
- aStrContent (SC_RESSTR(STR_CHG_CONTENT)),
- aStrReject (SC_RESSTR(STR_CHG_REJECT)),
- aStrAllAccepted (SC_RESSTR(STR_CHG_ACCEPTED)),
- aStrAllRejected (SC_RESSTR(STR_CHG_REJECTED)),
- aStrNoEntry (SC_RESSTR(STR_CHG_NO_ENTRY)),
- aStrContentWithChild (SC_RESSTR(STR_CHG_CONTENT_WITH_CHILD)),
- aStrChildContent (SC_RESSTR(STR_CHG_CHILD_CONTENT)),
- aStrChildOrgContent (SC_RESSTR(STR_CHG_CHILD_ORGCONTENT)),
- aStrEmpty (SC_RESSTR(STR_CHG_EMPTY)),
+ aStrInsertCols (ScResId(STR_CHG_INSERT_COLS)),
+ aStrInsertRows (ScResId(STR_CHG_INSERT_ROWS)),
+ aStrInsertTabs (ScResId(STR_CHG_INSERT_TABS)),
+ aStrDeleteCols (ScResId(STR_CHG_DELETE_COLS)),
+ aStrDeleteRows (ScResId(STR_CHG_DELETE_ROWS)),
+ aStrDeleteTabs (ScResId(STR_CHG_DELETE_TABS)),
+ aStrMove (ScResId(STR_CHG_MOVE)),
+ aStrContent (ScResId(STR_CHG_CONTENT)),
+ aStrReject (ScResId(STR_CHG_REJECT)),
+ aStrAllAccepted (ScResId(STR_CHG_ACCEPTED)),
+ aStrAllRejected (ScResId(STR_CHG_REJECTED)),
+ aStrNoEntry (ScResId(STR_CHG_NO_ENTRY)),
+ aStrContentWithChild (ScResId(STR_CHG_CONTENT_WITH_CHILD)),
+ aStrChildContent (ScResId(STR_CHG_CHILD_CONTENT)),
+ aStrChildOrgContent (ScResId(STR_CHG_CHILD_ORGCONTENT)),
+ aStrEmpty (ScResId(STR_CHG_EMPTY)),
aUnknown("Unknown"),
bAcceptEnableFlag(true),
bRejectEnableFlag(true),
diff --git a/sc/source/ui/miscdlgs/filldlg.cxx b/sc/source/ui/miscdlgs/filldlg.cxx
index 66e47cc3629d..a984cb5a030f 100644
--- a/sc/source/ui/miscdlgs/filldlg.cxx
+++ b/sc/source/ui/miscdlgs/filldlg.cxx
@@ -42,7 +42,7 @@ ScFillSeriesDlg::ScFillSeriesDlg( vcl::Window* pParent,
sal_uInt16 nPossDir )
: ModalDialog(pParent, "FillSeriesDialog", "modules/scalc/ui/filldlg.ui"),
aStartStrVal ( aStartStr),
- aErrMsgInvalidVal( SC_RESSTR(SCSTR_VALERR) ),
+ aErrMsgInvalidVal( ScResId(SCSTR_VALERR) ),
rDoc ( rDocument ),
theFillDir ( eFillDir ),
theFillCmd ( eFillCmd ),
diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx
index ca1e861c738e..9b2819281c02 100644
--- a/sc/source/ui/navipi/navipi.cxx
+++ b/sc/source/ui/navipi/navipi.cxx
@@ -500,9 +500,9 @@ ScNavigatorDlg::ScNavigatorDlg(SfxBindings* pB, vcl::Window* pParent)
aTbxCmd->SetLineCount(2);
aLbDocuments->SetDropDownLineCount(9);
aLbDocuments->SetSelectHdl(LINK(this, ScNavigatorDlg, DocumentSelectHdl));
- aStrActive = " (" + OUString(ScResId(SCSTR_ACTIVE)) + ")"; // " (active)"
- aStrNotActive = " (" + OUString(ScResId(SCSTR_NOTACTIVE)) + ")"; // " (not active)"
- aStrHidden = " (" + OUString(ScResId(SCSTR_HIDDEN)) + ")"; // " (hidden)"
+ aStrActive = " (" + ScResId(SCSTR_ACTIVE) + ")"; // " (active)"
+ aStrNotActive = " (" + ScResId(SCSTR_NOTACTIVE) + ")"; // " (not active)"
+ aStrHidden = " (" + ScResId(SCSTR_HIDDEN) + ")"; // " (hidden)"
aTitleBase = GetText();
diff --git a/sc/source/ui/optdlg/tpformula.cxx b/sc/source/ui/optdlg/tpformula.cxx
index dd047ff813ff..376a22681259 100644
--- a/sc/source/ui/optdlg/tpformula.cxx
+++ b/sc/source/ui/optdlg/tpformula.cxx
@@ -49,9 +49,9 @@ ScTpFormulaOptions::ScTpFormulaOptions(vcl::Window* pParent, const SfxItemSet& r
get(mpLbOOXMLRecalcOptions, "ooxmlrecalc");
get(mpLbODFRecalcOptions, "odfrecalc");
- mpLbFormulaSyntax->InsertEntry(ScResId(SCSTR_FORMULA_SYNTAX_CALC_A1).toString());
- mpLbFormulaSyntax->InsertEntry(ScResId(SCSTR_FORMULA_SYNTAX_XL_A1).toString());
- mpLbFormulaSyntax->InsertEntry(ScResId(SCSTR_FORMULA_SYNTAX_XL_R1C1).toString());
+ mpLbFormulaSyntax->InsertEntry(ScResId(SCSTR_FORMULA_SYNTAX_CALC_A1));
+ mpLbFormulaSyntax->InsertEntry(ScResId(SCSTR_FORMULA_SYNTAX_XL_A1));
+ mpLbFormulaSyntax->InsertEntry(ScResId(SCSTR_FORMULA_SYNTAX_XL_R1C1));
Link<Button*,void> aLink2 = LINK( this, ScTpFormulaOptions, ButtonHdl );
mpBtnSepReset->SetClickHdl(aLink2);
diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx
index 38aa83ea6f4d..bf47a82f5b62 100644
--- a/sc/source/ui/optdlg/tpview.cxx
+++ b/sc/source/ui/optdlg/tpview.cxx
@@ -329,7 +329,7 @@ ScTpLayoutOptions::ScTpLayoutOptions( vcl::Window* pParent,
const SfxItemSet& rArgSet ) :
SfxTabPage( pParent, "ScGeneralPage",
"modules/scalc/ui/scgeneralpage.ui", &rArgSet),
- aUnitArr( ScResId(SCSTR_UNIT )),
+ aUnitArr(ResId(SCSTR_UNIT, *SC_MOD()->GetResMgr())),
pDoc(nullptr)
{
get( m_pUnitLB, "unitlb");
diff --git a/sc/source/ui/pagedlg/tphfedit.cxx b/sc/source/ui/pagedlg/tphfedit.cxx
index ca1b9f43a116..a0a73ce8cae8 100644
--- a/sc/source/ui/pagedlg/tphfedit.cxx
+++ b/sc/source/ui/pagedlg/tphfedit.cxx
@@ -314,17 +314,17 @@ css::uno::Reference< css::accessibility::XAccessible > ScEditWindow::CreateAcces
{
case Left:
{
- sName = OUString(ScResId(STR_ACC_LEFTAREA_NAME));
+ sName = ScResId(STR_ACC_LEFTAREA_NAME);
}
break;
case Center:
{
- sName = OUString(ScResId(STR_ACC_CENTERAREA_NAME));
+ sName = ScResId(STR_ACC_CENTERAREA_NAME);
}
break;
case Right:
{
- sName = OUString(ScResId(STR_ACC_RIGHTAREA_NAME));
+ sName = ScResId(STR_ACC_RIGHTAREA_NAME);
}
break;
}
diff --git a/sc/source/ui/unoobj/PivotTableDataProvider.cxx b/sc/source/ui/unoobj/PivotTableDataProvider.cxx
index a9d453454918..d412265b033c 100644
--- a/sc/source/ui/unoobj/PivotTableDataProvider.cxx
+++ b/sc/source/ui/unoobj/PivotTableDataProvider.cxx
@@ -511,11 +511,11 @@ void PivotTableDataProvider::collectPivotTableData()
if (aMembers.size() == 1)
aFieldOutputDescription = aMembers[0];
else
- aFieldOutputDescription = ScResId(SCSTR_MULTIPLE).toString();
+ aFieldOutputDescription = ScResId(SCSTR_MULTIPLE);
}
else
{
- aFieldOutputDescription = ScResId(SCSTR_ALL).toString();
+ aFieldOutputDescription = ScResId(SCSTR_ALL);
}
m_aFieldOutputDescriptionMap[nDim] = aFieldOutputDescription;
}
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 0e5c0ab6bb84..5df2608e73e6 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -255,30 +255,30 @@ ScPrintUIOptions::ScPrintUIOptions()
// create Section for spreadsheet (results in an extra tab page in dialog)
SvtModuleOptions aOpt;
- OUString aAppGroupname( SC_RESSTR( SCSTR_PRINTOPT_PRODNAME ) );
+ OUString aAppGroupname( ScResId( SCSTR_PRINTOPT_PRODNAME ) );
aAppGroupname = aAppGroupname.replaceFirst( "%s", aOpt.GetModuleName( SvtModuleOptions::EModule::CALC ) );
m_aUIProperties[nIdx++].Value = setGroupControlOpt("tabcontrol-page2", aAppGroupname, OUString());
// show subgroup for pages
- m_aUIProperties[nIdx++].Value = setSubgroupControlOpt("pages", SC_RESSTR( SCSTR_PRINTOPT_PAGES ), OUString());
+ m_aUIProperties[nIdx++].Value = setSubgroupControlOpt("pages", ScResId( SCSTR_PRINTOPT_PAGES ), OUString());
// create a bool option for empty pages
- m_aUIProperties[nIdx++].Value = setBoolControlOpt("suppressemptypages", SC_RESSTR( SCSTR_PRINTOPT_SUPPRESSEMPTY ),
+ m_aUIProperties[nIdx++].Value = setBoolControlOpt("suppressemptypages", ScResId( SCSTR_PRINTOPT_SUPPRESSEMPTY ),
".HelpID:vcl:PrintDialog:IsSuppressEmptyPages:CheckBox",
"IsSuppressEmptyPages",
bSuppress);
// show Subgroup for print content
vcl::PrinterOptionsHelper::UIControlOptions aPrintRangeOpt;
aPrintRangeOpt.maGroupHint = "PrintRange";
- m_aUIProperties[nIdx++].Value = setSubgroupControlOpt("printrange", SC_RESSTR( SCSTR_PRINTOPT_PRNTCONTENT ),
+ m_aUIProperties[nIdx++].Value = setSubgroupControlOpt("printrange", ScResId( SCSTR_PRINTOPT_PRNTCONTENT ),
OUString(),
aPrintRangeOpt);
// create a choice for the content to create
uno::Sequence< OUString > aChoices{
- SC_RESSTR( SCSTR_PRINTOPT_ALLSHEETS ),
- SC_RESSTR( SCSTR_PRINTOPT_SELECTEDSHEETS ),
- SC_RESSTR( SCSTR_PRINTOPT_SELECTEDCELLS )};
+ ScResId( SCSTR_PRINTOPT_ALLSHEETS ),
+ ScResId( SCSTR_PRINTOPT_SELECTEDSHEETS ),
+ ScResId( SCSTR_PRINTOPT_SELECTEDCELLS )};
uno::Sequence< OUString > aHelpIds{
".HelpID:vcl:PrintDialog:PrintContent:RadioButton:0",
".HelpID:vcl:PrintDialog:PrintContent:RadioButton:1",
@@ -293,7 +293,7 @@ ScPrintUIOptions::ScPrintUIOptions()
// show Subgroup for print range
aPrintRangeOpt.mbInternalOnly = true;
- m_aUIProperties[nIdx++].Value = setSubgroupControlOpt("fromwhich", SC_RESSTR( SCSTR_PRINTOPT_FROMWHICH ),
+ m_aUIProperties[nIdx++].Value = setSubgroupControlOpt("fromwhich", ScResId( SCSTR_PRINTOPT_FROMWHICH ),
OUString(),
aPrintRangeOpt);
@@ -302,10 +302,10 @@ ScPrintUIOptions::ScPrintUIOptions()
aChoices.realloc( 2 );
aHelpIds.realloc( 2 );
aWidgetIds.realloc( 2 );
- aChoices[0] = SC_RESSTR( SCSTR_PRINTOPT_ALLPAGES );
+ aChoices[0] = ScResId( SCSTR_PRINTOPT_ALLPAGES );
aHelpIds[0] = ".HelpID:vcl:PrintDialog:PrintRange:RadioButton:0";
aWidgetIds[0] = "printallpages";
- aChoices[1] = SC_RESSTR( SCSTR_PRINTOPT_PAGES_ );
+ aChoices[1] = ScResId( SCSTR_PRINTOPT_PAGES_ );
aHelpIds[1] = ".HelpID:vcl:PrintDialog:PrintRange:RadioButton:1";
aWidgetIds[1] = "printpages";
m_aUIProperties[nIdx++].Value = setChoiceRadiosControlOpt(aWidgetIds, OUString(),
diff --git a/sc/source/ui/view/drawvie3.cxx b/sc/source/ui/view/drawvie3.cxx
index 346d3d85cfcb..daf4666a15ab 100644
--- a/sc/source/ui/view/drawvie3.cxx
+++ b/sc/source/ui/view/drawvie3.cxx
@@ -62,7 +62,7 @@ void ScDrawView::SetPageAnchored()
const SdrMarkList* pMark = &GetMarkedObjectList();
const size_t nCount = pMark->GetMarkCount();
- BegUndo( OUString(ScResId( SCSTR_UNDO_PAGE_ANCHOR )) );
+ BegUndo(ScResId(SCSTR_UNDO_PAGE_ANCHOR));
for( size_t i=0; i<nCount; ++i )
{
SdrObject* pObj = pMark->GetMark(i)->GetMarkedSdrObj();
@@ -90,7 +90,7 @@ void ScDrawView::SetCellAnchored()
const SdrMarkList* pMark = &GetMarkedObjectList();
const size_t nCount = pMark->GetMarkCount();
- BegUndo( OUString(ScResId( SCSTR_UNDO_CELL_ANCHOR )) );
+ BegUndo(ScResId(SCSTR_UNDO_CELL_ANCHOR));
for( size_t i=0; i<nCount; ++i )
{
SdrObject* pObj = pMark->GetMark(i)->GetMarkedSdrObj();
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 95ffc0e67ba5..a464447c20fd 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -680,21 +680,21 @@ void ScGridWindow::LaunchAutoFilterMenu(SCCOL nCol, SCROW nRow)
// Populate the menu.
mpAutoFilterPopup->addMenuItem(
- SC_RESSTR(STR_MENU_SORT_ASC),
+ ScResId(STR_MENU_SORT_ASC),
new AutoFilterAction(this, SortAscending));
mpAutoFilterPopup->addMenuItem(
- SC_RESSTR(STR_MENU_SORT_DESC),
+ ScResId(STR_MENU_SORT_DESC),
new AutoFilterAction(this, SortDescending));
mpAutoFilterPopup->addSeparator();
mpAutoFilterPopup->addMenuItem(
- SC_RESSTR(SCSTR_TOP10FILTER), new AutoFilterAction(this, Top10));
+ ScResId(SCSTR_TOP10FILTER), new AutoFilterAction(this, Top10));
mpAutoFilterPopup->addMenuItem(
- SC_RESSTR(SCSTR_FILTER_EMPTY), new AutoFilterAction(this, Empty));
+ ScResId(SCSTR_FILTER_EMPTY), new AutoFilterAction(this, Empty));
mpAutoFilterPopup->addMenuItem(
- SC_RESSTR(SCSTR_FILTER_NOTEMPTY), new AutoFilterAction(this, NonEmpty));
+ ScResId(SCSTR_FILTER_NOTEMPTY), new AutoFilterAction(this, NonEmpty));
mpAutoFilterPopup->addSeparator();
mpAutoFilterPopup->addMenuItem(
- SC_RESSTR(SCSTR_STDFILTER), new AutoFilterAction(this, Custom));
+ ScResId(SCSTR_STDFILTER), new AutoFilterAction(this, Custom));
ScCheckListMenuWindow::Config aConfig;
aConfig.mbAllowEmptySet = false;
diff --git a/sc/source/ui/view/gridwin2.cxx b/sc/source/ui/view/gridwin2.cxx
index 653776227e0e..ebd9a63f2a2d 100644
--- a/sc/source/ui/view/gridwin2.cxx
+++ b/sc/source/ui/view/gridwin2.cxx
@@ -509,13 +509,13 @@ void ScGridWindow::DPLaunchFieldPopupMenu(const Point& rScrPos, const Size& rScr
// Populate the menus.
ScTabViewShell* pViewShell = pViewData->GetViewShell();
mpDPFieldPopup->addMenuItem(
- SC_RESSTR(STR_MENU_SORT_ASC),
+ ScResId(STR_MENU_SORT_ASC),
new PopupSortAction(pDPObj, nDimIndex, PopupSortAction::ASCENDING, 0, pViewShell));
mpDPFieldPopup->addMenuItem(
- SC_RESSTR(STR_MENU_SORT_DESC),
+ ScResId(STR_MENU_SORT_DESC),
new PopupSortAction(pDPObj, nDimIndex, PopupSortAction::DESCENDING, 0, pViewShell));
ScMenuFloatingWindow* pSubMenu = mpDPFieldPopup->addSubMenuItem(
- SC_RESSTR(STR_MENU_SORT_CUSTOM), !aUserSortNames.empty());
+ ScResId(STR_MENU_SORT_CUSTOM), !aUserSortNames.empty());
if (pSubMenu && !aUserSortNames.empty())
{
diff --git a/sc/source/ui/view/tabvwshf.cxx b/sc/source/ui/view/tabvwshf.cxx
index d2980486bb4e..03b35199c6b2 100644
--- a/sc/source/ui/view/tabvwshf.cxx
+++ b/sc/source/ui/view/tabvwshf.cxx
@@ -372,13 +372,13 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
switch ( nSlot )
{
case FID_TAB_APPEND:
- aDlgTitle = OUString(ScResId(SCSTR_APDTABLE));
+ aDlgTitle = ScResId(SCSTR_APDTABLE);
pDoc->CreateValidTabName( aName );
pHelpId = HID_SC_APPEND_NAME;
break;
case FID_TAB_RENAME:
- aDlgTitle = OUString(ScResId(SCSTR_RENAMETAB));
+ aDlgTitle = ScResId(SCSTR_RENAMETAB);
pDoc->GetName( rViewData.GetTabNo(), aName );
pHelpId = HID_SC_RENAME_NAME;
break;
@@ -388,7 +388,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
OSL_ENSURE(pFact, "ScAbstractFactory create fail!");
ScopedVclPtr<AbstractScStringInputDlg> pDlg(pFact->CreateScStringInputDlg(
- GetDialogParent(), aDlgTitle, OUString(ScResId(SCSTR_NAME)),
+ GetDialogParent(), aDlgTitle, ScResId(SCSTR_NAME),
aName, GetStaticInterface()->GetSlot(nSlot)->GetCommand(),
pHelpId));
@@ -773,8 +773,8 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
OSL_ENSURE(pFact, "ScAbstractFactory create fail!");
ScopedVclPtr<AbstractScTabBgColorDlg> pDlg(pFact->CreateScTabBgColorDlg(
GetDialogParent(),
- OUString(ScResId(SCSTR_SET_TAB_BG_COLOR)),
- OUString(ScResId(SCSTR_NO_TAB_BG_COLOR)),
+ ScResId(SCSTR_SET_TAB_BG_COLOR),
+ ScResId(SCSTR_NO_TAB_BG_COLOR),
aTabBgColor));
while ( !bDone && nRet == RET_OK )
{
diff --git a/scaddins/source/analysis/analysis.cxx b/scaddins/source/analysis/analysis.cxx
index dd023dd473d3..344d5aa0f54a 100644
--- a/scaddins/source/analysis/analysis.cxx
+++ b/scaddins/source/analysis/analysis.cxx
@@ -241,7 +241,7 @@ OUString SAL_CALL AnalysisAddIn::getDisplayFunctionName( const OUString& aProgra
auto it = std::find_if(pFD->begin(), pFD->end(), FindFuncData( aProgrammaticName ) );
if( it != pFD->end() )
{
- aRet = AnalysisResId(it->GetUINameID(), GetResMgr()).toString();
+ aRet = AnalysisResId(it->GetUINameID(), GetResMgr());
if( it->IsDouble() )
{
const OUString& rSuffix = it->GetSuffix();
diff --git a/scaddins/source/datefunc/datefunc.cxx b/scaddins/source/datefunc/datefunc.cxx
index 055f7bcc5525..d2a33ccf5398 100644
--- a/scaddins/source/datefunc/datefunc.cxx
+++ b/scaddins/source/datefunc/datefunc.cxx
@@ -252,7 +252,7 @@ OUString SAL_CALL ScaDateAddIn::getDisplayFunctionName( const OUString& aProgram
FindScaFuncData( aProgrammaticName ) );
if( fDataIt != pFuncDataList->end() )
{
- aRet = ScaResId(fDataIt->GetUINameID(), GetResMgr()).toString();
+ aRet = ScaResId(fDataIt->GetUINameID(), GetResMgr());
if( fDataIt->IsDouble() )
aRet += "_ADD";
}
diff --git a/scaddins/source/pricing/pricing.cxx b/scaddins/source/pricing/pricing.cxx
index e1843cf5b396..7824f0c4a67e 100644
--- a/scaddins/source/pricing/pricing.cxx
+++ b/scaddins/source/pricing/pricing.cxx
@@ -275,7 +275,7 @@ OUString SAL_CALL ScaPricingAddIn::getDisplayFunctionName( const OUString& aProg
FindScaFuncData( aProgrammaticName ) );
if(fDataIt != pFuncDataList->end() )
{
- aRet = ScaResId(fDataIt->GetUINameID(), GetResMgr()).toString();
+ aRet = ScaResId(fDataIt->GetUINameID(), GetResMgr());
if( fDataIt->IsDouble() )
aRet += "_ADD";
}
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index 36ac7d7b5808..62a4c3775e47 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -191,7 +191,6 @@ $(eval $(call gb_Library_add_exception_objects,sd,\
sd/source/ui/app/sdmod1 \
sd/source/ui/app/sdmod2 \
sd/source/ui/app/sdpopup \
- sd/source/ui/app/sdresid \
sd/source/ui/app/sdxfer \
sd/source/ui/app/tmplctrl \
sd/source/ui/controller/slidelayoutcontroller \
diff --git a/sd/inc/sdabstdlg.hxx b/sd/inc/sdabstdlg.hxx
index 5372a83252d5..f39b7d369332 100644
--- a/sd/inc/sdabstdlg.hxx
+++ b/sd/inc/sdabstdlg.hxx
@@ -54,7 +54,6 @@ class SdrModel;
class SdrView;
class Bitmap;
class List;
-class SdResId;
namespace vcl { class Window; }
class SdPage;
class TabPage;
diff --git a/sd/inc/sdresid.hxx b/sd/inc/sdresid.hxx
index 95397b38b06b..2fdb9e30d236 100644
--- a/sd/inc/sdresid.hxx
+++ b/sd/inc/sdresid.hxx
@@ -22,14 +22,12 @@
#include <tools/resid.hxx>
#include "sddllapi.h"
+#include "sdmod.hxx"
-class SD_DLLPUBLIC SdResId : public ResId
+inline OUString SdResId(sal_uInt16 nId)
{
-public:
- SdResId(sal_uInt16 nId);
-};
-
-#define SD_RESSTR(x) SdResId(x).toString()
+ return ResId(nId, *SD_MOD()->GetResMgr());
+}
#endif /* _SD_SDRESID_HXX */
diff --git a/sd/qa/unit/dialogs-test.cxx b/sd/qa/unit/dialogs-test.cxx
index 3637c27831de..aa0837ecf3ce 100644
--- a/sd/qa/unit/dialogs-test.cxx
+++ b/sd/qa/unit/dialogs-test.cxx
@@ -367,7 +367,7 @@ VclPtr<VclAbstractDialog> SdDialogsTest::createDialogByID(sal_uInt32 nID)
SdDrawDocument* pDrawDoc = getSdXImpressDocument()->GetDoc();
CPPUNIT_ASSERT(pDrawDoc);
SfxItemSet aNewAttr(pDrawDoc->GetItemPool(), ATTR_LAYER_START, ATTR_LAYER_END);
- const OUString aLayerName = SD_RESSTR(STR_LAYER); // + OUString::number(2);
+ const OUString aLayerName = SdResId(STR_LAYER); // + OUString::number(2);
aNewAttr.Put(makeSdAttrLayerName(aLayerName));
aNewAttr.Put(makeSdAttrLayerTitle());
aNewAttr.Put(makeSdAttrLayerDesc());
@@ -379,7 +379,7 @@ VclPtr<VclAbstractDialog> SdDialogsTest::createDialogByID(sal_uInt32 nID)
getViewShell()->GetActiveWindow(),
aNewAttr,
true, // alternative: false
- SD_RESSTR(STR_INSERTLAYER) /* alternative: STR_MODIFYLAYER */);
+ SdResId(STR_INSERTLAYER) /* alternative: STR_MODIFYLAYER */);
break;
}
case 9:
diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx
index a30fdb097d6e..fba824d42a94 100644
--- a/sd/source/core/drawdoc.cxx
+++ b/sd/source/core/drawdoc.cxx
@@ -348,14 +348,14 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh)
*/
{
- OUString aControlLayerName( SD_RESSTR(STR_LAYER_CONTROLS) );
+ OUString aControlLayerName( SdResId(STR_LAYER_CONTROLS) );
SdrLayerAdmin& rLayerAdmin = GetLayerAdmin();
- rLayerAdmin.NewLayer( SD_RESSTR(STR_LAYER_LAYOUT) );
- rLayerAdmin.NewLayer( SD_RESSTR(STR_LAYER_BCKGRND) );
- rLayerAdmin.NewLayer( SD_RESSTR(STR_LAYER_BCKGRNDOBJ) );
+ rLayerAdmin.NewLayer( SdResId(STR_LAYER_LAYOUT) );
+ rLayerAdmin.NewLayer( SdResId(STR_LAYER_BCKGRND) );
+ rLayerAdmin.NewLayer( SdResId(STR_LAYER_BCKGRNDOBJ) );
rLayerAdmin.NewLayer( aControlLayerName );
- rLayerAdmin.NewLayer( SD_RESSTR(STR_LAYER_MEASURELINES) );
+ rLayerAdmin.NewLayer( SdResId(STR_LAYER_MEASURELINES) );
rLayerAdmin.SetControlLayerName(aControlLayerName);
}
@@ -627,11 +627,11 @@ void SdDrawDocument::NewOrLoadCompleted(DocCreationMode eMode)
}
// Set default style of Drawing Engine
- OUString aName( SD_RESSTR(STR_STANDARD_STYLESHEET_NAME));
+ OUString aName( SdResId(STR_STANDARD_STYLESHEET_NAME));
SetDefaultStyleSheet(static_cast<SfxStyleSheet*>(mxStyleSheetPool->Find(aName, SD_STYLE_FAMILY_GRAPHICS)));
// #i119287# Set default StyleSheet for SdrGrafObj and SdrOle2Obj
- SetDefaultStyleSheetForSdrGrafObjAndSdrOle2Obj(static_cast<SfxStyleSheet*>(mxStyleSheetPool->Find(SD_RESSTR(STR_POOLSHEET_OBJNOLINENOFILL), SD_STYLE_FAMILY_GRAPHICS)));
+ SetDefaultStyleSheetForSdrGrafObjAndSdrOle2Obj(static_cast<SfxStyleSheet*>(mxStyleSheetPool->Find(SdResId(STR_POOLSHEET_OBJNOLINENOFILL), SD_STYLE_FAMILY_GRAPHICS)));
// Initialize DrawOutliner and DocumentOutliner, but don't initialize the
// global outliner, as it is not document specific like StyleSheetPool and
diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx
index baa71139cce2..917c486c7408 100644
--- a/sd/source/core/drawdoc2.cxx
+++ b/sd/source/core/drawdoc2.cxx
@@ -309,7 +309,7 @@ void SdDrawDocument::UpdatePageRelativeURLs(const OUString& rOldName, const OUSt
}
else
{
- const OUString sNotes(SD_RESSTR(STR_NOTES));
+ const OUString sNotes(SdResId(STR_NOTES));
if (aURL.getLength() == rOldName.getLength() + 2 + sNotes.getLength()
&& aURL.indexOf(sNotes, rOldName.getLength() + 2) == rOldName.getLength() + 2)
{
@@ -346,12 +346,12 @@ void SdDrawDocument::UpdatePageRelativeURLs(SdPage* pPage, sal_uInt16 nPos, sal_
if (!aURL.isEmpty() && (aURL[0] == 35))
{
OUString aHashSlide("#");
- aHashSlide += SD_RESSTR(STR_PAGE);
+ aHashSlide += SdResId(STR_PAGE);
if (aURL.startsWith(aHashSlide))
{
OUString aURLCopy = aURL;
- const OUString sNotes(SD_RESSTR(STR_NOTES));
+ const OUString sNotes(SdResId(STR_NOTES));
aURLCopy = aURLCopy.replaceAt(0, aHashSlide.getLength(), "");
@@ -547,7 +547,7 @@ void SdDrawDocument::CreateFirstPages( SdDrawDocument* pRefDocument /* = 0 */ )
}
pHandoutPage->SetPageKind(PageKind::Handout);
- pHandoutPage->SetName( SD_RESSTR(STR_HANDOUT) );
+ pHandoutPage->SetName( SdResId(STR_HANDOUT) );
InsertPage(pHandoutPage, 0);
// Insert master page and register this with the handout page
@@ -760,7 +760,7 @@ bool SdDrawDocument::MovePages(sal_uInt16 nTargetPage)
const bool bUndo = IsUndoEnabled();
if( bUndo )
- BegUndo(SD_RESSTR(STR_UNDO_MOVEPAGES));
+ BegUndo(SdResId(STR_UNDO_MOVEPAGES));
// List of selected pages
std::vector<SdPage*> aPageList;
@@ -1346,8 +1346,8 @@ sal_uInt16 SdDrawDocument::DuplicatePage (sal_uInt16 nPageNum)
// Get background flags
SdrLayerAdmin& rLayerAdmin = GetLayerAdmin();
- SdrLayerID aBckgrnd = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND));
- SdrLayerID aBckgrndObj = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ));
+ SdrLayerID aBckgrnd = rLayerAdmin.GetLayerID(SdResId(STR_LAYER_BCKGRND));
+ SdrLayerID aBckgrndObj = rLayerAdmin.GetLayerID(SdResId(STR_LAYER_BCKGRNDOBJ));
SdrLayerIDSet aVisibleLayers = pActualPage->TRG_GetMasterPageVisibleLayers();
return DuplicatePage (
@@ -1490,8 +1490,8 @@ void SdDrawDocument::SetupNewPage (
if (pPreviousPage != nullptr)
{
SdrLayerAdmin& rLayerAdmin = GetLayerAdmin();
- SdrLayerID aBckgrnd = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND));
- SdrLayerID aBckgrndObj = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ));
+ SdrLayerID aBckgrnd = rLayerAdmin.GetLayerID(SdResId(STR_LAYER_BCKGRND));
+ SdrLayerID aBckgrndObj = rLayerAdmin.GetLayerID(SdResId(STR_LAYER_BCKGRNDOBJ));
SdrLayerIDSet aVisibleLayers = pPreviousPage->TRG_GetMasterPageVisibleLayers();
aVisibleLayers.Set(aBckgrnd, bIsPageBack);
aVisibleLayers.Set(aBckgrndObj, bIsPageObj);
diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx
index f4030c714cfa..dada8f687e41 100644
--- a/sd/source/core/drawdoc3.cxx
+++ b/sd/source/core/drawdoc3.cxx
@@ -246,7 +246,7 @@ SdDrawDocument* SdDrawDocument::OpenBookmarkDoc(SfxMedium* pMedium)
if (!bOK)
{
- ScopedVclPtrInstance< MessageDialog > aErrorBox(nullptr, SD_RESSTR(STR_READ_DATA_ERROR));
+ ScopedVclPtrInstance< MessageDialog > aErrorBox(nullptr, SdResId(STR_READ_DATA_ERROR));
aErrorBox->Execute();
CloseBookmarkDoc();
@@ -467,7 +467,7 @@ bool SdDrawDocument::InsertBookmarkAsPage(
pBMPage->GetUppBorder() != pRefPage->GetUppBorder() ||
pBMPage->GetLwrBorder() != pRefPage->GetLwrBorder())
{
- OUString aStr(SD_RESSTR(STR_SCALE_OBJECTS));
+ OUString aStr(SdResId(STR_SCALE_OBJECTS));
sal_uInt16 nBut = ScopedVclPtrInstance<QueryBox>(nullptr, WB_YES_NO_CANCEL, aStr)->Execute();
bScaleObjects = nBut == RET_YES;
@@ -489,7 +489,7 @@ bool SdDrawDocument::InsertBookmarkAsPage(
ViewShellId nViewShellId(-1);
if (sd::ViewShell* pViewShell = mpDocSh->GetViewShell())
nViewShellId = pViewShell->GetViewShellBase().GetViewShellId();
- pUndoMgr->EnterListAction(SD_RESSTR(STR_UNDO_INSERTPAGES), "", 0, nViewShellId);
+ pUndoMgr->EnterListAction(SdResId(STR_UNDO_INSERTPAGES), "", 0, nViewShellId);
}
// Refactored copy'n'pasted layout name collection into IterateBookmarkPages
@@ -544,7 +544,7 @@ bool SdDrawDocument::InsertBookmarkAsPage(
const bool bUndo = IsUndoEnabled();
if( bUndo )
- BegUndo(SD_RESSTR(STR_UNDO_INSERTPAGES));
+ BegUndo(SdResId(STR_UNDO_INSERTPAGES));
if (rBookmarkList.empty())
{
@@ -1418,7 +1418,7 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum,
ViewShellId nViewShellId(-1);
if (sd::ViewShell* pViewShell = mpDocSh->GetViewShell())
nViewShellId = pViewShell->GetViewShellBase().GetViewShellId();
- pUndoMgr->EnterListAction(SD_RESSTR(STR_UNDO_SET_PRESLAYOUT), OUString(), 0, nViewShellId);
+ pUndoMgr->EnterListAction(SdResId(STR_UNDO_SET_PRESLAYOUT), OUString(), 0, nViewShellId);
}
SdPage* pSelectedPage = GetSdPage(nSdPageNum, PageKind::Standard);
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index 79c882a5e6d3..d4290d037a27 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -127,7 +127,7 @@ void SdDrawDocument::CreateLayoutTemplates()
SdStyleSheetPool* pSSPool = static_cast<SdStyleSheetPool*>(GetStyleSheetPool());
SfxStyleSheetBase* pSheet = nullptr;
OUString aHelpFile;
- OUString aStdName(SD_RESSTR(STR_STANDARD_STYLESHEET_NAME));
+ OUString aStdName(SdResId(STR_STANDARD_STYLESHEET_NAME));
// Default style
@@ -253,7 +253,7 @@ void SdDrawDocument::CreateLayoutTemplates()
SfxItemSet* pISet = nullptr;
// Object with arrowhead
- aName = SD_RESSTR(STR_POOLSHEET_OBJWITHARROW);
+ aName = SdResId(STR_POOLSHEET_OBJWITHARROW);
pSheet = &(pSSPool->Make(aName, SD_STYLE_FAMILY_GRAPHICS, nMask));
pSheet->SetParent(aStdName);
pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_OBJWITHARROW );
@@ -268,14 +268,14 @@ void SdDrawDocument::CreateLayoutTemplates()
aArrow.append(::basegfx::B2DPoint(0.0, 30.0));
aArrow.append(::basegfx::B2DPoint(20.0, 30.0));
aArrow.setClosed(true);
- pISet->Put(XLineStartItem(SVX_RESSTR(RID_SVXSTR_ARROW),::basegfx::B2DPolyPolygon(aArrow)));
+ pISet->Put(XLineStartItem(SvxResId(RID_SVXSTR_ARROW),::basegfx::B2DPolyPolygon(aArrow)));
pISet->Put(XLineStartWidthItem(700));
pISet->Put(XLineEndWidthItem(300));
pISet->Put(XLineStartCenterItem(true));
// Object with Shadow
- aName = SD_RESSTR(STR_POOLSHEET_OBJWITHSHADOW);
+ aName = SdResId(STR_POOLSHEET_OBJWITHSHADOW);
pSheet = &(pSSPool->Make(aName, SD_STYLE_FAMILY_GRAPHICS, nMask));
pSheet->SetParent(aStdName);
pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_OBJWITHSHADOW );
@@ -287,7 +287,7 @@ void SdDrawDocument::CreateLayoutTemplates()
pISet->Put(makeSdrShadowYDistItem(200));
// Object without filling
- aName = SD_RESSTR(STR_POOLSHEET_OBJWITHOUTFILL);
+ aName = SdResId(STR_POOLSHEET_OBJWITHOUTFILL);
pSheet = &(pSSPool->Make(aName, SD_STYLE_FAMILY_GRAPHICS, nMask));
pSheet->SetParent(aStdName);
pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_OBJWITHOUTFILL );
@@ -298,7 +298,7 @@ void SdDrawDocument::CreateLayoutTemplates()
// Object no fill no line
- aName = SD_RESSTR(STR_POOLSHEET_OBJNOLINENOFILL);
+ aName = SdResId(STR_POOLSHEET_OBJNOLINENOFILL);
pSheet = &(pSSPool->Make(aName, SD_STYLE_FAMILY_GRAPHICS, nMask));
pSheet->SetParent(aStdName);
pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_OBJNOLINENOFILL );
@@ -309,7 +309,7 @@ void SdDrawDocument::CreateLayoutTemplates()
// Text
- aName = SD_RESSTR(STR_POOLSHEET_TEXT);
+ aName = SdResId(STR_POOLSHEET_TEXT);
pSheet = &(pSSPool->Make(aName, SD_STYLE_FAMILY_GRAPHICS, nMask));
pSheet->SetParent(aStdName);
pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_TEXT );
@@ -319,7 +319,7 @@ void SdDrawDocument::CreateLayoutTemplates()
pISet->Put(XFillStyleItem(drawing::FillStyle_NONE));
// Text body
- aName = SD_RESSTR(STR_POOLSHEET_TEXTBODY);
+ aName = SdResId(STR_POOLSHEET_TEXTBODY);
pSheet = &(pSSPool->Make(aName, SD_STYLE_FAMILY_GRAPHICS, nMask));
pSheet->SetParent(aStdName);
pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_TEXTBODY );
@@ -331,7 +331,7 @@ void SdDrawDocument::CreateLayoutTemplates()
pISet->Put(SvxFontHeightItem(564, 100, EE_CHAR_FONTHEIGHT)); // 16 pt
// Text body, justified
- aName = SD_RESSTR(STR_POOLSHEET_TEXTBODY_JUSTIFY);
+ aName = SdResId(STR_POOLSHEET_TEXTBODY_JUSTIFY);
pSheet = &(pSSPool->Make(aName, SD_STYLE_FAMILY_GRAPHICS, nMask));
pSheet->SetParent(aStdName);
pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_TEXTBODY_JUSTIFY );
@@ -343,7 +343,7 @@ void SdDrawDocument::CreateLayoutTemplates()
pISet->Put(SvxAdjustItem(SvxAdjust::Block, EE_PARA_JUST ));
// Text body, indented
- aName = SD_RESSTR(STR_POOLSHEET_TEXTBODY_INDENT);
+ aName = SdResId(STR_POOLSHEET_TEXTBODY_INDENT);
pSheet = &(pSSPool->Make(aName, SD_STYLE_FAMILY_GRAPHICS, nMask));
pSheet->SetParent(aStdName);
pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_TEXTBODY_INDENT );
@@ -358,7 +358,7 @@ void SdDrawDocument::CreateLayoutTemplates()
// Title
- aName = SD_RESSTR(STR_POOLSHEET_TITLE);
+ aName = SdResId(STR_POOLSHEET_TITLE);
pSheet = &(pSSPool->Make(aName, SD_STYLE_FAMILY_GRAPHICS, nMask));
pSheet->SetParent(aStdName);
pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_TITLE );
@@ -370,7 +370,7 @@ void SdDrawDocument::CreateLayoutTemplates()
pISet->Put(SvxFontHeightItem(1551, 100, EE_CHAR_FONTHEIGHT )); // 44 pt
// Title1
- aName = SD_RESSTR(STR_POOLSHEET_TITLE1);
+ aName = SdResId(STR_POOLSHEET_TITLE1);
pSheet = &(pSSPool->Make(aName, SD_STYLE_FAMILY_GRAPHICS, nMask));
pSheet->SetParent(aStdName);
pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_TITLE1 );
@@ -391,7 +391,7 @@ void SdDrawDocument::CreateLayoutTemplates()
// Title2
- aName = SD_RESSTR(STR_POOLSHEET_TITLE2);
+ aName = SdResId(STR_POOLSHEET_TITLE2);
pSheet = &(pSSPool->Make(aName, SD_STYLE_FAMILY_GRAPHICS, nMask));
pSheet->SetParent(aStdName);
pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_TITLE2 );
@@ -420,7 +420,7 @@ void SdDrawDocument::CreateLayoutTemplates()
// Headline
- aName = SD_RESSTR(STR_POOLSHEET_HEADLINE);
+ aName = SdResId(STR_POOLSHEET_HEADLINE);
pSheet = &(pSSPool->Make(aName, SD_STYLE_FAMILY_GRAPHICS, nMask));
pSheet->SetParent(aStdName);
pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_HEADLINE );
@@ -435,7 +435,7 @@ void SdDrawDocument::CreateLayoutTemplates()
// Paragraph margin below: 2,1 mm
// Headline1
- aName = SD_RESSTR(STR_POOLSHEET_HEADLINE1);
+ aName = SdResId(STR_POOLSHEET_HEADLINE1);
pSheet = &(pSSPool->Make(aName, SD_STYLE_FAMILY_GRAPHICS, nMask));
pSheet->SetParent(aStdName);
pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_HEADLINE1 );
@@ -452,7 +452,7 @@ void SdDrawDocument::CreateLayoutTemplates()
// Paragraph margin below: 2,1 mm
// Headline2
- aName = SD_RESSTR(STR_POOLSHEET_HEADLINE2);
+ aName = SdResId(STR_POOLSHEET_HEADLINE2);
pSheet = &(pSSPool->Make(aName, SD_STYLE_FAMILY_GRAPHICS, nMask));
pSheet->SetParent(aStdName);
pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_HEADLINE2 );
@@ -470,7 +470,7 @@ void SdDrawDocument::CreateLayoutTemplates()
// Paragraph margin below: 2,1 mm
// Measurements
- aName = SD_RESSTR(STR_POOLSHEET_MEASURE);
+ aName = SdResId(STR_POOLSHEET_MEASURE);
pSheet = &(pSSPool->Make(aName, SD_STYLE_FAMILY_GRAPHICS, nMask));
pSheet->SetParent(aStdName);
pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_MEASURE );
@@ -481,15 +481,15 @@ void SdDrawDocument::CreateLayoutTemplates()
pISet->Put(SvxFontHeightItem(423, 100, EE_CHAR_FONTHEIGHT )); // 12 pt
- pISet->Put(XLineStartItem(SVX_RESSTR(RID_SVXSTR_ARROW),::basegfx::B2DPolyPolygon(aArrow)));
+ pISet->Put(XLineStartItem(SvxResId(RID_SVXSTR_ARROW),::basegfx::B2DPolyPolygon(aArrow)));
pISet->Put(XLineStartWidthItem(200));
- pISet->Put(XLineEndItem(SVX_RESSTR(RID_SVXSTR_ARROW),::basegfx::B2DPolyPolygon(aArrow)));
+ pISet->Put(XLineEndItem(SvxResId(RID_SVXSTR_ARROW),::basegfx::B2DPolyPolygon(aArrow)));
pISet->Put(XLineEndWidthItem(200));
pISet->Put(XLineStyleItem(drawing::LineStyle_SOLID));
pISet->Put(SdrYesNoItem(SDRATTR_MEASURESHOWUNIT, true));
// Generate presentation templates for default layout.
- OUString aPrefix = SD_RESSTR(STR_LAYOUT_DEFAULT_NAME);
+ OUString aPrefix = SdResId(STR_LAYOUT_DEFAULT_NAME);
pSSPool->CreateLayoutStyleSheets(aPrefix);
}
@@ -1006,23 +1006,23 @@ void SdDrawDocument::RestoreLayerNames()
if (aLayerName == "LAYER_LAYOUT")
{
- pLayer->SetName(SD_RESSTR(STR_LAYER_LAYOUT));
+ pLayer->SetName(SdResId(STR_LAYER_LAYOUT));
}
else if (aLayerName == "LAYER_BCKGRND")
{
- pLayer->SetName(SD_RESSTR(STR_LAYER_BCKGRND));
+ pLayer->SetName(SdResId(STR_LAYER_BCKGRND));
}
else if (aLayerName == "LAYER_BACKGRNDOBJ")
{
- pLayer->SetName(SD_RESSTR(STR_LAYER_BCKGRNDOBJ));
+ pLayer->SetName(SdResId(STR_LAYER_BCKGRNDOBJ));
}
else if (aLayerName == "LAYER_CONTROLS")
{
- pLayer->SetName(SD_RESSTR(STR_LAYER_CONTROLS));
+ pLayer->SetName(SdResId(STR_LAYER_CONTROLS));
}
else if (aLayerName == "LAYER_MEASURELINES")
{
- pLayer->SetName(SD_RESSTR(STR_LAYER_MEASURELINES));
+ pLayer->SetName(SdResId(STR_LAYER_MEASURELINES));
}
}
}
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index f334f155d2e3..6cb7963bcacd 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -542,7 +542,7 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, bool bVertical, const ::t
// background objects of the master page
pSdrObj->SetLayer( rLayerAdmin.
- GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ)) );
+ GetLayerID(SdResId(STR_LAYER_BCKGRNDOBJ)) );
}
// Subscribe object at the style sheet
@@ -2459,22 +2459,22 @@ void SdPage::SetObjText(SdrTextObj* pObj, SdrOutliner* pOutliner, PresObjKind eO
{
pOutl->SetStyleSheet( 0, GetStyleSheetForPresObj(eObjKind) );
aString += "\n\t\t";
- aString += SD_RESSTR(STR_PRESOBJ_MPOUTLLAYER2);
+ aString += SdResId(STR_PRESOBJ_MPOUTLLAYER2);
aString += "\n\t\t\t";
- aString += SD_RESSTR(STR_PRESOBJ_MPOUTLLAYER3);
+ aString += SdResId(STR_PRESOBJ_MPOUTLLAYER3);
aString += "\n\t\t\t\t";
- aString += SD_RESSTR(STR_PRESOBJ_MPOUTLLAYER4);
+ aString += SdResId(STR_PRESOBJ_MPOUTLLAYER4);
aString += "\n\t\t\t\t\t";
- aString += SD_RESSTR(STR_PRESOBJ_MPOUTLLAYER5);
+ aString += SdResId(STR_PRESOBJ_MPOUTLLAYER5);
aString += "\n\t\t\t\t\t\t";
- aString += SD_RESSTR(STR_PRESOBJ_MPOUTLLAYER6);
+ aString += SdResId(STR_PRESOBJ_MPOUTLLAYER6);
aString += "\n\t\t\t\t\t\t\t";
- aString += SD_RESSTR(STR_PRESOBJ_MPOUTLLAYER7);
+ aString += SdResId(STR_PRESOBJ_MPOUTLLAYER7);
}
}
@@ -2581,7 +2581,7 @@ const OUString& SdPage::GetName() const
// default name for handout pages
sal_uInt16 nNum = (GetPageNum() + 1) / 2;
- aCreatedPageName = SD_RESSTR(STR_PAGE);
+ aCreatedPageName = SdResId(STR_PAGE);
aCreatedPageName += " ";
if( GetModel()->GetPageNumType() == css::style::NumberingType::NUMBER_NONE )
{
@@ -2600,7 +2600,7 @@ const OUString& SdPage::GetName() const
/******************************************************************
* default name for note pages
******************************************************************/
- aCreatedPageName = SD_RESSTR(STR_LAYOUT_DEFAULT_NAME);
+ aCreatedPageName = SdResId(STR_LAYOUT_DEFAULT_NAME);
}
}
else
@@ -2611,12 +2611,12 @@ const OUString& SdPage::GetName() const
if (mePageKind == PageKind::Notes)
{
aCreatedPageName += " ";
- aCreatedPageName += SD_RESSTR(STR_NOTES);
+ aCreatedPageName += SdResId(STR_NOTES);
}
else if (mePageKind == PageKind::Handout && mbMaster)
{
aCreatedPageName += " (";
- aCreatedPageName += SD_RESSTR(STR_HANDOUT);
+ aCreatedPageName += SdResId(STR_HANDOUT);
aCreatedPageName += ")";
}
@@ -2650,63 +2650,63 @@ OUString SdPage::GetPresObjText(PresObjKind eObjKind) const
{
if (mePageKind != PageKind::Notes)
{
- aString = SD_RESSTR( STR_PRESOBJ_MPTITLE );
+ aString = SdResId( STR_PRESOBJ_MPTITLE );
}
else
{
- aString = SD_RESSTR( STR_PRESOBJ_MPNOTESTITLE );
+ aString = SdResId( STR_PRESOBJ_MPNOTESTITLE );
}
}
else
{
- aString = SD_RESSTR( STR_PRESOBJ_TITLE );
+ aString = SdResId( STR_PRESOBJ_TITLE );
}
}
else if (eObjKind == PRESOBJ_OUTLINE)
{
if (mbMaster)
{
- aString = SD_RESSTR( STR_PRESOBJ_MPOUTLINE );
+ aString = SdResId( STR_PRESOBJ_MPOUTLINE );
}
else
{
- aString = SD_RESSTR( STR_PRESOBJ_OUTLINE );
+ aString = SdResId( STR_PRESOBJ_OUTLINE );
}
}
else if (eObjKind == PRESOBJ_NOTES)
{
if (mbMaster)
{
- aString = SD_RESSTR( STR_PRESOBJ_MPNOTESTEXT );
+ aString = SdResId( STR_PRESOBJ_MPNOTESTEXT );
}
else
{
- aString = SD_RESSTR( STR_PRESOBJ_NOTESTEXT );
+ aString = SdResId( STR_PRESOBJ_NOTESTEXT );
}
}
else if (eObjKind == PRESOBJ_TEXT)
{
- aString = SD_RESSTR( STR_PRESOBJ_TEXT );
+ aString = SdResId( STR_PRESOBJ_TEXT );
}
else if (eObjKind == PRESOBJ_GRAPHIC)
{
- aString = SD_RESSTR( STR_PRESOBJ_GRAPHIC );
+ aString = SdResId( STR_PRESOBJ_GRAPHIC );
}
else if (eObjKind == PRESOBJ_OBJECT)
{
- aString = SD_RESSTR( STR_PRESOBJ_OBJECT );
+ aString = SdResId( STR_PRESOBJ_OBJECT );
}
else if (eObjKind == PRESOBJ_CHART)
{
- aString = SD_RESSTR( STR_PRESOBJ_CHART );
+ aString = SdResId( STR_PRESOBJ_CHART );
}
else if (eObjKind == PRESOBJ_ORGCHART)
{
- aString = SD_RESSTR( STR_PRESOBJ_ORGCHART );
+ aString = SdResId( STR_PRESOBJ_ORGCHART );
}
else if (eObjKind == PRESOBJ_CALC)
{
- aString = SD_RESSTR( STR_PRESOBJ_TABLE );
+ aString = SdResId( STR_PRESOBJ_TABLE );
}
return aString;
diff --git a/sd/source/core/stlfamily.cxx b/sd/source/core/stlfamily.cxx
index ee8db41641a6..04bec070c509 100644
--- a/sd/source/core/stlfamily.cxx
+++ b/sd/source/core/stlfamily.cxx
@@ -493,8 +493,8 @@ Any SdStyleFamily::getPropertyValue( const OUString& PropertyName )
switch( mnFamily )
{
case SD_STYLE_FAMILY_MASTERPAGE: sDisplayName = getName(); break;
- case SD_STYLE_FAMILY_CELL: sDisplayName = SD_RESSTR(STR_CELL_STYLE_FAMILY); break;
- default: sDisplayName = SD_RESSTR(STR_GRAPHICS_STYLE_FAMILY); break;
+ case SD_STYLE_FAMILY_CELL: sDisplayName = SdResId(STR_CELL_STYLE_FAMILY); break;
+ default: sDisplayName = SdResId(STR_GRAPHICS_STYLE_FAMILY); break;
}
return Any( sDisplayName );
}
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index 624f329ca45d..396f58a9000b 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -845,7 +845,7 @@ void SdStyleSheetPool::CreatePseudosIfNecessary()
sal_uInt16 nUsedMask = SFXSTYLEBIT_USED;
- aName = SD_RESSTR(STR_PSEUDOSHEET_TITLE);
+ aName = SdResId(STR_PSEUDOSHEET_TITLE);
if( (pSheet = Find(aName, SD_STYLE_FAMILY_PSEUDO)) == nullptr )
{
pSheet = &Make(aName, SD_STYLE_FAMILY_PSEUDO, nUsedMask);
@@ -854,7 +854,7 @@ void SdStyleSheetPool::CreatePseudosIfNecessary()
}
pSheet->SetHelpId( aHelpFile, HID_PSEUDOSHEET_TITLE );
- aName = SD_RESSTR(STR_PSEUDOSHEET_SUBTITLE);
+ aName = SdResId(STR_PSEUDOSHEET_SUBTITLE);
if( (pSheet = Find(aName, SD_STYLE_FAMILY_PSEUDO)) == nullptr )
{
pSheet = &Make(aName, SD_STYLE_FAMILY_PSEUDO, nUsedMask);
@@ -863,7 +863,7 @@ void SdStyleSheetPool::CreatePseudosIfNecessary()
}
pSheet->SetHelpId( aHelpFile, HID_PSEUDOSHEET_SUBTITLE );
- aName = SD_RESSTR(STR_PSEUDOSHEET_BACKGROUNDOBJECTS);
+ aName = SdResId(STR_PSEUDOSHEET_BACKGROUNDOBJECTS);
if( (pSheet = Find(aName, SD_STYLE_FAMILY_PSEUDO)) == nullptr )
{
pSheet = &Make(aName, SD_STYLE_FAMILY_PSEUDO, nUsedMask);
@@ -872,7 +872,7 @@ void SdStyleSheetPool::CreatePseudosIfNecessary()
}
pSheet->SetHelpId( aHelpFile, HID_PSEUDOSHEET_BACKGROUNDOBJECTS );
- aName = SD_RESSTR(STR_PSEUDOSHEET_BACKGROUND);
+ aName = SdResId(STR_PSEUDOSHEET_BACKGROUND);
if( (pSheet = Find(aName, SD_STYLE_FAMILY_PSEUDO)) == nullptr )
{
pSheet = &Make(aName, SD_STYLE_FAMILY_PSEUDO, nUsedMask);
@@ -881,7 +881,7 @@ void SdStyleSheetPool::CreatePseudosIfNecessary()
}
pSheet->SetHelpId( aHelpFile, HID_PSEUDOSHEET_BACKGROUND );
- aName = SD_RESSTR(STR_PSEUDOSHEET_NOTES);
+ aName = SdResId(STR_PSEUDOSHEET_NOTES);
if( (pSheet = Find(aName, SD_STYLE_FAMILY_PSEUDO)) == nullptr )
{
pSheet = &Make(aName, SD_STYLE_FAMILY_PSEUDO, nUsedMask);
@@ -892,7 +892,7 @@ void SdStyleSheetPool::CreatePseudosIfNecessary()
pParent = nullptr;
SetSearchMask(SD_STYLE_FAMILY_PSEUDO);
- aName = SD_RESSTR(STR_PSEUDOSHEET_OUTLINE);
+ aName = SdResId(STR_PSEUDOSHEET_OUTLINE);
for (sal_Int32 nLevel = 1; nLevel < 10; nLevel++)
{
OUString aLevelName( aName + " " + OUString::number( nLevel ) );
@@ -1002,7 +1002,7 @@ void SdStyleSheetPool::UpdateStdNames()
{
if( nNameId )
{
- aNewName = SD_RESSTR( nNameId );
+ aNewName = SdResId( nNameId );
if( nNameId == STR_PSEUDOSHEET_OUTLINE )
{
aNewName += " " + OUString::number( sal_Int32( nHelpId - HID_PSEUDOSHEET_OUTLINE ) );
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index 9d984d001d02..ea125d3a8aad 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -417,23 +417,23 @@ SdStyleSheet* SdStyleSheet::GetRealStyleSheet() const
OUString aInternalName;
OUString aStyleName(aName);
- if (aStyleName == OUString(SdResId(STR_PSEUDOSHEET_TITLE)))
+ if (aStyleName == SdResId(STR_PSEUDOSHEET_TITLE))
{
aInternalName = STR_LAYOUT_TITLE;
}
- else if (aStyleName == OUString(SdResId(STR_PSEUDOSHEET_SUBTITLE)))
+ else if (aStyleName == SdResId(STR_PSEUDOSHEET_SUBTITLE))
{
aInternalName = STR_LAYOUT_SUBTITLE;
}
- else if (aStyleName == OUString(SdResId(STR_PSEUDOSHEET_BACKGROUND)))
+ else if (aStyleName == SdResId(STR_PSEUDOSHEET_BACKGROUND))
{
aInternalName = STR_LAYOUT_BACKGROUND;
}
- else if (aStyleName == OUString(SdResId(STR_PSEUDOSHEET_BACKGROUNDOBJECTS)))
+ else if (aStyleName == SdResId(STR_PSEUDOSHEET_BACKGROUNDOBJECTS))
{
aInternalName = STR_LAYOUT_BACKGROUNDOBJECTS;
}
- else if (aStyleName == OUString(SdResId(STR_PSEUDOSHEET_NOTES)))
+ else if (aStyleName == SdResId(STR_PSEUDOSHEET_NOTES))
{
aInternalName = STR_LAYOUT_NOTES;
}
@@ -482,23 +482,23 @@ SdStyleSheet* SdStyleSheet::GetPseudoStyleSheet() const
if (aStyleName == STR_LAYOUT_TITLE)
{
- aStyleName = OUString(SdResId(STR_PSEUDOSHEET_TITLE));
+ aStyleName = SdResId(STR_PSEUDOSHEET_TITLE);
}
else if (aStyleName == STR_LAYOUT_SUBTITLE)
{
- aStyleName = OUString(SdResId(STR_PSEUDOSHEET_SUBTITLE));
+ aStyleName = SdResId(STR_PSEUDOSHEET_SUBTITLE);
}
else if (aStyleName == STR_LAYOUT_BACKGROUND)
{
- aStyleName = OUString(SdResId(STR_PSEUDOSHEET_BACKGROUND));
+ aStyleName = SdResId(STR_PSEUDOSHEET_BACKGROUND);
}
else if (aStyleName == STR_LAYOUT_BACKGROUNDOBJECTS)
{
- aStyleName = OUString(SdResId(STR_PSEUDOSHEET_BACKGROUNDOBJECTS));
+ aStyleName = SdResId(STR_PSEUDOSHEET_BACKGROUNDOBJECTS);
}
else if (aStyleName == STR_LAYOUT_NOTES)
{
- aStyleName = OUString(SdResId(STR_PSEUDOSHEET_NOTES));
+ aStyleName = SdResId(STR_PSEUDOSHEET_NOTES);
}
else
{
@@ -507,7 +507,7 @@ SdStyleSheet* SdStyleSheet::GetPseudoStyleSheet() const
if (nPos != -1)
{
OUString aNumStr(aStyleName.copy(aOutlineStr.getLength()));
- aStyleName = OUString(SdResId(STR_PSEUDOSHEET_OUTLINE));
+ aStyleName = SdResId(STR_PSEUDOSHEET_OUTLINE);
aStyleName += aNumStr;
}
}
@@ -1331,7 +1331,7 @@ void SdStyleSheet::BroadcastSdStyleSheetChange(SfxStyleSheetBase* pStyleSheet,
if( (ePO >= PO_OUTLINE_1) && (ePO <= PO_OUTLINE_8) )
{
- OUString sStyleName(SD_RESSTR(STR_PSEUDOSHEET_OUTLINE) + " ");
+ OUString sStyleName(SdResId(STR_PSEUDOSHEET_OUTLINE) + " ");
for( sal_uInt16 n = (sal_uInt16)(ePO - PO_OUTLINE_1 + 2); n < 10; n++ )
{
diff --git a/sd/source/core/undoanim.cxx b/sd/source/core/undoanim.cxx
index dd9b68b00dee..bc7215554e21 100644
--- a/sd/source/core/undoanim.cxx
+++ b/sd/source/core/undoanim.cxx
@@ -105,7 +105,7 @@ void UndoAnimation::Redo()
OUString UndoAnimation::GetComment() const
{
- return SdResId(STR_UNDO_ANIMATION).toString();
+ return SdResId(STR_UNDO_ANIMATION);
}
struct UndoAnimationPathImpl
@@ -180,7 +180,7 @@ void UndoAnimationPath::Redo()
OUString UndoAnimationPath::GetComment() const
{
- return SdResId(STR_UNDO_ANIMATION).toString();
+ return SdResId(STR_UNDO_ANIMATION);
}
struct UndoTransitionImpl
@@ -270,7 +270,7 @@ void UndoTransition::Redo()
OUString UndoTransition::GetComment() const
{
- return SdResId(STR_UNDO_SLIDE_PARAMS).toString();
+ return SdResId(STR_UNDO_SLIDE_PARAMS);
}
}
diff --git a/sd/source/filter/grf/sdgrffilter.cxx b/sd/source/filter/grf/sdgrffilter.cxx
index 8a22c88e46bb..7e668a0ab53f 100644
--- a/sd/source/filter/grf/sdgrffilter.cxx
+++ b/sd/source/filter/grf/sdgrffilter.cxx
@@ -159,7 +159,7 @@ void SdGRFFilter::HandleGraphicFilterError( sal_uInt16 nFilterError, sal_uLong n
ErrorHandler::HandleError( ERRCODE_IO_GENERAL );
else
{
- ScopedVclPtrInstance< MessageDialog > aErrorBox(nullptr, SD_RESSTR(nId));
+ ScopedVclPtrInstance< MessageDialog > aErrorBox(nullptr, SdResId(nId));
aErrorBox->Execute();
}
}
diff --git a/sd/source/filter/html/htmlattr.cxx b/sd/source/filter/html/htmlattr.cxx
index 782e599861c6..d845494d1801 100644
--- a/sd/source/filter/html/htmlattr.cxx
+++ b/sd/source/filter/html/htmlattr.cxx
@@ -49,19 +49,19 @@ void SdHtmlAttrPreview::Paint(vcl::RenderContext& rRenderContext, const ::tools:
aTextRect.Bottom() = nHeight + aTextRect.Top();
rRenderContext.SetTextColor(m_aTextColor);
- rRenderContext.DrawText(aTextRect, SD_RESSTR(STR_HTMLATTR_TEXT), DrawTextFlags::Center | DrawTextFlags::VCenter);
+ rRenderContext.DrawText(aTextRect, SdResId(STR_HTMLATTR_TEXT), DrawTextFlags::Center | DrawTextFlags::VCenter);
aTextRect.Move(0,nHeight);
rRenderContext.SetTextColor(m_aLinkColor);
- rRenderContext.DrawText(aTextRect, SD_RESSTR(STR_HTMLATTR_LINK), DrawTextFlags::Center | DrawTextFlags::VCenter);
+ rRenderContext.DrawText(aTextRect, SdResId(STR_HTMLATTR_LINK), DrawTextFlags::Center | DrawTextFlags::VCenter);
aTextRect.Move(0,nHeight);
rRenderContext.SetTextColor(m_aALinkColor);
- rRenderContext.DrawText(aTextRect, SD_RESSTR(STR_HTMLATTR_ALINK), DrawTextFlags::Center | DrawTextFlags::VCenter);
+ rRenderContext.DrawText(aTextRect, SdResId(STR_HTMLATTR_ALINK), DrawTextFlags::Center | DrawTextFlags::VCenter);
aTextRect.Move(0,nHeight);
rRenderContext.SetTextColor(m_aVLinkColor);
- rRenderContext.DrawText(aTextRect, SD_RESSTR(STR_HTMLATTR_VLINK), DrawTextFlags::Center | DrawTextFlags::VCenter);
+ rRenderContext.DrawText(aTextRect, SdResId(STR_HTMLATTR_VLINK), DrawTextFlags::Center | DrawTextFlags::VCenter);
}
void SdHtmlAttrPreview::SetColors(Color& aBack, Color& aText, Color& aLink,
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
index 275b50fe5da0..06babc1c576b 100644
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -95,7 +95,7 @@ using namespace ::com::sun::star::document;
using namespace sdr::table;
// get parameter from Itemset
-#define RESTOHTML( res ) StringToHTMLString(SD_RESSTR(res))
+#define RESTOHTML( res ) StringToHTMLString(SdResId(res))
const char * const pButtonNames[] =
{
@@ -846,7 +846,7 @@ void HtmlExport::SetDocColors( SdPage* pPage )
void HtmlExport::InitProgress( sal_uInt16 nProgrCount )
{
- mpProgress = new SfxProgress( mpDocSh, SD_RESSTR(STR_CREATE_PAGES), nProgrCount );
+ mpProgress = new SfxProgress( mpDocSh, SdResId(STR_CREATE_PAGES), nProgrCount );
}
void HtmlExport::ResetProgress()
@@ -2417,7 +2417,7 @@ bool HtmlExport::CreateNavBarFrames()
aStr.append("<center>\r\n");
// first page
- aButton = SD_RESSTR(STR_HTMLEXP_FIRSTPAGE);
+ aButton = SdResId(STR_HTMLEXP_FIRSTPAGE);
if(mnButtonThema != -1)
aButton = CreateImage(GetButtonName((nFile == 0 || mnSdPageCount == 1?
BTN_FIRST_0:BTN_FIRST_1)), aButton);
@@ -2429,7 +2429,7 @@ bool HtmlExport::CreateNavBarFrames()
aStr.append("\r\n");
// to the previous page
- aButton = SD_RESSTR(STR_PUBLISH_BACK);
+ aButton = SdResId(STR_PUBLISH_BACK);
if(mnButtonThema != -1)
aButton = CreateImage(GetButtonName((nFile == 0 || mnSdPageCount == 1?
BTN_PREV_0:BTN_PREV_1)), aButton);
@@ -2441,7 +2441,7 @@ bool HtmlExport::CreateNavBarFrames()
aStr.append("\r\n");
// to the next page
- aButton = SD_RESSTR(STR_PUBLISH_NEXT);
+ aButton = SdResId(STR_PUBLISH_NEXT);
if(mnButtonThema != -1)
aButton = CreateImage(GetButtonName((nFile ==2 || mnSdPageCount == 1?
BTN_NEXT_0:BTN_NEXT_1)), aButton);
@@ -2453,7 +2453,7 @@ bool HtmlExport::CreateNavBarFrames()
aStr.append("\r\n");
// to the last page
- aButton = SD_RESSTR(STR_HTMLEXP_LASTPAGE);
+ aButton = SdResId(STR_HTMLEXP_LASTPAGE);
if(mnButtonThema != -1)
aButton = CreateImage(GetButtonName((nFile ==2 || mnSdPageCount == 1?
BTN_LAST_0:BTN_LAST_1)), aButton);
@@ -2472,7 +2472,7 @@ bool HtmlExport::CreateNavBarFrames()
// content
if (mbContentsPage)
{
- aButton = SD_RESSTR(STR_PUBLISH_OUTLINE);
+ aButton = SdResId(STR_PUBLISH_OUTLINE);
if(mnButtonThema != -1)
aButton = CreateImage(GetButtonName(BTN_INDEX), aButton);
@@ -2484,7 +2484,7 @@ bool HtmlExport::CreateNavBarFrames()
// text mode
if(mbImpress)
{
- aButton = SD_RESSTR(STR_HTMLEXP_SETTEXT);
+ aButton = SdResId(STR_HTMLEXP_SETTEXT);
if(mnButtonThema != -1)
aButton = CreateImage(GetButtonName(BTN_TEXT), aButton);
@@ -2515,7 +2515,7 @@ bool HtmlExport::CreateNavBarFrames()
aStr.append("</title>\r\n</head>\r\n");
aStr.append(CreateBodyTag());
- aButton = SD_RESSTR(STR_HTMLEXP_OUTLINE);
+ aButton = SdResId(STR_HTMLEXP_OUTLINE);
if(mnButtonThema != -1)
aButton = CreateImage(GetButtonName(BTN_MORE), aButton);
@@ -2538,7 +2538,7 @@ bool HtmlExport::CreateNavBarFrames()
aStr.append("</title>\r\n</head>\r\n");
aStr.append(CreateBodyTag());
- aButton = SD_RESSTR(STR_HTMLEXP_NOOUTLINE);
+ aButton = SdResId(STR_HTMLEXP_NOOUTLINE);
if(mnButtonThema != -1)
aButton = CreateImage(GetButtonName(BTN_LESS), aButton);
@@ -2559,19 +2559,19 @@ bool HtmlExport::CreateNavBarFrames()
OUString HtmlExport::CreateNavBar( sal_uInt16 nSdPage, bool bIsText ) const
{
// prepare button bar
- OUString aStrNavFirst(SD_RESSTR(STR_HTMLEXP_FIRSTPAGE));
- OUString aStrNavPrev(SD_RESSTR(STR_PUBLISH_BACK));
- OUString aStrNavNext(SD_RESSTR(STR_PUBLISH_NEXT));
- OUString aStrNavLast(SD_RESSTR(STR_HTMLEXP_LASTPAGE));
- OUString aStrNavContent(SD_RESSTR(STR_PUBLISH_OUTLINE));
+ OUString aStrNavFirst(SdResId(STR_HTMLEXP_FIRSTPAGE));
+ OUString aStrNavPrev(SdResId(STR_PUBLISH_BACK));
+ OUString aStrNavNext(SdResId(STR_PUBLISH_NEXT));
+ OUString aStrNavLast(SdResId(STR_HTMLEXP_LASTPAGE));
+ OUString aStrNavContent(SdResId(STR_PUBLISH_OUTLINE));
OUString aStrNavText;
if( bIsText )
{
- aStrNavText = SD_RESSTR(STR_HTMLEXP_SETGRAPHIC);
+ aStrNavText = SdResId(STR_HTMLEXP_SETGRAPHIC);
}
else
{
- aStrNavText = SD_RESSTR(STR_HTMLEXP_SETTEXT);
+ aStrNavText = SdResId(STR_HTMLEXP_SETTEXT);
}
if(!bIsText && mnButtonThema != -1)
@@ -3101,7 +3101,7 @@ bool HtmlExport::checkForExistingFiles()
if( pResMgr )
{
ResId aResId( 4077, *pResMgr );
- OUString aMsg( aResId.toString() );
+ OUString aMsg( aResId );
OUString aSystemPath;
osl::FileBase::getSystemPathFromFileURL( maExportPath, aSystemPath );
@@ -3232,7 +3232,7 @@ bool HtmlErrorContext::GetString( sal_uInt32, OUString& rCtxStr )
if( mnResId == 0 )
return false;
- rCtxStr = SdResId( mnResId ).toString();
+ rCtxStr = SdResId(mnResId);
rCtxStr = rCtxStr.replaceAll( "$(URL1)", maURL1 );
rCtxStr = rCtxStr.replaceAll( "$(URL2)", maURL2 );
diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx
index 9526ab2bdf4c..7b269d760061 100644
--- a/sd/source/filter/html/pubdlg.cxx
+++ b/sd/source/filter/html/pubdlg.cxx
@@ -1153,7 +1153,7 @@ IMPL_LINK_NOARG(SdPublishingDlg, FinishHdl, Button*, void)
if (iter != m_aDesignList.end())
{
- ScopedVclPtrInstance<MessageDialog> aErrorBox(this, SD_RESSTR(STR_PUBDLG_SAMENAME),
+ ScopedVclPtrInstance<MessageDialog> aErrorBox(this, SdResId(STR_PUBDLG_SAMENAME),
VclMessageType::Error, VclButtonsType::YesNo);
bRetry = aErrorBox->Execute() == RET_NO;
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 0101a5243034..be701d617712 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -246,8 +246,8 @@ bool ImplSdPPTImport::Import()
((EditEngine&)rOutl.GetEditEngine()).SetControlWord( nControlWord );
SdrLayerAdmin& rAdmin = mpDoc->GetLayerAdmin();
- mnBackgroundLayerID = rAdmin.GetLayerID( SD_RESSTR( STR_LAYER_BCKGRND ) );
- mnBackgroundObjectsLayerID = rAdmin.GetLayerID( SD_RESSTR( STR_LAYER_BCKGRNDOBJ ) );
+ mnBackgroundLayerID = rAdmin.GetLayerID( SdResId( STR_LAYER_BCKGRND ) );
+ mnBackgroundObjectsLayerID = rAdmin.GetLayerID( SdResId( STR_LAYER_BCKGRNDOBJ ) );
::sd::DrawDocShell* pDocShell = mpDoc->GetDocSh();
if ( pDocShell )
@@ -564,7 +564,7 @@ bool ImplSdPPTImport::Import()
if (!utl::ConfigManager::IsAvoidConfig())
{
xStbMgr.reset(new SfxProgress(pDocShell,
- SD_RESSTR( STR_POWERPOINT_IMPORT),
+ SdResId( STR_POWERPOINT_IMPORT),
m_pMasterPages->size() +
m_pSlidePages->size() + m_pNotePages->size()));
}
@@ -598,7 +598,7 @@ bool ImplSdPPTImport::Import()
if ( nMasterNum == 1 )
{
// standardsheet
- pSheet = static_cast<SfxStyleSheet*>(mpDoc->GetStyleSheetPool()->Find(SD_RESSTR(STR_STANDARD_STYLESHEET_NAME), SD_STYLE_FAMILY_GRAPHICS ));
+ pSheet = static_cast<SfxStyleSheet*>(mpDoc->GetStyleSheetPool()->Find(SdResId(STR_STANDARD_STYLESHEET_NAME), SD_STYLE_FAMILY_GRAPHICS ));
if ( pSheet )
{
SfxItemSet& rItemSet = pSheet->GetItemSet();
@@ -611,7 +611,7 @@ bool ImplSdPPTImport::Import()
}
// PSEUDO
- pSheet = static_cast<SfxStyleSheet*>(mpDoc->GetStyleSheetPool()->Find(SD_RESSTR(STR_PSEUDOSHEET_BACKGROUNDOBJECTS), SD_STYLE_FAMILY_PSEUDO ));
+ pSheet = static_cast<SfxStyleSheet*>(mpDoc->GetStyleSheetPool()->Find(SdResId(STR_PSEUDOSHEET_BACKGROUNDOBJECTS), SD_STYLE_FAMILY_PSEUDO ));
if ( pSheet )
{
SfxItemSet& rItemSet = pSheet->GetItemSet();
@@ -625,12 +625,12 @@ bool ImplSdPPTImport::Import()
// create layoutstylesheets, set layoutname and stylesheet
// (only on standard and not pages)
- OUString aLayoutName( SD_RESSTR( STR_LAYOUT_DEFAULT_NAME ) );
+ OUString aLayoutName( SdResId( STR_LAYOUT_DEFAULT_NAME ) );
if ( nMasterNum > 2 )
{
if ( ePgKind == PageKind::Standard )
{ // standard page: create new presentation layout
- aLayoutName = SD_RESSTR( STR_LAYOUT_DEFAULT_TITLE_NAME );
+ aLayoutName = SdResId( STR_LAYOUT_DEFAULT_TITLE_NAME );
aLayoutName += OUString::number( (sal_Int32)( ( nMasterNum + 1 ) / 2 - 1 ) );
static_cast<SdStyleSheetPool*>( mpDoc->GetStyleSheetPool() )->CreateLayoutStyleSheets( aLayoutName );
}
@@ -2279,10 +2279,10 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj
case PRESOBJ_SLIDENUMBER :
case PRESOBJ_FOOTER :
case PRESOBJ_HEADER :
- pSheet = static_cast<SfxStyleSheet*>(mpDoc->GetStyleSheetPool()->Find(SD_RESSTR(STR_PSEUDOSHEET_BACKGROUNDOBJECTS), SD_STYLE_FAMILY_PSEUDO ));
+ pSheet = static_cast<SfxStyleSheet*>(mpDoc->GetStyleSheetPool()->Find(SdResId(STR_PSEUDOSHEET_BACKGROUNDOBJECTS), SD_STYLE_FAMILY_PSEUDO ));
break;
default :
- pSheet = static_cast<SfxStyleSheet*>(mpDoc->GetStyleSheetPool()->Find(SD_RESSTR(STR_STANDARD_STYLESHEET_NAME), SD_STYLE_FAMILY_GRAPHICS ));
+ pSheet = static_cast<SfxStyleSheet*>(mpDoc->GetStyleSheetPool()->Find(SdResId(STR_STANDARD_STYLESHEET_NAME), SD_STYLE_FAMILY_GRAPHICS ));
}
}
break;
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx
index c4df696242b2..b84854e68b94 100644
--- a/sd/source/filter/xml/sdxmlwrp.cxx
+++ b/sd/source/filter/xml/sdxmlwrp.cxx
@@ -523,7 +523,7 @@ bool SdXMLFilter::Import( ErrCode& nError )
{
sal_Int32 nProgressRange(1000000);
sal_Int32 nProgressCurrent(0);
- OUString aMsg(SD_RESSTR(STR_LOAD_DOC));
+ OUString aMsg(SdResId(STR_LOAD_DOC));
mxStatusIndicator->start(aMsg, nProgressRange);
// set ProgressRange
@@ -892,7 +892,7 @@ bool SdXMLFilter::Export()
{
sal_Int32 nProgressRange(1000000);
sal_Int32 nProgressCurrent(0);
- OUString aMsg(SD_RESSTR(STR_SAVE_DOC));
+ OUString aMsg(SdResId(STR_SAVE_DOC));
mxStatusIndicator->start(aMsg, nProgressRange);
// set ProgressRange
diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
index 6a597c6d95ce..d23f72b82d94 100644
--- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
+++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
@@ -545,26 +545,26 @@ OUString AccessibleDrawDocumentView::CreateAccessibleName()
{
SolarMutexGuard aGuard;
- sName = SD_RESSTR(SID_SD_A11Y_I_DRAWVIEW_N);
+ sName = SdResId(SID_SD_A11Y_I_DRAWVIEW_N);
}
else
{
SolarMutexGuard aGuard;
- sName = SD_RESSTR(SID_SD_A11Y_D_DRAWVIEW_N);
+ sName = SdResId(SID_SD_A11Y_D_DRAWVIEW_N);
}
}
else if ( sFirstService == "com.sun.star.presentation.NotesView" )
{
SolarMutexGuard aGuard;
- sName = SD_RESSTR(SID_SD_A11Y_I_NOTESVIEW_N);
+ sName = SdResId(SID_SD_A11Y_I_NOTESVIEW_N);
}
else if ( sFirstService == "com.sun.star.presentation.HandoutView" )
{
SolarMutexGuard aGuard;
- sName = SD_RESSTR(SID_SD_A11Y_I_HANDOUTVIEW_N);
+ sName = SdResId(SID_SD_A11Y_I_HANDOUTVIEW_N);
}
else
{
@@ -597,26 +597,26 @@ OUString
{
SolarMutexGuard aGuard;
- sDescription = SD_RESSTR(SID_SD_A11Y_I_DRAWVIEW_D);
+ sDescription = SdResId(SID_SD_A11Y_I_DRAWVIEW_D);
}
else
{
SolarMutexGuard aGuard;
- sDescription = SD_RESSTR(SID_SD_A11Y_D_DRAWVIEW_D);
+ sDescription = SdResId(SID_SD_A11Y_D_DRAWVIEW_D);
}
}
else if ( sFirstService == "com.sun.star.presentation.NotesView" )
{
SolarMutexGuard aGuard;
- sDescription = SD_RESSTR(SID_SD_A11Y_I_NOTESVIEW_D);
+ sDescription = SdResId(SID_SD_A11Y_I_NOTESVIEW_D);
}
else if ( sFirstService == "com.sun.star.presentation.HandoutView" )
{
SolarMutexGuard aGuard;
- sDescription = SD_RESSTR(SID_SD_A11Y_I_HANDOUTVIEW_D);
+ sDescription = SdResId(SID_SD_A11Y_I_HANDOUTVIEW_D);
}
else
{
diff --git a/sd/source/ui/accessibility/AccessibleOutlineView.cxx b/sd/source/ui/accessibility/AccessibleOutlineView.cxx
index 0d627e3b99fd..4b77cce1ef73 100644
--- a/sd/source/ui/accessibility/AccessibleOutlineView.cxx
+++ b/sd/source/ui/accessibility/AccessibleOutlineView.cxx
@@ -243,7 +243,7 @@ OUString
{
SolarMutexGuard aGuard;
- return SD_RESSTR(SID_SD_A11Y_I_OUTLINEVIEW_N);
+ return SdResId(SID_SD_A11Y_I_OUTLINEVIEW_N);
}
/** Create a description for this view. Use the model's description or URL
@@ -254,7 +254,7 @@ OUString
{
SolarMutexGuard aGuard;
- return SD_RESSTR(SID_SD_A11Y_I_OUTLINEVIEW_D);
+ return SdResId(SID_SD_A11Y_I_OUTLINEVIEW_D);
}
void AccessibleOutlineView::UpdateChildren()
diff --git a/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx b/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx
index 0cfc2e52f120..c06f1e4de365 100644
--- a/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx
+++ b/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx
@@ -88,17 +88,17 @@ OUString
{
case PRESENTATION_OLE:
aDG.Initialize ("PresentationOLEShape");
- //SVX_RESSTR(RID_SVXSTR_A11Y_ST_RECTANGLE));
+ //SvxResId(RID_SVXSTR_A11Y_ST_RECTANGLE));
aDG.AddProperty ("CLSID" ,DescriptionGenerator::PropertyType::String);
break;
case PRESENTATION_CHART:
aDG.Initialize ("PresentationChartShape");
- //SVX_RESSTR(RID_SVXSTR_A11Y_ST_RECTANGLE));
+ //SvxResId(RID_SVXSTR_A11Y_ST_RECTANGLE));
aDG.AddProperty ( "CLSID" , DescriptionGenerator::PropertyType::String);
break;
case PRESENTATION_TABLE:
aDG.Initialize ("PresentationTableShape");
- //SVX_RESSTR(RID_SVXSTR_A11Y_ST_RECTANGLE));
+ //SvxResId(RID_SVXSTR_A11Y_ST_RECTANGLE));
aDG.AddProperty ("CLSID" , DescriptionGenerator::PropertyType::String);
break;
default:
diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
index 6f2c5853b352..de850ce3564d 100644
--- a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
+++ b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
@@ -163,7 +163,7 @@ sal_Int16 SAL_CALL AccessibleSlideSorterObject::getAccessibleRole()
OUString SAL_CALL AccessibleSlideSorterObject::getAccessibleDescription()
{
ThrowIfDisposed();
- return SD_RESSTR(STR_PAGE);
+ return SdResId(STR_PAGE);
}
OUString SAL_CALL AccessibleSlideSorterObject::getAccessibleName()
diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
index c3ac9d6aa3cf..87341404435d 100644
--- a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
+++ b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
@@ -261,7 +261,7 @@ OUString SAL_CALL AccessibleSlideSorterView::getAccessibleDescription()
ThrowIfDisposed();
SolarMutexGuard aGuard;
- return SD_RESSTR(SID_SD_A11Y_I_SLIDEVIEW_D);
+ return SdResId(SID_SD_A11Y_I_SLIDEVIEW_D);
}
OUString SAL_CALL AccessibleSlideSorterView::getAccessibleName()
@@ -269,7 +269,7 @@ OUString SAL_CALL AccessibleSlideSorterView::getAccessibleName()
ThrowIfDisposed();
SolarMutexGuard aGuard;
- return SD_RESSTR(SID_SD_A11Y_I_SLIDEVIEW_N);
+ return SdResId(SID_SD_A11Y_I_SLIDEVIEW_N);
}
Reference<XAccessibleRelationSet> SAL_CALL
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx
index 564963f923af..115abbb07053 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -900,7 +900,7 @@ FontStylePropertyBox::FontStylePropertyBox( sal_Int32 nControlType, vcl::Window*
, maModifyHdl( rModifyHdl )
{
mpEdit.set( VclPtr<Edit>::Create( pParent, WB_TABSTOP|WB_IGNORETAB|WB_NOBORDER|WB_READONLY) );
- mpEdit->SetText( SD_RESSTR(STR_CUSTOMANIMATION_SAMPLE) );
+ mpEdit->SetText( SdResId(STR_CUSTOMANIMATION_SAMPLE) );
mpMenu = maBuilder.get_menu("menu");
mpControl = VclPtr<DropdownMenuBox>::Create( pParent, mpEdit, mpMenu );
@@ -1455,14 +1455,14 @@ void CustomAnimationEffectTabPage::fillSoundListBox()
GalleryExplorer::FillObjList( GALLERY_THEME_SOUNDS, maSoundList );
GalleryExplorer::FillObjList( GALLERY_THEME_USERSOUNDS, maSoundList );
- mpLBSound->InsertEntry( SD_RESSTR(STR_CUSTOMANIMATION_NO_SOUND) );
- mpLBSound->InsertEntry( SD_RESSTR(STR_CUSTOMANIMATION_STOP_PREVIOUS_SOUND) );
+ mpLBSound->InsertEntry( SdResId(STR_CUSTOMANIMATION_NO_SOUND) );
+ mpLBSound->InsertEntry( SdResId(STR_CUSTOMANIMATION_STOP_PREVIOUS_SOUND) );
for(const OUString & rString : maSoundList)
{
INetURLObject aURL( rString );
mpLBSound->InsertEntry( aURL.GetBase() );
}
- mpLBSound->InsertEntry( SD_RESSTR(STR_CUSTOMANIMATION_BROWSE_SOUND) );
+ mpLBSound->InsertEntry( SdResId(STR_CUSTOMANIMATION_BROWSE_SOUND) );
}
void CustomAnimationEffectTabPage::clearSoundListBox()
@@ -1516,7 +1516,7 @@ void CustomAnimationEffectTabPage::openSoundFileDialog()
}
else
{
- OUString aStrWarning(SD_RESSTR(STR_WARNING_NOSOUNDFILE));
+ OUString aStrWarning(SdResId(STR_WARNING_NOSOUNDFILE));
aStrWarning = aStrWarning.replaceFirst("%", aFile);
ScopedVclPtrInstance< WarningBox > aWarningBox( nullptr, WB_3DLOOK | WB_RETRY_CANCEL, aStrWarning );
aWarningBox->SetModalInputMode (true);
diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx
index 96bf05f32ccd..fa7aa1281bbd 100644
--- a/sd/source/ui/animations/CustomAnimationList.cxx
+++ b/sd/source/ui/animations/CustomAnimationList.cxx
@@ -231,13 +231,13 @@ CustomAnimationListEntryItem::CustomAnimationListEntryItem( const OUString& aDes
switch(mpEffect->getPresetClass())
{
case EffectPresetClass::ENTRANCE:
- msEffectName = SD_RESSTR(STR_CUSTOMANIMATION_ENTRANCE); break;
+ msEffectName = SdResId(STR_CUSTOMANIMATION_ENTRANCE); break;
case EffectPresetClass::EXIT:
- msEffectName = SD_RESSTR(STR_CUSTOMANIMATION_EXIT); break;
+ msEffectName = SdResId(STR_CUSTOMANIMATION_EXIT); break;
case EffectPresetClass::EMPHASIS:
- msEffectName = SD_RESSTR(STR_CUSTOMANIMATION_EMPHASIS); break;
+ msEffectName = SdResId(STR_CUSTOMANIMATION_EMPHASIS); break;
case EffectPresetClass::MOTIONPATH:
- msEffectName = SD_RESSTR(STR_CUSTOMANIMATION_MOTION_PATHS); break;
+ msEffectName = SdResId(STR_CUSTOMANIMATION_MOTION_PATHS); break;
}
msEffectName = msEffectName.replaceFirst( "%1" , mpCustomAnimationPresets->getUINameForPresetId(mpEffect->getPresetId()));
}
@@ -635,7 +635,7 @@ void CustomAnimationList::update()
{
SvTreeListEntry* pLBoxEntry = new CustomAnimationListEntry;
pLBoxEntry->AddItem(o3tl::make_unique<SvLBoxContextBmp>(Image(), Image(), false));
- OUString aDescription = SD_RESSTR(STR_CUSTOMANIMATION_TRIGGER);
+ OUString aDescription = SdResId(STR_CUSTOMANIMATION_TRIGGER);
aDescription += ": ";
aDescription += getShapeDescription( xShape, false );
pLBoxEntry->AddItem(o3tl::make_unique<CustomAnimationTriggerEntryItem>(aDescription));
@@ -960,7 +960,7 @@ void CustomAnimationList::Paint(vcl::RenderContext& rRenderContext, const ::tool
aRect.Right() -= aOffset.X();
aRect.Bottom() -= aOffset.Y();
- rRenderContext.DrawText(aRect, SD_RESSTR(STR_CUSTOMANIMATION_LIST_HELPTEXT),
+ rRenderContext.DrawText(aRect, SdResId(STR_CUSTOMANIMATION_LIST_HELPTEXT),
DrawTextFlags::MultiLine | DrawTextFlags::WordBreak | DrawTextFlags::Center | DrawTextFlags::VCenter );
rRenderContext.SetTextColor(aOldColor);
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index e089514c0133..715bdc97b327 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -109,7 +109,7 @@ namespace sd {
void fillRepeatComboBox( ListBox* pBox )
{
- OUString aNone( SD_RESSTR( STR_CUSTOMANIMATION_REPEAT_NONE ) );
+ OUString aNone( SdResId( STR_CUSTOMANIMATION_REPEAT_NONE ) );
pBox->InsertEntry(aNone);
pBox->InsertEntry(OUString::number(2));
pBox->InsertEntry(OUString::number(3));
@@ -117,10 +117,10 @@ void fillRepeatComboBox( ListBox* pBox )
pBox->InsertEntry(OUString::number(5));
pBox->InsertEntry(OUString::number(10));
- OUString aUntilClick( SD_RESSTR( STR_CUSTOMANIMATION_REPEAT_UNTIL_NEXT_CLICK ) );
+ OUString aUntilClick( SdResId( STR_CUSTOMANIMATION_REPEAT_UNTIL_NEXT_CLICK ) );
pBox->InsertEntry(aUntilClick);
- OUString aEndOfSlide( SD_RESSTR( STR_CUSTOMANIMATION_REPEAT_UNTIL_END_OF_SLIDE ) );
+ OUString aEndOfSlide( SdResId( STR_CUSTOMANIMATION_REPEAT_UNTIL_END_OF_SLIDE ) );
pBox->InsertEntry(aEndOfSlide);
}
@@ -441,55 +441,55 @@ OUString getPropertyName( sal_Int32 nPropertyType )
switch( nPropertyType )
{
case nPropertyTypeDirection:
- return SD_RESSTR(STR_CUSTOMANIMATION_DIRECTION_PROPERTY);
+ return SdResId(STR_CUSTOMANIMATION_DIRECTION_PROPERTY);
case nPropertyTypeSpokes:
- return SD_RESSTR(STR_CUSTOMANIMATION_SPOKES_PROPERTY);
+ return SdResId(STR_CUSTOMANIMATION_SPOKES_PROPERTY);
case nPropertyTypeFirstColor:
- return SD_RESSTR(STR_CUSTOMANIMATION_FIRST_COLOR_PROPERTY);
+ return SdResId(STR_CUSTOMANIMATION_FIRST_COLOR_PROPERTY);
case nPropertyTypeSecondColor:
- return SD_RESSTR(STR_CUSTOMANIMATION_SECOND_COLOR_PROPERTY);
+ return SdResId(STR_CUSTOMANIMATION_SECOND_COLOR_PROPERTY);
case nPropertyTypeZoom:
- return SD_RESSTR(STR_CUSTOMANIMATION_ZOOM_PROPERTY);
+ return SdResId(STR_CUSTOMANIMATION_ZOOM_PROPERTY);
case nPropertyTypeFillColor:
- return SD_RESSTR(STR_CUSTOMANIMATION_FILL_COLOR_PROPERTY);
+ return SdResId(STR_CUSTOMANIMATION_FILL_COLOR_PROPERTY);
case nPropertyTypeColorStyle:
- return SD_RESSTR(STR_CUSTOMANIMATION_STYLE_PROPERTY);
+ return SdResId(STR_CUSTOMANIMATION_STYLE_PROPERTY);
case nPropertyTypeFont:
- return SD_RESSTR(STR_CUSTOMANIMATION_FONT_PROPERTY);
+ return SdResId(STR_CUSTOMANIMATION_FONT_PROPERTY);
case nPropertyTypeCharHeight:
- return SD_RESSTR(STR_CUSTOMANIMATION_SIZE_PROPERTY);
+ return SdResId(STR_CUSTOMANIMATION_SIZE_PROPERTY);
case nPropertyTypeCharColor:
- return SD_RESSTR(STR_CUSTOMANIMATION_FONT_COLOR_PROPERTY);
+ return SdResId(STR_CUSTOMANIMATION_FONT_COLOR_PROPERTY);
case nPropertyTypeCharHeightStyle:
- return SD_RESSTR(STR_CUSTOMANIMATION_FONT_SIZE_STYLE_PROPERTY);
+ return SdResId(STR_CUSTOMANIMATION_FONT_SIZE_STYLE_PROPERTY);
case nPropertyTypeCharDecoration:
- return SD_RESSTR(STR_CUSTOMANIMATION_FONT_STYLE_PROPERTY);
+ return SdResId(STR_CUSTOMANIMATION_FONT_STYLE_PROPERTY);
case nPropertyTypeLineColor:
- return SD_RESSTR(STR_CUSTOMANIMATION_LINE_COLOR_PROPERTY);
+ return SdResId(STR_CUSTOMANIMATION_LINE_COLOR_PROPERTY);
case nPropertyTypeRotate:
- return SD_RESSTR(STR_CUSTOMANIMATION_AMOUNT_PROPERTY);
+ return SdResId(STR_CUSTOMANIMATION_AMOUNT_PROPERTY);
case nPropertyTypeColor:
- return SD_RESSTR(STR_CUSTOMANIMATION_COLOR_PROPERTY);
+ return SdResId(STR_CUSTOMANIMATION_COLOR_PROPERTY);
case nPropertyTypeTransparency:
- return SD_RESSTR(STR_CUSTOMANIMATION_AMOUNT_PROPERTY);
+ return SdResId(STR_CUSTOMANIMATION_AMOUNT_PROPERTY);
case nPropertyTypeScale:
- return SD_RESSTR(STR_CUSTOMANIMATION_SCALE_PROPERTY);
+ return SdResId(STR_CUSTOMANIMATION_SCALE_PROPERTY);
}
return OUString();
@@ -2210,7 +2210,7 @@ sal_uInt32 CustomAnimationPane::fillAnimationLB( bool bHasText )
if(nPosition == mnMotionPathPos)
{
- OUString sMotionPathLabel( SD_RESSTR( STR_CUSTOMANIMATION_USERPATH ) );
+ OUString sMotionPathLabel( SdResId( STR_CUSTOMANIMATION_USERPATH ) );
mpLBAnimation->InsertCategory( sMotionPathLabel );
mnCurvePathPos = mpLBAnimation->InsertEntry( sdr::GetResourceString(STR_ObjNameSingulCOMBLINE) );
mnPolygonPathPos = mpLBAnimation->InsertEntry( sdr::GetResourceString(STR_ObjNameSingulPOLY) );
diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx
index 387b8172db66..c6aef5197813 100644
--- a/sd/source/ui/animations/SlideTransitionPane.cxx
+++ b/sd/source/ui/animations/SlideTransitionPane.cxx
@@ -462,7 +462,7 @@ void SlideTransitionPane::Initialize(SdDrawDocument* pDoc)
// dummy list box of slide transitions for startup.
mpVS_TRANSITION_ICONS->InsertItem(
0, Image( BitmapEx( "sd/cmd/transition-none.png" ) ),
- SD_RESSTR( STR_SLIDETRANSITION_NONE ),
+ SdResId( STR_SLIDETRANSITION_NONE ),
VALUESET_APPEND, /* show legend */ true );
mpVS_TRANSITION_ICONS->RecalculateItemSizes();
@@ -763,7 +763,7 @@ void SlideTransitionPane::openSoundFileDialog()
}
else
{
- OUString aStrWarning(SD_RESSTR(STR_WARNING_NOSOUNDFILE));
+ OUString aStrWarning(SdResId(STR_WARNING_NOSOUNDFILE));
aStrWarning = aStrWarning.replaceFirst("%", aFile);
ScopedVclPtrInstance< WarningBox > aWarningBox( nullptr, WB_3DLOOK | WB_RETRY_CANCEL, aStrWarning );
aWarningBox->SetModalInputMode (true);
diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx
index 3701957bc67a..9a0e7f0420f5 100644
--- a/sd/source/ui/annotations/annotationmanager.cxx
+++ b/sd/source/ui/annotations/annotationmanager.cxx
@@ -478,7 +478,7 @@ void AnnotationManagerImpl::InsertAnnotation(const OUString& rText)
if( pPage )
{
if( mpDoc->IsUndoEnabled() )
- mpDoc->BegUndo( SD_RESSTR( STR_ANNOTATION_UNDO_INSERT ) );
+ mpDoc->BegUndo( SdResId( STR_ANNOTATION_UNDO_INSERT ) );
// find free space for new annotation
int y = 0, x = 0;
@@ -600,10 +600,10 @@ void AnnotationManagerImpl::ExecuteReplyToAnnotation( SfxRequest& rReq )
SdDrawDocument::SetCalcFieldValueHdl( pOutliner.get() );
pOutliner->SetUpdateMode( true );
- OUString aStr(SD_RESSTR(STR_ANNOTATION_REPLY));
+ OUString aStr(SdResId(STR_ANNOTATION_REPLY));
OUString sAuthor( xAnnotation->getAuthor() );
if( sAuthor.isEmpty() )
- sAuthor = SD_RESSTR( STR_ANNOTATION_NOAUTHOR );
+ sAuthor = SdResId( STR_ANNOTATION_NOAUTHOR );
aStr = aStr.replaceFirst("%1", sAuthor);
@@ -671,7 +671,7 @@ void AnnotationManagerImpl::DeleteAnnotation( const Reference< XAnnotation >& xA
if( xAnnotation.is() && pPage )
{
if( mpDoc->IsUndoEnabled() )
- mpDoc->BegUndo( SD_RESSTR( STR_ANNOTATION_UNDO_DELETE ) );
+ mpDoc->BegUndo( SdResId( STR_ANNOTATION_UNDO_DELETE ) );
pPage->removeAnnotation( xAnnotation );
@@ -685,7 +685,7 @@ void AnnotationManagerImpl::DeleteAnnotation( const Reference< XAnnotation >& xA
void AnnotationManagerImpl::DeleteAnnotationsByAuthor( const OUString& sAuthor )
{
if( mpDoc->IsUndoEnabled() )
- mpDoc->BegUndo( SD_RESSTR( STR_ANNOTATION_UNDO_DELETE ) );
+ mpDoc->BegUndo( SdResId( STR_ANNOTATION_UNDO_DELETE ) );
SdPage* pPage = nullptr;
do
@@ -715,7 +715,7 @@ void AnnotationManagerImpl::DeleteAnnotationsByAuthor( const OUString& sAuthor )
void AnnotationManagerImpl::DeleteAllAnnotations()
{
if( mpDoc->IsUndoEnabled() )
- mpDoc->BegUndo( SD_RESSTR( STR_ANNOTATION_UNDO_DELETE ) );
+ mpDoc->BegUndo( SdResId( STR_ANNOTATION_UNDO_DELETE ) );
SdPage* pPage = nullptr;
do
@@ -887,7 +887,7 @@ void AnnotationManagerImpl::SelectNextAnnotation(bool bForeward)
// Pop up question box that asks the user whether to wrap around.
// The dialog is made modal with respect to the whole application.
- ScopedVclPtrInstance< QueryBox > aQuestionBox( nullptr, (WB_YES_NO | WB_DEF_YES), SD_RESSTR(nStringId));
+ ScopedVclPtrInstance< QueryBox > aQuestionBox( nullptr, (WB_YES_NO | WB_DEF_YES), SdResId(nStringId));
aQuestionBox->SetImage( QueryBox::GetStandardImage() );
if (aQuestionBox->Execute() != RET_YES)
break;
@@ -1145,7 +1145,7 @@ void AnnotationManagerImpl::ExecuteAnnotationContextMenu( const Reference< XAnno
OUString aStr(pMenu->GetItemText(pMenu->GetItemId("deleteby")));
OUString aReplace( sAuthor );
if( aReplace.isEmpty() )
- aReplace = SD_RESSTR( STR_ANNOTATION_NOAUTHOR );
+ aReplace = SdResId( STR_ANNOTATION_NOAUTHOR );
aStr = aStr.replaceFirst("%1", aReplace);
pMenu->SetItemText(pMenu->GetItemId("deleteby"), aStr);
pMenu->EnableItem(pMenu->GetItemId("reply"), (sAuthor != sCurrentAuthor) && !bReadOnly);
diff --git a/sd/source/ui/annotations/annotationtag.cxx b/sd/source/ui/annotations/annotationtag.cxx
index 78e53f9eff68..9006600efde4 100644
--- a/sd/source/ui/annotations/annotationtag.cxx
+++ b/sd/source/ui/annotations/annotationtag.cxx
@@ -365,7 +365,7 @@ void AnnotationTag::Move( int nDX, int nDY )
if( mxAnnotation.is() )
{
if( mrManager.GetDoc()->IsUndoEnabled() )
- mrManager.GetDoc()->BegUndo( SD_RESSTR( STR_ANNOTATION_UNDO_MOVE ) );
+ mrManager.GetDoc()->BegUndo( SdResId( STR_ANNOTATION_UNDO_MOVE ) );
RealPoint2D aPosition( mxAnnotation->getPosition() );
aPosition.X += (double)nDX / 100.0;
diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx
index 18bca50855a1..e3c30d990109 100644
--- a/sd/source/ui/annotations/annotationwindow.cxx
+++ b/sd/source/ui/annotations/annotationwindow.cxx
@@ -611,7 +611,7 @@ void AnnotationWindow::Deactivate()
if( pOPO )
{
if( mpDoc->IsUndoEnabled() )
- mpDoc->BegUndo( SD_RESSTR( STR_ANNOTATION_UNDO_EDIT ) );
+ mpDoc->BegUndo( SdResId( STR_ANNOTATION_UNDO_EDIT ) );
pTextApi->SetText( *pOPO );
delete pOPO;
diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx
index 53d0750ede7b..094becb271fc 100644
--- a/sd/source/ui/app/sdmod1.cxx
+++ b/sd/source/ui/app/sdmod1.cxx
@@ -232,7 +232,7 @@ void SdModule::Execute(SfxRequest& rReq)
}
else
{
- ScopedVclPtrInstance<MessageDialog>(nullptr, SD_RESSTR(STR_CANT_PERFORM_IN_LIVEMODE))->Execute();
+ ScopedVclPtrInstance<MessageDialog>(nullptr, SdResId(STR_CANT_PERFORM_IN_LIVEMODE))->Execute();
const SfxLinkItem* pLinkItem = rReq.GetArg<SfxLinkItem>(SID_DONELINK);
if( pLinkItem )
diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx
index c19ae34d1919..4ddeb6ff5eec 100644
--- a/sd/source/ui/app/sdmod2.cxx
+++ b/sd/source/ui/app/sdmod2.cxx
@@ -245,7 +245,7 @@ IMPL_LINK(SdModule, CalcFieldValueHdl, EditFieldInfo*, pInfo, void)
aRepresentation = pDoc->CreatePageNumValue((sal_uInt16)nPgNum);
}
else
- aRepresentation = SdResId(STR_FIELD_PLACEHOLDER_NUMBER).toString();
+ aRepresentation = SdResId(STR_FIELD_PLACEHOLDER_NUMBER);
pInfo->SetRepresentation( aRepresentation );
}
@@ -275,8 +275,8 @@ IMPL_LINK(SdModule, CalcFieldValueHdl, EditFieldInfo*, pInfo, void)
{
DocumentType eDocType = pDoc ? pDoc->GetDocumentType() : DocumentType::Impress;
aRepresentation = ( ( eDocType == DocumentType::Impress )
- ? SdResId(STR_FIELD_PLACEHOLDER_SLIDENAME).toString()
- : SdResId(STR_FIELD_PLACEHOLDER_PAGENAME).toString() );
+ ? SdResId(STR_FIELD_PLACEHOLDER_SLIDENAME)
+ : SdResId(STR_FIELD_PLACEHOLDER_PAGENAME) );
}
pInfo->SetRepresentation( aRepresentation );
@@ -315,7 +315,7 @@ IMPL_LINK(SdModule, CalcFieldValueHdl, EditFieldInfo*, pInfo, void)
if( nPageCount > 0 )
aRepresentation = pDoc->CreatePageNumValue(nPageCount);
else
- aRepresentation = SdResId(STR_FIELD_PLACEHOLDER_COUNT).toString();
+ aRepresentation = SdResId(STR_FIELD_PLACEHOLDER_COUNT);
pInfo->SetRepresentation( aRepresentation );
}
@@ -361,11 +361,11 @@ IMPL_LINK(SdModule, CalcFieldValueHdl, EditFieldInfo*, pInfo, void)
if( (pPage == nullptr) || bMasterView )
{
if( bHeaderField )
- aRepresentation = SdResId(STR_FIELD_PLACEHOLDER_HEADER).toString();
+ aRepresentation = SdResId(STR_FIELD_PLACEHOLDER_HEADER);
else if (bFooterField )
- aRepresentation = SdResId(STR_FIELD_PLACEHOLDER_FOOTER).toString();
+ aRepresentation = SdResId(STR_FIELD_PLACEHOLDER_FOOTER);
else if (bDateTimeField )
- aRepresentation = SdResId(STR_FIELD_PLACEHOLDER_DATETIME).toString();
+ aRepresentation = SdResId(STR_FIELD_PLACEHOLDER_DATETIME);
}
else
{
@@ -806,14 +806,14 @@ SfxStyleFamilies* SdModule::CreateStyleFamilies()
SfxStyleFamilies *pStyleFamilies = new SfxStyleFamilies;
pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Para,
- SD_RESSTR(STR_GRAPHICS_STYLE_FAMILY),
+ SdResId(STR_GRAPHICS_STYLE_FAMILY),
Image(BitmapEx(BMP_STYLES_FAMILY_GRAPHICS)),
- SdResId(RID_GRAPHICSTYLEFAMILY)));
+ ResId(RID_GRAPHICSTYLEFAMILY, *SD_MOD()->GetResMgr())));
pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Pseudo,
- SD_RESSTR(STR_PRESENTATIONS_STYLE_FAMILY),
+ SdResId(STR_PRESENTATIONS_STYLE_FAMILY),
Image(BitmapEx(BMP_STYLES_FAMILY_PRESENTATIONS)),
- SdResId(RID_PRESENTATIONSTYLEFAMILY)));
+ ResId(RID_PRESENTATIONSTYLEFAMILY, *SD_MOD()->GetResMgr())));
return pStyleFamilies;
}
diff --git a/sd/source/ui/app/sdpopup.cxx b/sd/source/ui/app/sdpopup.cxx
index 02c7ff23c0c6..0f0efa786622 100644
--- a/sd/source/ui/app/sdpopup.cxx
+++ b/sd/source/ui/app/sdpopup.cxx
@@ -51,8 +51,8 @@ void SdFieldPopup::Fill( LanguageType eLanguage )
{
sal_uInt16 nID = 1;
MenuItemBits nStyle = MenuItemBits::RADIOCHECK | MenuItemBits::AUTOCHECK;
- InsertItem( nID++, SD_RESSTR( STR_FIX ), nStyle );
- InsertItem( nID++, SD_RESSTR( STR_VAR ), nStyle );
+ InsertItem( nID++, SdResId( STR_FIX ), nStyle );
+ InsertItem( nID++, SdResId( STR_VAR ), nStyle );
InsertSeparator();
if( dynamic_cast< const SvxDateField *>( pField ) != nullptr )
@@ -67,8 +67,8 @@ void SdFieldPopup::Fill( LanguageType eLanguage )
//SVXDATEFORMAT_APPDEFAULT, // is not used
//SVXDATEFORMAT_SYSTEM, // is not used
- InsertItem( nID++, SD_RESSTR( STR_STANDARD_SMALL ), nStyle );
- InsertItem( nID++, SD_RESSTR( STR_STANDARD_BIG ), nStyle );
+ InsertItem( nID++, SdResId( STR_STANDARD_SMALL ), nStyle );
+ InsertItem( nID++, SdResId( STR_STANDARD_BIG ), nStyle );
SvNumberFormatter* pNumberFormatter = SD_MOD()->GetNumberFormatter();
aDateField.SetFormat( SVXDATEFORMAT_A ); // 13.02.96
@@ -99,7 +99,7 @@ void SdFieldPopup::Fill( LanguageType eLanguage )
//SVXTIMEFORMAT_APPDEFAULT, // is not used
//SVXTIMEFORMAT_SYSTEM, // is not used
- InsertItem( nID++, SD_RESSTR( STR_STANDARD_NORMAL ), nStyle );
+ InsertItem( nID++, SdResId( STR_STANDARD_NORMAL ), nStyle );
SvNumberFormatter* pNumberFormatter = SD_MOD()->GetNumberFormatter();
aTimeField.SetFormat( SVXTIMEFORMAT_24_HM ); // 13:49
@@ -131,10 +131,10 @@ void SdFieldPopup::Fill( LanguageType eLanguage )
else
CheckItem( 2 );
- InsertItem( nID++, SD_RESSTR( STR_FILEFORMAT_NAME_EXT ), nStyle );
- InsertItem( nID++, SD_RESSTR( STR_FILEFORMAT_FULLPATH ), nStyle );
- InsertItem( nID++, SD_RESSTR( STR_FILEFORMAT_PATH ), nStyle );
- InsertItem( nID++, SD_RESSTR( STR_FILEFORMAT_NAME ), nStyle );
+ InsertItem( nID++, SdResId( STR_FILEFORMAT_NAME_EXT ), nStyle );
+ InsertItem( nID++, SdResId( STR_FILEFORMAT_FULLPATH ), nStyle );
+ InsertItem( nID++, SdResId( STR_FILEFORMAT_PATH ), nStyle );
+ InsertItem( nID++, SdResId( STR_FILEFORMAT_NAME ), nStyle );
CheckItem( (sal_uInt16) ( pFileField->GetFormat() ) + 3 );
}
diff --git a/sd/source/ui/app/sdresid.cxx b/sd/source/ui/app/sdresid.cxx
deleted file mode 100644
index c91e982a0b7c..000000000000
--- a/sd/source/ui/app/sdresid.cxx
+++ /dev/null
@@ -1,30 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "sdmod.hxx"
-#include "sdresid.hxx"
-#include <sal/types.h>
-
-// Ctor
-SdResId::SdResId(sal_uInt16 nId) :
- ResId(nId, *SD_MOD()->GetResMgr())
-{
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/app/tmplctrl.cxx b/sd/source/ui/app/tmplctrl.cxx
index ea5db97a6d64..685d39d6d889 100644
--- a/sd/source/ui/app/tmplctrl.cxx
+++ b/sd/source/ui/app/tmplctrl.cxx
@@ -66,7 +66,7 @@ SdTemplateControl::SdTemplateControl( sal_uInt16 _nSlotId,
StatusBar& rStb ) :
SfxStatusBarControl( _nSlotId, _nId, rStb )
{
- GetStatusBar().SetQuickHelpText(GetId(), SD_RESSTR(STR_STATUSBAR_MASTERPAGE));
+ GetStatusBar().SetQuickHelpText(GetId(), SdResId(STR_STATUSBAR_MASTERPAGE));
}
SdTemplateControl::~SdTemplateControl()
diff --git a/sd/source/ui/controller/displaymodecontroller.cxx b/sd/source/ui/controller/displaymodecontroller.cxx
index 725e2332a2b0..29748337eca4 100644
--- a/sd/source/ui/controller/displaymodecontroller.cxx
+++ b/sd/source/ui/controller/displaymodecontroller.cxx
@@ -119,7 +119,7 @@ static void fillLayoutValueSet( ValueSet* pValue, const snewfoil_value_info* pIn
Size aLayoutItemSize;
for( ; pInfo->mnId; pInfo++ )
{
- OUString aText( SD_RESSTR( pInfo->mnStrResId ) );
+ OUString aText( SdResId( pInfo->mnStrResId ) );
BitmapEx aBmp(OUString::createFromAscii(pInfo->msBmpResId));
pValue->InsertItem(pInfo->mnId, Image(aBmp), aText);
@@ -140,8 +140,8 @@ DisplayModeToolbarMenu::DisplayModeToolbarMenu( DisplayModeController& rControll
{
const sal_Int32 LAYOUT_BORDER_PIX = 7;
- OUString aTitle1( SD_RESSTR( STR_DISPLAYMODE_EDITMODES ) );
- OUString aTitle2( SD_RESSTR( STR_DISPLAYMODE_MASTERMODES ) );
+ OUString aTitle1( SdResId( STR_DISPLAYMODE_EDITMODES ) );
+ OUString aTitle2( SdResId( STR_DISPLAYMODE_MASTERMODES ) );
SetSelectHdl( LINK( this, DisplayModeToolbarMenu, SelectToolbarMenuHdl ) );
diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx
index 759c9eacd8da..1f61a4c1f07d 100644
--- a/sd/source/ui/controller/slidelayoutcontroller.cxx
+++ b/sd/source/ui/controller/slidelayoutcontroller.cxx
@@ -138,7 +138,7 @@ static void fillLayoutValueSet( ValueSet* pValue, const snewfoil_value_info_layo
Size aLayoutItemSize;
for( ; pInfo->mnStrResId; pInfo++ )
{
- OUString aText( SD_RESSTR( pInfo->mnStrResId ) );
+ OUString aText( SdResId( pInfo->mnStrResId ) );
BitmapEx aBmp(OUString::createFromAscii(pInfo->msBmpResId));
pValue->InsertItem(static_cast<sal_uInt16>(pInfo->maAutoLayout)+1,
@@ -176,8 +176,8 @@ LayoutToolbarMenu::LayoutToolbarMenu( SlideLayoutController& rController, vcl::W
const sal_Int32 LAYOUT_BORDER_PIX = 7;
- OUString aTitle1( SD_RESSTR( STR_GLUE_ESCDIR_HORZ ) );
- OUString aTitle2( SD_RESSTR( STR_GLUE_ESCDIR_VERT ) );
+ OUString aTitle1( SdResId( STR_GLUE_ESCDIR_HORZ ) );
+ OUString aTitle2( SdResId( STR_GLUE_ESCDIR_VERT ) );
SvtLanguageOptions aLanguageOptions;
const bool bVerticalEnabled = aLanguageOptions.IsVerticalTextEnabled();
@@ -248,7 +248,7 @@ LayoutToolbarMenu::LayoutToolbarMenu( SlideLayoutController& rController, vcl::W
if( bInsertPage )
sSlotTitle = vcl::CommandInfoProvider::GetLabelForCommand( sSlotStr, rController.getModuleName() );
else
- sSlotTitle = SD_RESSTR( STR_RESET_LAYOUT );
+ sSlotTitle = SdResId( STR_RESET_LAYOUT );
appendEntry( 2, sSlotTitle, aSlotImage);
}
}
diff --git a/sd/source/ui/dlg/LayerTabBar.cxx b/sd/source/ui/dlg/LayerTabBar.cxx
index a62a59603403..edc4be63b315 100644
--- a/sd/source/ui/dlg/LayerTabBar.cxx
+++ b/sd/source/ui/dlg/LayerTabBar.cxx
@@ -170,11 +170,11 @@ bool LayerTabBar::StartRenaming()
{
bool bOK = true;
OUString aLayerName = GetPageText( GetEditPageId() );
- OUString aLayoutLayer = SD_RESSTR(STR_LAYER_LAYOUT);
- OUString aControlsLayer = SD_RESSTR(STR_LAYER_CONTROLS);
- OUString aMeasureLinesLayer = SD_RESSTR(STR_LAYER_MEASURELINES);
- OUString aBackgroundLayer = SD_RESSTR(STR_LAYER_BCKGRND);
- OUString aBackgroundObjLayer = SD_RESSTR(STR_LAYER_BCKGRNDOBJ);
+ OUString aLayoutLayer = SdResId(STR_LAYER_LAYOUT);
+ OUString aControlsLayer = SdResId(STR_LAYER_CONTROLS);
+ OUString aMeasureLinesLayer = SdResId(STR_LAYER_MEASURELINES);
+ OUString aBackgroundLayer = SdResId(STR_LAYER_BCKGRND);
+ OUString aBackgroundObjLayer = SdResId(STR_LAYER_BCKGRNDOBJ);
if ( aLayerName == aLayoutLayer || aLayerName == aControlsLayer ||
aLayerName == aMeasureLinesLayer ||
@@ -212,18 +212,18 @@ TabBarAllowRenamingReturnCode LayerTabBar::AllowRenaming()
{
// Name already exists
ScopedVclPtrInstance<WarningBox> aWarningBox( &pDrViewSh->GetViewFrame()->GetWindow(), WinBits( WB_OK ),
- SD_RESSTR( STR_WARN_NAME_DUPLICATE ) );
+ SdResId( STR_WARN_NAME_DUPLICATE ) );
aWarningBox->Execute();
bOK = false;
}
if (bOK)
{
- OUString aLayoutLayer = SD_RESSTR(STR_LAYER_LAYOUT);
- OUString aControlsLayer = SD_RESSTR(STR_LAYER_CONTROLS);
- OUString aMeasureLinesLayer = SD_RESSTR(STR_LAYER_MEASURELINES);
- OUString aBackgroundLayer = SD_RESSTR(STR_LAYER_BCKGRND);
- OUString aBackgroundObjLayer = SD_RESSTR(STR_LAYER_BCKGRNDOBJ);
+ OUString aLayoutLayer = SdResId(STR_LAYER_LAYOUT);
+ OUString aControlsLayer = SdResId(STR_LAYER_CONTROLS);
+ OUString aMeasureLinesLayer = SdResId(STR_LAYER_MEASURELINES);
+ OUString aBackgroundLayer = SdResId(STR_LAYER_BCKGRND);
+ OUString aBackgroundObjLayer = SdResId(STR_LAYER_BCKGRNDOBJ);
if ( aNewName == aLayoutLayer || aNewName == aControlsLayer ||
aNewName == aMeasureLinesLayer ||
diff --git a/sd/source/ui/dlg/PaneChildWindows.cxx b/sd/source/ui/dlg/PaneChildWindows.cxx
index a441b1a0a548..cd83474c0af4 100644
--- a/sd/source/ui/dlg/PaneChildWindows.cxx
+++ b/sd/source/ui/dlg/PaneChildWindows.cxx
@@ -50,7 +50,7 @@ PaneChildWindow::PaneChildWindow (
pBindings,
this,
pParentWindow,
- SD_RESSTR(nTitleBarResId)));
+ SdResId(nTitleBarResId)));
SetAlignment(SfxChildAlignment::LEFT);
static_cast<SfxDockingWindow*>(GetWindow())->Initialize(pInfo);
SetHideNotDelete(true);
diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
index c2f03a7cf7cc..ffc73486e2c3 100644
--- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx
+++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
@@ -109,7 +109,7 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, CreateHdl, Button*, void)
{
if (pImagesLst->GetEntryCount() == 0)
{
- ScopedVclPtrInstance< WarningBox > aWarning(this, WB_OK, SD_RESSTR(STR_PHOTO_ALBUM_EMPTY_WARNING));
+ ScopedVclPtrInstance< WarningBox > aWarning(this, WB_OK, SdResId(STR_PHOTO_ALBUM_EMPTY_WARNING));
aWarning->Execute();
}
else
@@ -610,7 +610,7 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, SelectHdl, ListBox&, void)
OUString* pData = static_cast<OUString*>(pImagesLst->GetSelectEntryData());
OUString sImgUrl = pData ? OUString(*pData) : "";
- if (sImgUrl != SD_RESSTR(STR_PHOTO_ALBUM_TEXTBOX))
+ if (sImgUrl != SdResId(STR_PHOTO_ALBUM_TEXTBOX))
{
GraphicFilter aCurFilter;
Graphic aGraphic;
diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.cxx b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
index f0933ba5e7e9..d0583395923f 100644
--- a/sd/source/ui/dlg/RemoteDialogClientBox.cxx
+++ b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
@@ -80,7 +80,7 @@ ClientBox::ClientBox( vcl::Window* pParent, WinBits nStyle ) :
m_aScrollBar->EnableDrag();
m_aPinBox->SetUseThousandSep(false);
- m_aDeauthoriseButton->SetText( SD_RESSTR(STR_DEAUTHORISE_CLIENT) );
+ m_aDeauthoriseButton->SetText( SdResId(STR_DEAUTHORISE_CLIENT) );
m_aDeauthoriseButton->SetClickHdl( LINK( this, ClientBox, DeauthoriseHdl ) );
SetPosPixel( Point( RSC_SP_DLG_INNERBORDER_LEFT, RSC_SP_DLG_INNERBORDER_TOP ) );
@@ -331,7 +331,7 @@ void ClientBox::DrawRow(vcl::RenderContext& rRenderContext, const ::tools::Recta
aPos.Y() += aTextHeight;
if (rEntry->m_bActive)
{
- OUString sPinText(SD_RESSTR(STR_ENTER_PIN));
+ OUString sPinText(SdResId(STR_ENTER_PIN));
DrawText(m_sPinTextRect, sPinText);
}
@@ -373,7 +373,7 @@ void ClientBox::RecalcAll()
aEntryRect.Right(),
aEntryRect.Bottom() - TOP_OFFSET);
- OUString sPinText(SD_RESSTR(STR_ENTER_PIN));
+ OUString sPinText(SdResId(STR_ENTER_PIN));
aPos = Point( aEntryRect.Left() + GetTextWidth( sPinText ),
aEntryRect.Bottom() - TOP_OFFSET - aPinBoxSize.Height() );
diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx
index 6588b105b646..22117cb810f2 100644
--- a/sd/source/ui/dlg/animobjs.cxx
+++ b/sd/source/ui/dlg/animobjs.cxx
@@ -441,7 +441,7 @@ IMPL_LINK( AnimationWindow, ClickRemoveBitmapHdl, Button*, pBtn, void )
}
else // delete everything
{
- ScopedVclPtrInstance< WarningBox > aWarnBox( this, WB_YES_NO, SD_RESSTR( STR_ASK_DELETE_ALL_PICTURES ) );
+ ScopedVclPtrInstance< WarningBox > aWarnBox( this, WB_YES_NO, SdResId( STR_ASK_DELETE_ALL_PICTURES ) );
short nReturn = aWarnBox->Execute();
if( nReturn == RET_YES )
diff --git a/sd/source/ui/dlg/brkdlg.cxx b/sd/source/ui/dlg/brkdlg.cxx
index 6f8fee9961bf..e6da3e880f27 100644
--- a/sd/source/ui/dlg/brkdlg.cxx
+++ b/sd/source/ui/dlg/brkdlg.cxx
@@ -58,7 +58,7 @@ BreakDlg::BreakDlg(
m_pBtnCancel->SetClickHdl( LINK( this, BreakDlg, CancelButtonHdl));
- mpProgress = new SfxProgress( pShell, SD_RESSTR(STR_BREAK_METAFILE), nSumActionCount*3 );
+ mpProgress = new SfxProgress( pShell, SdResId(STR_BREAK_METAFILE), nSumActionCount*3 );
pProgrInfo = new SvdProgressInfo( LINK(this, BreakDlg, UpDate) );
// every action is edited 3 times in DoImport()
@@ -107,7 +107,7 @@ IMPL_LINK( BreakDlg, UpDate, void*, nInit, bool )
// update status bar or show a error message?
if(nInit == reinterpret_cast<void*>(1L))
{
- ScopedVclPtrInstance< MessageDialog > aErrBox(this, SD_RESSTR(STR_BREAK_FAIL));
+ ScopedVclPtrInstance< MessageDialog > aErrBox(this, SdResId(STR_BREAK_FAIL));
aErrBox->Execute();
}
else
diff --git a/sd/source/ui/dlg/custsdlg.cxx b/sd/source/ui/dlg/custsdlg.cxx
index 8c6673011075..1666bffee6c7 100644
--- a/sd/source/ui/dlg/custsdlg.cxx
+++ b/sd/source/ui/dlg/custsdlg.cxx
@@ -532,7 +532,7 @@ IMPL_LINK_NOARG(SdDefineCustomShowDlg, OKHdl, Button*, void)
else
{
ScopedVclPtrInstance<WarningBox>( this, WinBits( WB_OK ),
- SD_RESSTR( STR_WARN_NAME_DUPLICATE ) )->Execute();
+ SdResId( STR_WARN_NAME_DUPLICATE ) )->Execute();
m_pEdtName->GrabFocus();
}
diff --git a/sd/source/ui/dlg/diactrl.cxx b/sd/source/ui/dlg/diactrl.cxx
index e8737c19e6e9..842462414dc9 100644
--- a/sd/source/ui/dlg/diactrl.cxx
+++ b/sd/source/ui/dlg/diactrl.cxx
@@ -43,7 +43,7 @@ SdPagesField::SdPagesField( vcl::Window* pParent,
SvxMetricField ( pParent, rFrame ),
m_xFrame ( rFrame )
{
- OUString aStr( SD_RESSTR( STR_SLIDE_PLURAL ) );
+ OUString aStr( SdResId( STR_SLIDE_PLURAL ) );
SetCustomUnitText( aStr );
// set size
@@ -74,9 +74,9 @@ void SdPagesField::UpdatePagesField( const SfxUInt16Item* pItem )
long nValue = (long) pItem->GetValue();
SetValue( nValue );
if( nValue == 1 )
- SetCustomUnitText( SD_RESSTR( STR_SLIDE_SINGULAR ) );
+ SetCustomUnitText( SdResId( STR_SLIDE_SINGULAR ) );
else
- SetCustomUnitText( SD_RESSTR( STR_SLIDE_PLURAL ) );
+ SetCustomUnitText( SdResId( STR_SLIDE_PLURAL ) );
}
else
SetText( OUString() );
diff --git a/sd/source/ui/dlg/dlgfield.cxx b/sd/source/ui/dlg/dlgfield.cxx
index 0ff1eddb3c82..6270815d8ff0 100644
--- a/sd/source/ui/dlg/dlgfield.cxx
+++ b/sd/source/ui/dlg/dlgfield.cxx
@@ -179,8 +179,8 @@ void SdModifyFieldDlg::FillFormatList()
//SVXDATEFORMAT_APPDEFAULT, // not used
//SVXDATEFORMAT_SYSTEM, // not used
- m_pLbFormat->InsertEntry( SD_RESSTR( STR_STANDARD_SMALL ) );
- m_pLbFormat->InsertEntry( SD_RESSTR( STR_STANDARD_BIG ) );
+ m_pLbFormat->InsertEntry( SdResId( STR_STANDARD_SMALL ) );
+ m_pLbFormat->InsertEntry( SdResId( STR_STANDARD_BIG ) );
SvNumberFormatter* pNumberFormatter = SD_MOD()->GetNumberFormatter();
aDateField.SetFormat( SVXDATEFORMAT_A ); // 13.02.96
@@ -205,7 +205,7 @@ void SdModifyFieldDlg::FillFormatList()
//SVXTIMEFORMAT_APPDEFAULT, // not used
//SVXTIMEFORMAT_SYSTEM, // not used
- m_pLbFormat->InsertEntry( SD_RESSTR( STR_STANDARD_NORMAL ) );
+ m_pLbFormat->InsertEntry( SdResId( STR_STANDARD_NORMAL ) );
SvNumberFormatter* pNumberFormatter = SD_MOD()->GetNumberFormatter();
aTimeField.SetFormat( SVXTIMEFORMAT_24_HM ); // 13:49
@@ -231,10 +231,10 @@ void SdModifyFieldDlg::FillFormatList()
const SvxExtFileField* pFileField = static_cast<const SvxExtFileField*>( pField );
SvxExtFileField aFileField( *pFileField );
- m_pLbFormat->InsertEntry( SD_RESSTR( STR_FILEFORMAT_NAME_EXT ) );
- m_pLbFormat->InsertEntry( SD_RESSTR( STR_FILEFORMAT_FULLPATH ) );
- m_pLbFormat->InsertEntry( SD_RESSTR( STR_FILEFORMAT_PATH ) );
- m_pLbFormat->InsertEntry( SD_RESSTR( STR_FILEFORMAT_NAME ) );
+ m_pLbFormat->InsertEntry( SdResId( STR_FILEFORMAT_NAME_EXT ) );
+ m_pLbFormat->InsertEntry( SdResId( STR_FILEFORMAT_FULLPATH ) );
+ m_pLbFormat->InsertEntry( SdResId( STR_FILEFORMAT_PATH ) );
+ m_pLbFormat->InsertEntry( SdResId( STR_FILEFORMAT_NAME ) );
m_pLbFormat->SelectEntryPos( (sal_uInt16) ( pFileField->GetFormat() ) );
}
diff --git a/sd/source/ui/dlg/filedlg.cxx b/sd/source/ui/dlg/filedlg.cxx
index 7799458da69f..c983e5f585b0 100644
--- a/sd/source/ui/dlg/filedlg.cxx
+++ b/sd/source/ui/dlg/filedlg.cxx
@@ -111,7 +111,7 @@ IMPL_LINK_NOARG(SdFileDialog_Imp, PlayMusicHdl, void*, void)
try
{
mxControlAccess->setLabel( css::ui::dialogs::ExtendedFilePickerElementIds::PUSHBUTTON_PLAY,
- SD_RESSTR( STR_PLAY ) );
+ SdResId( STR_PLAY ) );
mbLabelPlaying = false;
}
catch(const css::lang::IllegalArgumentException&)
@@ -143,7 +143,7 @@ IMPL_LINK_NOARG(SdFileDialog_Imp, PlayMusicHdl, void*, void)
try
{
mxControlAccess->setLabel( css::ui::dialogs::ExtendedFilePickerElementIds::PUSHBUTTON_PLAY,
- SD_RESSTR( STR_STOP ) );
+ SdResId( STR_STOP ) );
mbLabelPlaying = true;
}
catch (const css::lang::IllegalArgumentException&)
@@ -173,7 +173,7 @@ IMPL_LINK_NOARG(SdFileDialog_Imp, IsMusicStoppedHdl, Timer *, void)
try
{
mxControlAccess->setLabel( css::ui::dialogs::ExtendedFilePickerElementIds::PUSHBUTTON_PLAY,
- SD_RESSTR( STR_PLAY ) );
+ SdResId( STR_PLAY ) );
mbLabelPlaying = false;
}
catch (const css::lang::IllegalArgumentException&)
@@ -194,7 +194,7 @@ void SdFileDialog_Imp::CheckSelectionState()
try
{
- if( aCurrFilter.isEmpty() || ( aCurrFilter == SD_RESSTR( STR_EXPORT_HTML_NAME ) ) )
+ if( aCurrFilter.isEmpty() || ( aCurrFilter == SdResId( STR_EXPORT_HTML_NAME ) ) )
mxControlAccess->enableControl( css::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_SELECTION, false );
else
mxControlAccess->enableControl( css::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_SELECTION, true );
@@ -227,7 +227,7 @@ SdFileDialog_Imp::SdFileDialog_Imp() :
try
{
mxControlAccess->setLabel( css::ui::dialogs::ExtendedFilePickerElementIds::PUSHBUTTON_PLAY,
- SD_RESSTR( STR_PLAY ) );
+ SdResId( STR_PLAY ) );
}
catch (const css::lang::IllegalArgumentException&)
{
@@ -258,25 +258,25 @@ SdOpenSoundFileDialog::SdOpenSoundFileDialog() :
mpImpl( new SdFileDialog_Imp() )
{
OUString aDescr;
- aDescr = SD_RESSTR(STR_ALL_FILES);
+ aDescr = SdResId(STR_ALL_FILES);
mpImpl->AddFilter( aDescr, "*.*");
// setup filter
#if defined UNX
- aDescr = SD_RESSTR(STR_AU_FILE);
+ aDescr = SdResId(STR_AU_FILE);
mpImpl->AddFilter( aDescr, "*.au;*.snd");
- aDescr = SD_RESSTR(STR_VOC_FILE);
+ aDescr = SdResId(STR_VOC_FILE);
mpImpl->AddFilter( aDescr, "*.voc");
- aDescr = SD_RESSTR(STR_WAV_FILE);
+ aDescr = SdResId(STR_WAV_FILE);
mpImpl->AddFilter( aDescr, "*.wav");
- aDescr = SD_RESSTR(STR_AIFF_FILE);
+ aDescr = SdResId(STR_AIFF_FILE);
mpImpl->AddFilter( aDescr, "*.aiff");
- aDescr = SD_RESSTR(STR_SVX_FILE);
+ aDescr = SdResId(STR_SVX_FILE);
mpImpl->AddFilter( aDescr, "*.svx");
#else
- aDescr = SD_RESSTR(STR_WAV_FILE);
+ aDescr = SdResId(STR_WAV_FILE);
mpImpl->AddFilter( aDescr, "*.wav;*.mp3;*.ogg" );
- aDescr = SD_RESSTR(STR_MIDI_FILE);
+ aDescr = SdResId(STR_MIDI_FILE);
mpImpl->AddFilter( aDescr, "*.mid" );
#endif
}
diff --git a/sd/source/ui/dlg/gluectrl.cxx b/sd/source/ui/dlg/gluectrl.cxx
index 2f62a2444551..f8954dc56cd4 100644
--- a/sd/source/ui/dlg/gluectrl.cxx
+++ b/sd/source/ui/dlg/gluectrl.cxx
@@ -92,19 +92,19 @@ void GlueEscDirLB::Select()
*/
void GlueEscDirLB::Fill()
{
- InsertEntry( SD_RESSTR( STR_GLUE_ESCDIR_SMART ) );
- InsertEntry( SD_RESSTR( STR_GLUE_ESCDIR_LEFT ) );
- InsertEntry( SD_RESSTR( STR_GLUE_ESCDIR_RIGHT ) );
- InsertEntry( SD_RESSTR( STR_GLUE_ESCDIR_TOP ) );
- InsertEntry( SD_RESSTR( STR_GLUE_ESCDIR_BOTTOM ) );
+ InsertEntry( SdResId( STR_GLUE_ESCDIR_SMART ) );
+ InsertEntry( SdResId( STR_GLUE_ESCDIR_LEFT ) );
+ InsertEntry( SdResId( STR_GLUE_ESCDIR_RIGHT ) );
+ InsertEntry( SdResId( STR_GLUE_ESCDIR_TOP ) );
+ InsertEntry( SdResId( STR_GLUE_ESCDIR_BOTTOM ) );
/*
- InsertEntry( SD_RESSTR( STR_GLUE_ESCDIR_LO ) );
- InsertEntry( SD_RESSTR( STR_GLUE_ESCDIR_LU ) );
- InsertEntry( SD_RESSTR( STR_GLUE_ESCDIR_RO ) );
- InsertEntry( SD_RESSTR( STR_GLUE_ESCDIR_RU ) );
- InsertEntry( SD_RESSTR( STR_GLUE_ESCDIR_HORZ ) );
- InsertEntry( SD_RESSTR( STR_GLUE_ESCDIR_VERT ) );
- InsertEntry( SD_RESSTR( STR_GLUE_ESCDIR_ALL ) );
+ InsertEntry( SdResId( STR_GLUE_ESCDIR_LO ) );
+ InsertEntry( SdResId( STR_GLUE_ESCDIR_LU ) );
+ InsertEntry( SdResId( STR_GLUE_ESCDIR_RO ) );
+ InsertEntry( SdResId( STR_GLUE_ESCDIR_RU ) );
+ InsertEntry( SdResId( STR_GLUE_ESCDIR_HORZ ) );
+ InsertEntry( SdResId( STR_GLUE_ESCDIR_VERT ) );
+ InsertEntry( SdResId( STR_GLUE_ESCDIR_ALL ) );
*/
}
diff --git a/sd/source/ui/dlg/inspagob.cxx b/sd/source/ui/dlg/inspagob.cxx
index 2afd2d54bca8..296349f0d887 100644
--- a/sd/source/ui/dlg/inspagob.cxx
+++ b/sd/source/ui/dlg/inspagob.cxx
@@ -49,7 +49,7 @@ SdInsertPagesObjsDlg::SdInsertPagesObjsDlg(
// insert text
if( !pMedium )
- SetText( SD_RESSTR( STR_INSERT_TEXT ) );
+ SetText( SdResId( STR_INSERT_TEXT ) );
Reset();
}
diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx
index 76fa5140872b..22157511eb53 100644
--- a/sd/source/ui/dlg/navigatr.cxx
+++ b/sd/source/ui/dlg/navigatr.cxx
@@ -81,7 +81,7 @@ SdNavigatorWin::SdNavigatorWin(vcl::Window* pParent, SfxBindings* pInBindings)
maTlbObjects->SetViewFrame( mpBindings->GetDispatcher()->GetFrame() );
- maTlbObjects->SetAccessibleName(SD_RESSTR(STR_OBJECTS_TREE));
+ maTlbObjects->SetAccessibleName(SdResId(STR_OBJECTS_TREE));
maTlbObjects->SetDoubleClickHdl(LINK(this, SdNavigatorWin, ClickObjectHdl));
maTlbObjects->SetSelectionMode(SelectionMode::Single);
@@ -271,7 +271,7 @@ IMPL_LINK( SdNavigatorWin, DropdownClickToolBoxHdl, ToolBox*, pBox, void )
if( nRId > 0 )
{
DBG_ASSERT(aHIDs[nID-NAVIGATOR_DRAGTYPE_URL],"HelpId not added!");
- pMenu->InsertItem(nID, SD_RESSTR(nRId), MenuItemBits::RADIOCHECK);
+ pMenu->InsertItem(nID, SdResId(nRId), MenuItemBits::RADIOCHECK);
pMenu->SetHelpId(nID, aHIDs[nID - NAVIGATOR_DRAGTYPE_URL]);
}
@@ -297,11 +297,11 @@ IMPL_LINK( SdNavigatorWin, DropdownClickToolBoxHdl, ToolBox*, pBox, void )
pMenu->InsertItem(
nShowNamedShapesFilter,
- SD_RESSTR(STR_NAVIGATOR_SHOW_NAMED_SHAPES),
+ SdResId(STR_NAVIGATOR_SHOW_NAMED_SHAPES),
MenuItemBits::RADIOCHECK);
pMenu->InsertItem(
nShowAllShapesFilter,
- SD_RESSTR(STR_NAVIGATOR_SHOW_ALL_SHAPES),
+ SdResId(STR_NAVIGATOR_SHOW_ALL_SHAPES),
MenuItemBits::RADIOCHECK);
if (maTlbObjects->GetShowAllShapes())
diff --git a/sd/source/ui/dlg/prltempl.cxx b/sd/source/ui/dlg/prltempl.cxx
index 71ab78a7acff..3573b27bd929 100644
--- a/sd/source/ui/dlg/prltempl.cxx
+++ b/sd/source/ui/dlg/prltempl.cxx
@@ -99,7 +99,7 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh,
// from 'Outline 1' style sheet.
if( SfxItemState::SET != aInputSet.GetItemState(EE_PARA_NUMBULLET, false, &pItem ))
{
- OUString aStyleName(SD_RESSTR(STR_PSEUDOSHEET_OUTLINE) + " 1");
+ OUString aStyleName(SdResId(STR_PSEUDOSHEET_OUTLINE) + " 1");
SfxStyleSheetBase* pFirstStyleSheet = pSSPool->Find( aStyleName, SD_STYLE_FAMILY_PSEUDO);
if(pFirstStyleSheet)
@@ -180,19 +180,19 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh,
switch( ePO )
{
case PO_TITLE:
- aTitle = OUString(SdResId( STR_PSEUDOSHEET_TITLE ));
+ aTitle = SdResId(STR_PSEUDOSHEET_TITLE);
break;
case PO_SUBTITLE:
- aTitle = OUString(SdResId( STR_PSEUDOSHEET_SUBTITLE ));
+ aTitle = SdResId(STR_PSEUDOSHEET_SUBTITLE);
break;
case PO_BACKGROUND:
- aTitle = OUString(SdResId( STR_PSEUDOSHEET_BACKGROUND ));
+ aTitle = SdResId(STR_PSEUDOSHEET_BACKGROUND);
break;
case PO_BACKGROUNDOBJECTS:
- aTitle = OUString(SdResId( STR_PSEUDOSHEET_BACKGROUNDOBJECTS ));
+ aTitle = SdResId(STR_PSEUDOSHEET_BACKGROUNDOBJECTS);
break;
case PO_OUTLINE_1:
@@ -204,12 +204,12 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh,
case PO_OUTLINE_7:
case PO_OUTLINE_8:
case PO_OUTLINE_9:
- aTitle = OUString(SdResId( STR_PSEUDOSHEET_OUTLINE )) + " " +
+ aTitle = SdResId(STR_PSEUDOSHEET_OUTLINE) + " " +
OUString::number( ePO - PO_OUTLINE_1 + 1 );
break;
case PO_NOTES:
- aTitle = OUString(SdResId( STR_PSEUDOSHEET_NOTES ));
+ aTitle = SdResId(STR_PSEUDOSHEET_NOTES);
break;
}
SetText( aTitle );
diff --git a/sd/source/ui/dlg/sdpreslt.cxx b/sd/source/ui/dlg/sdpreslt.cxx
index 7746eb90f0d6..b7f7d3642671 100644
--- a/sd/source/ui/dlg/sdpreslt.cxx
+++ b/sd/source/ui/dlg/sdpreslt.cxx
@@ -38,7 +38,7 @@ SdPresLayoutDlg::SdPresLayoutDlg(::sd::DrawDocShell* pDocShell,
"modules/simpress/ui/slidedesigndialog.ui")
, mpDocSh(pDocShell)
, mrOutAttrs(rInAttrs)
- , maStrNone(SD_RESSTR(STR_NULL))
+ , maStrNone(SdResId(STR_NULL))
{
get(m_pVS, "select");
Size aPref(LogicToPixel(Size(144 , 141), MapUnit::MapAppFont));
@@ -180,7 +180,7 @@ IMPL_LINK_NOARG(SdPresLayoutDlg, ClickLayoutHdl, ValueSet*, void)
IMPL_LINK_NOARG(SdPresLayoutDlg, ClickLoadHdl, Button*, void)
{
VclPtrInstance< SfxNewFileDialog > pDlg(this, SfxNewFileDialogMode::Preview);
- pDlg->SetText(SD_RESSTR(STR_LOAD_PRESENTATION_LAYOUT));
+ pDlg->SetText(SdResId(STR_LOAD_PRESENTATION_LAYOUT));
if(!IsReallyVisible())
return;
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index 614592536d9a..3bb125de459e 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -404,7 +404,7 @@ OUString SdPageObjsTLB::GetObjectName(
&& aRet.isEmpty()
&& pObject!=nullptr)
{
- aRet = SD_RESSTR(STR_NAVIGATOR_SHAPE_BASE_NAME);
+ aRet = SdResId(STR_NAVIGATOR_SHAPE_BASE_NAME);
aRet = aRet.replaceFirst("%1", OUString::number(pObject->GetOrdNum() + 1));
}
@@ -988,7 +988,7 @@ SdDrawDocument* SdPageObjsTLB::GetBookmarkDoc(SfxMedium* pMed)
if ( !mpBookmarkDoc )
{
- ScopedVclPtrInstance< MessageDialog > aErrorBox(this, SD_RESSTR(STR_READ_DATA_ERROR));
+ ScopedVclPtrInstance< MessageDialog > aErrorBox(this, SdResId(STR_READ_DATA_ERROR));
aErrorBox->Execute();
mpMedium = nullptr; //On failure the SfxMedium is invalid
}
diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx
index d658d5f8b4f1..a0dec36b6c8c 100644
--- a/sd/source/ui/dlg/tpaction.cxx
+++ b/sd/source/ui/dlg/tpaction.cxx
@@ -220,7 +220,7 @@ void SdTPAction::Construct()
bOLEAction = true;
aVerbVector.push_back( 0 );
- m_pLbOLEAction->InsertEntry( MnemonicGenerator::EraseAllMnemonicChars( SD_RESSTR( STR_EDIT_OBJ ) ) );
+ m_pLbOLEAction->InsertEntry( MnemonicGenerator::EraseAllMnemonicChars( SdResId( STR_EDIT_OBJ ) ) );
}
else if( pOleObj )
{
@@ -270,7 +270,7 @@ void SdTPAction::Construct()
for (presentation::ClickAction & rAction : maCurrentActions)
{
sal_uInt16 nRId = GetClickActionSdResId( rAction );
- m_pLbAction->InsertEntry( SD_RESSTR( nRId ) );
+ m_pLbAction->InsertEntry( SdResId( nRId ) );
}
}
@@ -452,7 +452,7 @@ void SdTPAction::OpenFileDialog()
// filter makes the (Windows system) open file dialog follow
// links on the desktop to directories.
aFileDialog.AddFilter (
- SFX2_RESSTR(STR_SFX_FILTERNAME_ALL),
+ SfxResId(STR_SFX_FILTERNAME_ALL),
"*.*");
if( aFileDialog.Execute() == ERRCODE_NONE )
@@ -583,7 +583,7 @@ IMPL_LINK_NOARG(SdTPAction, ClickActionHdl, ListBox&, void)
m_pEdtSound->Enable();
m_pBtnSearch->Show();
m_pBtnSearch->Enable();
- m_pFrame->set_label( SD_RESSTR( STR_EFFECTDLG_SOUND ) );
+ m_pFrame->set_label( SdResId( STR_EFFECTDLG_SOUND ) );
break;
case presentation::ClickAction_PROGRAM:
@@ -594,12 +594,12 @@ IMPL_LINK_NOARG(SdTPAction, ClickActionHdl, ListBox&, void)
if( eCA == presentation::ClickAction_MACRO )
{
m_pEdtMacro->Show();
- m_pFrame->set_label( SD_RESSTR( STR_EFFECTDLG_MACRO ) );
+ m_pFrame->set_label( SdResId( STR_EFFECTDLG_MACRO ) );
}
else
{
m_pEdtProgram->Show();
- m_pFrame->set_label( SD_RESSTR( STR_EFFECTDLG_PROGRAM ) );
+ m_pFrame->set_label( SdResId( STR_EFFECTDLG_PROGRAM ) );
}
break;
@@ -612,8 +612,8 @@ IMPL_LINK_NOARG(SdTPAction, ClickActionHdl, ListBox&, void)
m_pBtnSearch->Show();
m_pBtnSearch->Enable();
- m_pFtTree->SetText( SD_RESSTR( STR_EFFECTDLG_JUMP ) );
- m_pFrame->set_label( SD_RESSTR( STR_EFFECTDLG_DOCUMENT ) );
+ m_pFtTree->SetText( SdResId( STR_EFFECTDLG_JUMP ) );
+ m_pFrame->set_label( SdResId( STR_EFFECTDLG_DOCUMENT ) );
CheckFileHdl( *m_pEdtDocument );
break;
@@ -622,7 +622,7 @@ IMPL_LINK_NOARG(SdTPAction, ClickActionHdl, ListBox&, void)
m_pFtTree->Show();
m_pLbOLEAction->Show();
- m_pFtTree->SetText( SD_RESSTR( STR_EFFECTDLG_ACTION ) );
+ m_pFtTree->SetText( SdResId( STR_EFFECTDLG_ACTION ) );
break;
case presentation::ClickAction_BOOKMARK:
@@ -635,8 +635,8 @@ IMPL_LINK_NOARG(SdTPAction, ClickActionHdl, ListBox&, void)
m_pEdtBookmark->Show();
m_pBtnSeek->Show();
- m_pFtTree->SetText( SD_RESSTR( STR_EFFECTDLG_JUMP ) );
- m_pFrame->set_label( SD_RESSTR( STR_EFFECTDLG_PAGE_OBJECT ) );
+ m_pFtTree->SetText( SdResId( STR_EFFECTDLG_JUMP ) );
+ m_pFrame->set_label( SdResId( STR_EFFECTDLG_PAGE_OBJECT ) );
break;
default:
break;
diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx
index cb7eafc02332..8f3510bf7839 100644
--- a/sd/source/ui/dlg/tpoption.cxx
+++ b/sd/source/ui/dlg/tpoption.cxx
@@ -369,7 +369,7 @@ DeactivateRC SdTpOptionsMisc::DeactivatePage( SfxItemSet* pActiveSet )
FillItemSet( pActiveSet );
return DeactivateRC::LeavePage;
}
- ScopedVclPtrInstance< WarningBox > aWarnBox( GetParent(), WB_YES_NO, SD_RESSTR( STR_WARN_SCALE_FAIL ) );
+ ScopedVclPtrInstance< WarningBox > aWarnBox( GetParent(), WB_YES_NO, SdResId( STR_WARN_SCALE_FAIL ) );
if( aWarnBox->Execute() == RET_YES )
return DeactivateRC::KeepPage;
diff --git a/sd/source/ui/dlg/unchss.cxx b/sd/source/ui/dlg/unchss.cxx
index 7b6842539fbe..1e0b6d99a5a1 100644
--- a/sd/source/ui/dlg/unchss.cxx
+++ b/sd/source/ui/dlg/unchss.cxx
@@ -51,7 +51,7 @@ StyleSheetUndoAction::StyleSheetUndoAction(SdDrawDocument* pTheDoc,
mpOldSet = o3tl::make_unique<SfxItemSet>(static_cast<SfxItemPool&>(SdrObject::GetGlobalDrawObjectItemPool()), mpStyleSheet->GetItemSet().GetRanges());
SdrModel::MigrateItemSet( &mpStyleSheet->GetItemSet(), mpOldSet.get(), pTheDoc );
- OUString aComment(SD_RESSTR(STR_UNDO_CHANGE_PRES_OBJECT));
+ OUString aComment(SdResId(STR_UNDO_CHANGE_PRES_OBJECT));
OUString aName(mpStyleSheet->GetName());
// delete layout name and separator
@@ -61,27 +61,27 @@ StyleSheetUndoAction::StyleSheetUndoAction(SdDrawDocument* pTheDoc,
if (aName == STR_LAYOUT_TITLE)
{
- aName = SD_RESSTR(STR_PSEUDOSHEET_TITLE);
+ aName = SdResId(STR_PSEUDOSHEET_TITLE);
}
else if (aName == STR_LAYOUT_SUBTITLE)
{
- aName = SD_RESSTR(STR_PSEUDOSHEET_SUBTITLE);
+ aName = SdResId(STR_PSEUDOSHEET_SUBTITLE);
}
else if (aName == STR_LAYOUT_BACKGROUND)
{
- aName = SD_RESSTR(STR_PSEUDOSHEET_BACKGROUND);
+ aName = SdResId(STR_PSEUDOSHEET_BACKGROUND);
}
else if (aName == STR_LAYOUT_BACKGROUNDOBJECTS)
{
- aName = SD_RESSTR(STR_PSEUDOSHEET_BACKGROUNDOBJECTS);
+ aName = SdResId(STR_PSEUDOSHEET_BACKGROUNDOBJECTS);
}
else if (aName == STR_LAYOUT_NOTES)
{
- aName = SD_RESSTR(STR_PSEUDOSHEET_NOTES);
+ aName = SdResId(STR_PSEUDOSHEET_NOTES);
}
else
{
- OUString aOutlineStr(SD_RESSTR(STR_PSEUDOSHEET_OUTLINE));
+ OUString aOutlineStr(SdResId(STR_PSEUDOSHEET_OUTLINE));
nPos = aName.indexOf(aOutlineStr);
if (nPos != -1)
{
diff --git a/sd/source/ui/docshell/docshel2.cxx b/sd/source/ui/docshell/docshel2.cxx
index 0124b1fd8efd..1062de5e6bdb 100644
--- a/sd/source/ui/docshell/docshel2.cxx
+++ b/sd/source/ui/docshell/docshel2.cxx
@@ -282,7 +282,7 @@ bool DrawDocShell::CheckPageName (vcl::Window* pWin, OUString& rName )
if( ! bIsNameValid )
{
- OUString aDesc( SD_RESSTR( STR_WARN_PAGE_EXISTS ) );
+ OUString aDesc( SdResId( STR_WARN_PAGE_EXISTS ) );
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
VclPtr<AbstractSvxNameDialog> aNameDlg = pFact ? pFact->CreateSvxNameDialog( pWin, aStrForDlg, aDesc ) : nullptr;
if( aNameDlg )
@@ -312,7 +312,7 @@ bool DrawDocShell::IsNewPageNameValid( OUString & rInOutPageName, bool bResetStr
bool bCanUseNewName = false;
// check if name is something like 'Slide n'
- OUString aStrPage(SD_RESSTR(STR_SD_PAGE) + " ");
+ OUString aStrPage(SdResId(STR_SD_PAGE) + " ");
bool bIsStandardName = false;
diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx
index d1e464fa38d6..773bfd506a7e 100644
--- a/sd/source/ui/docshell/docshel4.cxx
+++ b/sd/source/ui/docshell/docshel4.cxx
@@ -1037,13 +1037,13 @@ void DrawDocShell::FillClass(SvGlobalName* pClassName,
{
*pClassName = SvGlobalName(SO3_SDRAW_CLASSID_60);
*pFormat = SotClipboardFormatId::STARDRAW_60;
- *pFullTypeName = OUString(SdResId(STR_GRAPHIC_DOCUMENT_FULLTYPE_60));
+ *pFullTypeName = SdResId(STR_GRAPHIC_DOCUMENT_FULLTYPE_60);
}
else
{
*pClassName = SvGlobalName(SO3_SIMPRESS_CLASSID_60);
*pFormat = SotClipboardFormatId::STARIMPRESS_60;
- *pFullTypeName = OUString(SdResId(STR_IMPRESS_DOCUMENT_FULLTYPE_60));
+ *pFullTypeName = SdResId(STR_IMPRESS_DOCUMENT_FULLTYPE_60);
}
}
else if (nFileFormat == SOFFICE_FILEFORMAT_8)
@@ -1062,8 +1062,8 @@ void DrawDocShell::FillClass(SvGlobalName* pClassName,
}
}
- *pShortTypeName = OUString(SdResId( (meDocType == DocumentType::Draw) ?
- STR_GRAPHIC_DOCUMENT : STR_IMPRESS_DOCUMENT ));
+ *pShortTypeName = SdResId((meDocType == DocumentType::Draw) ?
+ STR_GRAPHIC_DOCUMENT : STR_IMPRESS_DOCUMENT);
}
OutputDevice* DrawDocShell::GetDocumentRefDev()
diff --git a/sd/source/ui/framework/module/SlideSorterModule.cxx b/sd/source/ui/framework/module/SlideSorterModule.cxx
index 5185e53f8988..6315ec335a14 100644
--- a/sd/source/ui/framework/module/SlideSorterModule.cxx
+++ b/sd/source/ui/framework/module/SlideSorterModule.cxx
@@ -133,7 +133,7 @@ void SlideSorterModule::UpdateViewTabBar (const Reference<XTabBar>& rxTabBar)
aButtonA.ResourceId = FrameworkHelper::CreateResourceId(
FrameworkHelper::msSlideSorterURL,
FrameworkHelper::msCenterPaneURL);
- aButtonA.ButtonLabel = SD_RESSTR(STR_SLIDE_SORTER_MODE);
+ aButtonA.ButtonLabel = SdResId(STR_SLIDE_SORTER_MODE);
TabBarButton aButtonB;
aButtonB.ResourceId = FrameworkHelper::CreateResourceId(
diff --git a/sd/source/ui/framework/module/ViewTabBarModule.cxx b/sd/source/ui/framework/module/ViewTabBarModule.cxx
index 2752493faa9d..f3bdca4a7250 100644
--- a/sd/source/ui/framework/module/ViewTabBarModule.cxx
+++ b/sd/source/ui/framework/module/ViewTabBarModule.cxx
@@ -153,7 +153,7 @@ void ViewTabBarModule::UpdateViewTabBar (const Reference<XTabBar>& rxTabBar)
aImpressViewButton.ResourceId = FrameworkHelper::CreateResourceId(
FrameworkHelper::msImpressViewURL,
xAnchor);
- aImpressViewButton.ButtonLabel = SD_RESSTR(STR_NORMAL_MODE);
+ aImpressViewButton.ButtonLabel = SdResId(STR_NORMAL_MODE);
if ( ! xBar->hasTabBarButton(aImpressViewButton))
xBar->addTabBarButtonAfter(aImpressViewButton, aEmptyButton);
@@ -161,7 +161,7 @@ void ViewTabBarModule::UpdateViewTabBar (const Reference<XTabBar>& rxTabBar)
aOutlineViewButton.ResourceId = FrameworkHelper::CreateResourceId(
FrameworkHelper::msOutlineViewURL,
xAnchor);
- aOutlineViewButton.ButtonLabel = SD_RESSTR(STR_OUTLINE_MODE);
+ aOutlineViewButton.ButtonLabel = SdResId(STR_OUTLINE_MODE);
if ( ! xBar->hasTabBarButton(aOutlineViewButton))
xBar->addTabBarButtonAfter(aOutlineViewButton, aImpressViewButton);
@@ -169,7 +169,7 @@ void ViewTabBarModule::UpdateViewTabBar (const Reference<XTabBar>& rxTabBar)
aNotesViewButton.ResourceId = FrameworkHelper::CreateResourceId(
FrameworkHelper::msNotesViewURL,
xAnchor);
- aNotesViewButton.ButtonLabel = SD_RESSTR(STR_NOTES_MODE);
+ aNotesViewButton.ButtonLabel = SdResId(STR_NOTES_MODE);
if ( ! xBar->hasTabBarButton(aNotesViewButton))
xBar->addTabBarButtonAfter(aNotesViewButton, aOutlineViewButton);
@@ -177,7 +177,7 @@ void ViewTabBarModule::UpdateViewTabBar (const Reference<XTabBar>& rxTabBar)
aHandoutViewButton.ResourceId = FrameworkHelper::CreateResourceId(
FrameworkHelper::msHandoutViewURL,
xAnchor);
- aHandoutViewButton.ButtonLabel = SD_RESSTR(STR_HANDOUT_MASTER_MODE);
+ aHandoutViewButton.ButtonLabel = SdResId(STR_HANDOUT_MASTER_MODE);
if ( ! xBar->hasTabBarButton(aHandoutViewButton))
xBar->addTabBarButtonAfter(aHandoutViewButton, aNotesViewButton);
}
diff --git a/sd/source/ui/func/fubullet.cxx b/sd/source/ui/func/fubullet.cxx
index 52a104404797..82f43477691c 100644
--- a/sd/source/ui/func/fubullet.cxx
+++ b/sd/source/ui/func/fubullet.cxx
@@ -128,7 +128,7 @@ void FuBullet::InsertFormattingMark( sal_Unicode cMark )
// prepare undo
::svl::IUndoManager& rUndoMgr = pOL->GetUndoManager();
- rUndoMgr.EnterListAction(SD_RESSTR(STR_UNDO_INSERT_SPECCHAR),
+ rUndoMgr.EnterListAction(SdResId(STR_UNDO_INSERT_SPECCHAR),
"", 0, mpViewShell->GetViewShellBase().GetViewShellId() );
// insert given text
@@ -257,7 +257,7 @@ void FuBullet::InsertSpecialCharacter( SfxRequest& rReq )
::svl::IUndoManager& rUndoMgr = pOL->GetUndoManager();
ViewShellId nViewShellId = mpViewShell ? mpViewShell->GetViewShellBase().GetViewShellId() : ViewShellId(-1);
- rUndoMgr.EnterListAction(SD_RESSTR(STR_UNDO_INSERT_SPECCHAR),
+ rUndoMgr.EnterListAction(SdResId(STR_UNDO_INSERT_SPECCHAR),
"", 0, nViewShellId );
pOV->InsertText(aChars, true);
diff --git a/sd/source/ui/func/fuconrec.cxx b/sd/source/ui/func/fuconrec.cxx
index 5708102dedb8..9add8904b85c 100644
--- a/sd/source/ui/func/fuconrec.cxx
+++ b/sd/source/ui/func/fuconrec.cxx
@@ -228,7 +228,7 @@ bool FuConstructRectangle::MouseButtonUp(const MouseEvent& rMEvt)
if(SID_DRAW_MEASURELINE == nSlotId)
{
SdrLayerAdmin& rAdmin = mpDoc->GetLayerAdmin();
- OUString aStr(SD_RESSTR(STR_LAYER_MEASURELINES));
+ OUString aStr(SdResId(STR_LAYER_MEASURELINES));
pObj->SetLayer(rAdmin.GetLayerID(aStr));
}
@@ -476,7 +476,7 @@ void FuConstructRectangle::SetAttributes(SfxItemSet& rAttr, SdrObject* pObj)
{
// dimension line
SdPage* pPage = static_cast<SdPage*>( mpView->GetSdrPageView()->GetPage() );
- OUString aName(SD_RESSTR(STR_POOLSHEET_MEASURE));
+ OUString aName(SdResId(STR_POOLSHEET_MEASURE));
SfxStyleSheet* pSheet = static_cast<SfxStyleSheet*>( pPage->GetModel()->
GetStyleSheetPool()->
Find(aName, SD_STYLE_FAMILY_GRAPHICS));
@@ -488,7 +488,7 @@ void FuConstructRectangle::SetAttributes(SfxItemSet& rAttr, SdrObject* pObj)
}
SdrLayerAdmin& rAdmin = mpDoc->GetLayerAdmin();
- OUString aStr(SD_RESSTR(STR_LAYER_MEASURELINES));
+ OUString aStr(SdResId(STR_LAYER_MEASURELINES));
pObj->SetLayer(rAdmin.GetLayerID(aStr));
}
else if (nSlotId == OBJ_CUSTOMSHAPE )
@@ -506,7 +506,7 @@ void FuConstructRectangle::SetAttributes(SfxItemSet& rAttr, SdrObject* pObj)
if( pLineEndList.is() )
{
- OUString aArrowName( SVX_RES(nResId) );
+ OUString aArrowName( SvxResId(nResId) );
long nCount = pLineEndList->Count();
long nIndex;
for( nIndex = 0L; nIndex < nCount; nIndex++ )
@@ -600,9 +600,9 @@ void FuConstructRectangle::SetLineEnds(SfxItemSet& rAttr, SdrObject* pObj)
case SID_LINE_ARROWS:
{
// connector with arrow ends
- rAttr.Put(XLineStartItem(SVX_RESSTR(RID_SVXSTR_ARROW), aArrow));
+ rAttr.Put(XLineStartItem(SvxResId(RID_SVXSTR_ARROW), aArrow));
rAttr.Put(XLineStartWidthItem(nWidth));
- rAttr.Put(XLineEndItem(SVX_RESSTR(RID_SVXSTR_ARROW), aArrow));
+ rAttr.Put(XLineEndItem(SvxResId(RID_SVXSTR_ARROW), aArrow));
rAttr.Put(XLineEndWidthItem(nWidth));
}
break;
@@ -616,7 +616,7 @@ void FuConstructRectangle::SetLineEnds(SfxItemSet& rAttr, SdrObject* pObj)
case SID_LINE_ARROW_SQUARE:
{
// connector with arrow start
- rAttr.Put(XLineStartItem(SVX_RESSTR(RID_SVXSTR_ARROW), aArrow));
+ rAttr.Put(XLineStartItem(SvxResId(RID_SVXSTR_ARROW), aArrow));
rAttr.Put(XLineStartWidthItem(nWidth));
}
break;
@@ -630,7 +630,7 @@ void FuConstructRectangle::SetLineEnds(SfxItemSet& rAttr, SdrObject* pObj)
case SID_LINE_SQUARE_ARROW:
{
// connector with arrow end
- rAttr.Put(XLineEndItem(SVX_RESSTR(RID_SVXSTR_ARROW), aArrow));
+ rAttr.Put(XLineEndItem(SvxResId(RID_SVXSTR_ARROW), aArrow));
rAttr.Put(XLineEndWidthItem(nWidth));
}
break;
@@ -641,9 +641,9 @@ void FuConstructRectangle::SetLineEnds(SfxItemSet& rAttr, SdrObject* pObj)
case SID_CONNECTOR_CURVE_CIRCLES:
{
// connector with circle ends
- rAttr.Put(XLineStartItem(SVX_RESSTR(RID_SVXSTR_CIRCLE), aCircle));
+ rAttr.Put(XLineStartItem(SvxResId(RID_SVXSTR_CIRCLE), aCircle));
rAttr.Put(XLineStartWidthItem(nWidth));
- rAttr.Put(XLineEndItem(SVX_RESSTR(RID_SVXSTR_CIRCLE), aCircle));
+ rAttr.Put(XLineEndItem(SvxResId(RID_SVXSTR_CIRCLE), aCircle));
rAttr.Put(XLineEndWidthItem(nWidth));
}
break;
@@ -654,7 +654,7 @@ void FuConstructRectangle::SetLineEnds(SfxItemSet& rAttr, SdrObject* pObj)
case SID_CONNECTOR_CURVE_CIRCLE_START:
{
// connector with circle start
- rAttr.Put(XLineStartItem(SVX_RESSTR(RID_SVXSTR_CIRCLE), aCircle));
+ rAttr.Put(XLineStartItem(SvxResId(RID_SVXSTR_CIRCLE), aCircle));
rAttr.Put(XLineStartWidthItem(nWidth));
}
break;
@@ -665,7 +665,7 @@ void FuConstructRectangle::SetLineEnds(SfxItemSet& rAttr, SdrObject* pObj)
case SID_CONNECTOR_CURVE_CIRCLE_END:
{
// connector with circle ends
- rAttr.Put(XLineEndItem(SVX_RESSTR(RID_SVXSTR_CIRCLE), aCircle));
+ rAttr.Put(XLineEndItem(SvxResId(RID_SVXSTR_CIRCLE), aCircle));
rAttr.Put(XLineEndWidthItem(nWidth));
}
break;
@@ -677,7 +677,7 @@ void FuConstructRectangle::SetLineEnds(SfxItemSet& rAttr, SdrObject* pObj)
case SID_LINE_ARROW_CIRCLE:
{
// circle end
- rAttr.Put(XLineEndItem(SVX_RESSTR(RID_SVXSTR_CIRCLE), aCircle));
+ rAttr.Put(XLineEndItem(SvxResId(RID_SVXSTR_CIRCLE), aCircle));
rAttr.Put(XLineEndWidthItem(nWidth));
}
break;
@@ -685,7 +685,7 @@ void FuConstructRectangle::SetLineEnds(SfxItemSet& rAttr, SdrObject* pObj)
case SID_LINE_CIRCLE_ARROW:
{
// circle start
- rAttr.Put(XLineStartItem(SVX_RESSTR(RID_SVXSTR_CIRCLE), aCircle));
+ rAttr.Put(XLineStartItem(SvxResId(RID_SVXSTR_CIRCLE), aCircle));
rAttr.Put(XLineStartWidthItem(nWidth));
}
break;
@@ -693,7 +693,7 @@ void FuConstructRectangle::SetLineEnds(SfxItemSet& rAttr, SdrObject* pObj)
case SID_LINE_ARROW_SQUARE:
{
// square end
- rAttr.Put(XLineEndItem(SVX_RESSTR(RID_SVXSTR_SQUARE), aSquare));
+ rAttr.Put(XLineEndItem(SvxResId(RID_SVXSTR_SQUARE), aSquare));
rAttr.Put(XLineEndWidthItem(nWidth));
}
break;
@@ -701,7 +701,7 @@ void FuConstructRectangle::SetLineEnds(SfxItemSet& rAttr, SdrObject* pObj)
case SID_LINE_SQUARE_ARROW:
{
// square start
- rAttr.Put(XLineStartItem(SVX_RESSTR(RID_SVXSTR_SQUARE), aSquare));
+ rAttr.Put(XLineStartItem(SvxResId(RID_SVXSTR_SQUARE), aSquare));
rAttr.Put(XLineStartWidthItem(nWidth));
}
break;
diff --git a/sd/source/ui/func/fuconstr.cxx b/sd/source/ui/func/fuconstr.cxx
index 4366d5a5aa57..d2edf1bbca02 100644
--- a/sd/source/ui/func/fuconstr.cxx
+++ b/sd/source/ui/func/fuconstr.cxx
@@ -347,7 +347,7 @@ void FuConstruct::SetStyleSheet( SfxItemSet& rAttr, SdrObject* pObj,
************************************/
if ( bForceNoFillStyle )
{
- OUString aName(SD_RESSTR(STR_POOLSHEET_OBJWITHOUTFILL));
+ OUString aName(SdResId(STR_POOLSHEET_OBJWITHOUTFILL));
SfxStyleSheet* pSheet = static_cast<SfxStyleSheet*>(pPage->GetModel()->
GetStyleSheetPool()->
Find(aName, SD_STYLE_FAMILY_GRAPHICS));
diff --git a/sd/source/ui/func/fuconuno.cxx b/sd/source/ui/func/fuconuno.cxx
index 84024ff5c4fa..45a3f0f1f5cf 100644
--- a/sd/source/ui/func/fuconuno.cxx
+++ b/sd/source/ui/func/fuconuno.cxx
@@ -121,7 +121,7 @@ void FuConstructUnoControl::Activate()
mpWindow->SetPointer( aNewPointer );
aOldLayer = mpView->GetActiveLayer();
- mpView->SetActiveLayer( SD_RESSTR(STR_LAYER_CONTROLS) );
+ mpView->SetActiveLayer( SdResId(STR_LAYER_CONTROLS) );
FuConstruct::Activate();
}
diff --git a/sd/source/ui/func/fucopy.cxx b/sd/source/ui/func/fucopy.cxx
index 0edd047c0fed..41ce0571c81a 100644
--- a/sd/source/ui/func/fucopy.cxx
+++ b/sd/source/ui/func/fucopy.cxx
@@ -69,7 +69,7 @@ void FuCopy::DoExecute( SfxRequest& rReq )
{
// Undo
OUString aString( mpView->GetDescriptionOfMarkedObjects() );
- aString += " " + SD_RESSTR( STR_UNDO_COPYOBJECTS );
+ aString += " " + SdResId( STR_UNDO_COPYOBJECTS );
mpView->BegUndo( aString );
const SfxItemSet* pArgs = rReq.GetArgs();
@@ -174,8 +174,8 @@ void FuCopy::DoExecute( SfxRequest& rReq )
if( nNumber > 1 )
{
- OUString aStr( SD_RESSTR( STR_OBJECTS ) );
- aStr += " " + SD_RESSTR( STR_UNDO_COPYOBJECTS );
+ OUString aStr( SdResId( STR_OBJECTS ) );
+ aStr += " " + SdResId( STR_UNDO_COPYOBJECTS );
pProgress.reset(new SfxProgress( mpDocSh, aStr, nNumber ));
mpDocSh->SetWaitCursor( true );
diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx
index d82d59beca5f..2501ecb59fda 100644
--- a/sd/source/ui/func/fudraw.cxx
+++ b/sd/source/ui/func/fudraw.cxx
@@ -340,7 +340,7 @@ bool FuDraw::KeyInput(const KeyEvent& rKEvt)
{
if (mpView->IsPresObjSelected(false, true, false, true))
{
- ScopedVclPtrInstance<InfoBox>(mpWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE))->Execute();
+ ScopedVclPtrInstance<InfoBox>(mpWindow, SdResId(STR_ACTION_NOTPOSSIBLE))->Execute();
}
else
{
@@ -808,35 +808,35 @@ bool FuDraw::SetHelpText(SdrObject* pObj, const Point& rPosPixel, const SdrViewE
case presentation::ClickAction_PREVPAGE:
{
// jump to the prior page
- aHelpText = SD_RESSTR(STR_CLICK_ACTION_PREVPAGE);
+ aHelpText = SdResId(STR_CLICK_ACTION_PREVPAGE);
}
break;
case presentation::ClickAction_NEXTPAGE:
{
// jump to the next page
- aHelpText = SD_RESSTR(STR_CLICK_ACTION_NEXTPAGE);
+ aHelpText = SdResId(STR_CLICK_ACTION_NEXTPAGE);
}
break;
case presentation::ClickAction_FIRSTPAGE:
{
// jump to the first page
- aHelpText = SD_RESSTR(STR_CLICK_ACTION_FIRSTPAGE);
+ aHelpText = SdResId(STR_CLICK_ACTION_FIRSTPAGE);
}
break;
case presentation::ClickAction_LASTPAGE:
{
// jump to the last page
- aHelpText = SD_RESSTR(STR_CLICK_ACTION_LASTPAGE);
+ aHelpText = SdResId(STR_CLICK_ACTION_LASTPAGE);
}
break;
case presentation::ClickAction_BOOKMARK:
{
// jump to object/page
- aHelpText = SD_RESSTR(STR_CLICK_ACTION_BOOKMARK);
+ aHelpText = SdResId(STR_CLICK_ACTION_BOOKMARK);
aHelpText += ": ";
aHelpText += INetURLObject::decode( pInfo->GetBookmark(), INetURLObject::DecodeMechanism::WithCharset );
}
@@ -845,7 +845,7 @@ bool FuDraw::SetHelpText(SdrObject* pObj, const Point& rPosPixel, const SdrViewE
case presentation::ClickAction_DOCUMENT:
{
// jump to document (object/page)
- aHelpText = SD_RESSTR(STR_CLICK_ACTION_DOCUMENT);
+ aHelpText = SdResId(STR_CLICK_ACTION_DOCUMENT);
aHelpText += ": ";
aHelpText += INetURLObject::decode( pInfo->GetBookmark(), INetURLObject::DecodeMechanism::WithCharset );
}
@@ -854,7 +854,7 @@ bool FuDraw::SetHelpText(SdrObject* pObj, const Point& rPosPixel, const SdrViewE
case presentation::ClickAction_PROGRAM:
{
// execute program
- aHelpText = SD_RESSTR(STR_CLICK_ACTION_PROGRAM);
+ aHelpText = SdResId(STR_CLICK_ACTION_PROGRAM);
aHelpText += ": ";
aHelpText += INetURLObject::decode( pInfo->GetBookmark(), INetURLObject::DecodeMechanism::WithCharset );
}
@@ -863,7 +863,7 @@ bool FuDraw::SetHelpText(SdrObject* pObj, const Point& rPosPixel, const SdrViewE
case presentation::ClickAction_MACRO:
{
// execute program
- aHelpText = SD_RESSTR(STR_CLICK_ACTION_MACRO);
+ aHelpText = SdResId(STR_CLICK_ACTION_MACRO);
aHelpText += ": ";
if ( SfxApplication::IsXScriptURL( pInfo->GetBookmark() ) )
@@ -885,21 +885,21 @@ bool FuDraw::SetHelpText(SdrObject* pObj, const Point& rPosPixel, const SdrViewE
case presentation::ClickAction_SOUND:
{
// play-back sound
- aHelpText = SD_RESSTR(STR_CLICK_ACTION_SOUND);
+ aHelpText = SdResId(STR_CLICK_ACTION_SOUND);
}
break;
case presentation::ClickAction_VERB:
{
// execute OLE-verb
- aHelpText = SD_RESSTR(STR_CLICK_ACTION_VERB);
+ aHelpText = SdResId(STR_CLICK_ACTION_VERB);
}
break;
case presentation::ClickAction_STOPPRESENTATION:
{
// quit presentation
- aHelpText = SD_RESSTR(STR_CLICK_ACTION_STOPPRESENTATION);
+ aHelpText = SdResId(STR_CLICK_ACTION_STOPPRESENTATION);
}
break;
default:
diff --git a/sd/source/ui/func/fuexpand.cxx b/sd/source/ui/func/fuexpand.cxx
index c89b10289879..a7b3dbcbb419 100644
--- a/sd/source/ui/func/fuexpand.cxx
+++ b/sd/source/ui/func/fuexpand.cxx
@@ -109,7 +109,7 @@ void FuExpandPage::DoExecute( SfxRequest& )
const bool bUndo = mpView->IsUndoEnabled();
if( bUndo )
- mpView->BegUndo(SD_RESSTR(STR_UNDO_EXPAND_PAGE));
+ mpView->BegUndo(SdResId(STR_UNDO_EXPAND_PAGE));
// set current structuring-object into outliner
OutlinerParaObject* pParaObj = pActualOutline->GetOutlinerParaObject();
diff --git a/sd/source/ui/func/fuhhconv.cxx b/sd/source/ui/func/fuhhconv.cxx
index cad5a7a59974..bb471096812a 100644
--- a/sd/source/ui/func/fuhhconv.cxx
+++ b/sd/source/ui/func/fuhhconv.cxx
@@ -99,7 +99,7 @@ void FuHangulHanjaConversion::StartConversion( LanguageType nSourceLanguage, Lan
const vcl::Font *pTargetFont, sal_Int32 nOptions, bool bIsInteractive )
{
- mpView->BegUndo(SD_RESSTR(STR_UNDO_HANGULHANJACONVERSION));
+ mpView->BegUndo(SdResId(STR_UNDO_HANGULHANJACONVERSION));
ViewShellBase* pBase = dynamic_cast<ViewShellBase*>( SfxViewShell::Current() );
if (pBase != nullptr)
diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx
index b3d431a98b25..d8f9d04a7fb6 100644
--- a/sd/source/ui/func/fuinsert.cxx
+++ b/sd/source/ui/func/fuinsert.cxx
@@ -783,12 +783,12 @@ void FuInsert3DModel::DoExecute( SfxRequest& )
{
sfx2::FileDialogHelper aDlg( ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE );
- aDlg.SetTitle( SD_RESSTR( STR_INSERT_3D_MODEL_TITLE ) );
+ aDlg.SetTitle( SdResId( STR_INSERT_3D_MODEL_TITLE ) );
#if HAVE_FEATURE_COLLADA
- aDlg.AddFilter( SD_RESSTR( STR_INSERT_3D_MODEL_ALL_SUPPORTED_FORMATS ), "*.json;*.dae;*.kmz" );
+ aDlg.AddFilter( SdResId( STR_INSERT_3D_MODEL_ALL_SUPPORTED_FORMATS ), "*.json;*.dae;*.kmz" );
#else
- aDlg.AddFilter( SD_RESSTR( STR_INSERT_3D_MODEL_ALL_SUPPORTED_FORMATS ), "*.json" );
+ aDlg.AddFilter( SdResId( STR_INSERT_3D_MODEL_ALL_SUPPORTED_FORMATS ), "*.json" );
#endif
aDlg.AddFilter( "JSON - GL Transmission Format", "*.json" );
diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx
index d4ace7dc8e36..0ba07d137a37 100644
--- a/sd/source/ui/func/fuinsfil.cxx
+++ b/sd/source/ui/func/fuinsfil.cxx
@@ -145,7 +145,7 @@ void FuInsertFile::DoExecute( SfxRequest& rReq )
OUString aOwnCont;
OUString aOtherCont;
- aFileDialog.SetTitle( SD_RESSTR(STR_DLG_INSERT_PAGES_FROM_FILE) );
+ aFileDialog.SetTitle( SdResId(STR_DLG_INSERT_PAGES_FROM_FILE) );
if( mpDoc->GetDocumentType() == DocumentType::Impress )
{
@@ -216,7 +216,7 @@ void FuInsertFile::DoExecute( SfxRequest& rReq )
}
// set default-filter (<All>)
- OUString aAllSpec( SD_RESSTR( STR_ALL_FILES ) );
+ OUString aAllSpec( SdResId( STR_ALL_FILES ) );
OUString aExtensions = lcl_GetExtensionsList( aFilterVector );
OUString aGUIName = aAllSpec + " (" + aExtensions + ")";
@@ -317,7 +317,7 @@ void FuInsertFile::DoExecute( SfxRequest& rReq )
if( !bInserted )
{
- ScopedVclPtrInstance< MessageDialog > aErrorBox(mpWindow, SD_RESSTR( STR_READ_DATA_ERROR));
+ ScopedVclPtrInstance< MessageDialog > aErrorBox(mpWindow, SdResId( STR_READ_DATA_ERROR));
aErrorBox->Execute();
}
}
@@ -460,7 +460,7 @@ void FuInsertFile::InsTextOrRTFinDrMode(SfxMedium* pMedium)
if (nErr || pOutliner->GetEditEngine().GetText().isEmpty())
{
- ScopedVclPtrInstance< MessageDialog > aErrorBox(mpWindow, SD_RESSTR(STR_READ_DATA_ERROR));
+ ScopedVclPtrInstance< MessageDialog > aErrorBox(mpWindow, SdResId(STR_READ_DATA_ERROR));
aErrorBox->Execute();
}
else
@@ -509,7 +509,7 @@ void FuInsertFile::InsTextOrRTFinDrMode(SfxMedium* pMedium)
const bool bUndo = mpView->IsUndoEnabled();
if( bUndo )
- mpView->BegUndo(SD_RESSTR(STR_UNDO_INSERT_TEXTFRAME));
+ mpView->BegUndo(SdResId(STR_UNDO_INSERT_TEXTFRAME));
pPage->InsertObject(pTO);
/* can be bigger as the maximal allowed size:
@@ -604,7 +604,7 @@ void FuInsertFile::InsTextOrRTFinOlMode(SfxMedium* pMedium)
if (nErr || pOutliner->GetEditEngine().GetText().isEmpty())
{
- ScopedVclPtrInstance< MessageDialog > aErrorBox(mpWindow, SD_RESSTR(STR_READ_DATA_ERROR));
+ ScopedVclPtrInstance< MessageDialog > aErrorBox(mpWindow, SdResId(STR_READ_DATA_ERROR));
aErrorBox->Execute();
}
else
@@ -624,7 +624,7 @@ void FuInsertFile::InsTextOrRTFinOlMode(SfxMedium* pMedium)
mpDocSh->SetWaitCursor( false );
- std::unique_ptr<SfxProgress> pProgress(new SfxProgress( mpDocSh, SD_RESSTR(STR_CREATE_PAGES), nNewPages));
+ std::unique_ptr<SfxProgress> pProgress(new SfxProgress( mpDocSh, SdResId(STR_CREATE_PAGES), nNewPages));
if( pProgress )
pProgress->SetState( 0, 100 );
@@ -632,7 +632,7 @@ void FuInsertFile::InsTextOrRTFinOlMode(SfxMedium* pMedium)
ViewShellId nViewShellId = mpViewShell ? mpViewShell->GetViewShellBase().GetViewShellId() : ViewShellId(-1);
rDocliner.GetUndoManager().EnterListAction(
- SD_RESSTR(STR_UNDO_INSERT_FILE), OUString(), 0, nViewShellId );
+ SdResId(STR_UNDO_INSERT_FILE), OUString(), 0, nViewShellId );
sal_Int32 nSourcePos = 0;
SfxStyleSheet* pStyleSheet = pPage->GetStyleSheetForPresObj( PRESOBJ_OUTLINE );
diff --git a/sd/source/ui/func/fulinend.cxx b/sd/source/ui/func/fulinend.cxx
index a3ff6e656b92..426c8f26a9bf 100644
--- a/sd/source/ui/func/fulinend.cxx
+++ b/sd/source/ui/func/fulinend.cxx
@@ -92,8 +92,8 @@ void FuLineEnd::DoExecute( SfxRequest& )
XLineEndListRef pLineEndList = mpDoc->GetLineEndList();
- OUString aNewName( SD_RESSTR( STR_LINEEND ) );
- OUString aDesc( SD_RESSTR( STR_DESC_LINEEND ) );
+ OUString aNewName( SdResId( STR_LINEEND ) );
+ OUString aDesc( SdResId( STR_DESC_LINEEND ) );
OUString aName;
long nCount = pLineEndList->Count();
@@ -138,7 +138,7 @@ void FuLineEnd::DoExecute( SfxRequest& )
else
{
ScopedVclPtrInstance<WarningBox> aWarningBox( mpWindow, WinBits( WB_OK ),
- SD_RESSTR( STR_WARN_NAME_DUPLICATE ) );
+ SdResId( STR_WARN_NAME_DUPLICATE ) );
aWarningBox->Execute();
}
}
diff --git a/sd/source/ui/func/fumorph.cxx b/sd/source/ui/func/fumorph.cxx
index 009a2f39426c..84484652aab6 100644
--- a/sd/source/ui/func/fumorph.cxx
+++ b/sd/source/ui/func/fumorph.cxx
@@ -166,7 +166,7 @@ void FuMorph::DoExecute( SfxRequest& )
if(ImpMorphPolygons(aPolyPoly1, aPolyPoly2, pDlg->GetFadeSteps(), aPolyPolyList))
{
OUString aString(mpView->GetDescriptionOfMarkedObjects());
- aString += " " + SD_RESSTR(STR_UNDO_MORPHING);
+ aString += " " + SdResId(STR_UNDO_MORPHING);
mpView->BegUndo(aString);
ImpInsertPolygons(aPolyPolyList, pDlg->IsAttributeFade(), pObj1, pObj2);
diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx
index 5a9acafd6f11..40095175025e 100644
--- a/sd/source/ui/func/fupage.cxx
+++ b/sd/source/ui/func/fupage.cxx
@@ -377,9 +377,9 @@ const SfxItemSet* FuPage::ExecuteDialog( vcl::Window* pParent )
if( ePageKind != PageKind::Notes )
{
ScopedVclPtrInstance<MessageDialog> aQuestionBox(
- pParent, SD_RESSTR(STR_PAGE_BACKGROUND_TXT),
+ pParent, SdResId(STR_PAGE_BACKGROUND_TXT),
VclMessageType::Question, VclButtonsType::YesNo);
- aQuestionBox->SetText(SD_RESSTR(STR_PAGE_BACKGROUND_TITLE));
+ aQuestionBox->SetText(SdResId(STR_PAGE_BACKGROUND_TITLE));
bSetToAllPages = ( RET_YES == aQuestionBox->Execute() );
}
diff --git a/sd/source/ui/func/fusldlg.cxx b/sd/source/ui/func/fusldlg.cxx
index 8d3a4218839f..2ef0a548a184 100644
--- a/sd/source/ui/func/fusldlg.cxx
+++ b/sd/source/ui/func/fusldlg.cxx
@@ -74,7 +74,7 @@ void FuSlideShowDlg::DoExecute( SfxRequest& )
if ( aStr.isEmpty() )
{
- aStr = SD_RESSTR( STR_PAGE ) + OUString::number( nPage + 1 );
+ aStr = SdResId( STR_PAGE ) + OUString::number( nPage + 1 );
}
aPageNameList[ nPage ] = aStr;
diff --git a/sd/source/ui/func/fusnapln.cxx b/sd/source/ui/func/fusnapln.cxx
index 958f7f906a1e..25fe9b64a559 100644
--- a/sd/source/ui/func/fusnapln.cxx
+++ b/sd/source/ui/func/fusnapln.cxx
@@ -123,12 +123,12 @@ void FuSnapLine::DoExecute( SfxRequest& rReq )
if ( rHelpLine.GetKind() == SdrHelpLineKind::Point )
{
- pDlg->SetText(SD_RESSTR(STR_SNAPDLG_SETPOINT));
+ pDlg->SetText(SdResId(STR_SNAPDLG_SETPOINT));
pDlg->SetInputFields(true, true);
}
else
{
- pDlg->SetText(SD_RESSTR(STR_SNAPDLG_SETLINE));
+ pDlg->SetText(SdResId(STR_SNAPDLG_SETLINE));
if ( rHelpLine.GetKind() == SdrHelpLineKind::Vertical )
pDlg->SetInputFields(true, false);
diff --git a/sd/source/ui/func/fusumry.cxx b/sd/source/ui/func/fusumry.cxx
index e6377d7d1b1d..661e5ae13359 100644
--- a/sd/source/ui/func/fusumry.cxx
+++ b/sd/source/ui/func/fusumry.cxx
@@ -112,7 +112,7 @@ void FuSummaryPage::DoExecute( SfxRequest& )
if( bUndo )
{
- mpView->BegUndo(SD_RESSTR(STR_UNDO_SUMMARY_PAGE));
+ mpView->BegUndo(SdResId(STR_UNDO_SUMMARY_PAGE));
bBegUndo = true;
}
diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx
index cdead7212cee..51a074342c25 100644
--- a/sd/source/ui/func/futempl.cxx
+++ b/sd/source/ui/func/futempl.cxx
@@ -183,7 +183,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
}
else
{
- pStyleSheet->SetParent(SD_RESSTR(STR_STANDARD_STYLESHEET_NAME));
+ pStyleSheet->SetParent(SdResId(STR_STANDARD_STYLESHEET_NAME));
}
}
break;
@@ -198,7 +198,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
p = nullptr;
}
pStyleSheet = &pSSPool->Make( aStyleName, nFamily, SFXSTYLEBIT_USERDEF );
- pStyleSheet->SetParent(SD_RESSTR(STR_STANDARD_STYLESHEET_NAME));
+ pStyleSheet->SetParent(SdResId(STR_STANDARD_STYLESHEET_NAME));
}
break;
@@ -326,39 +326,39 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
OUString aName(pStyleSheet->GetName());
sal_uInt16 nDlgId = 0;
- if (aName == SD_RESSTR(STR_PSEUDOSHEET_TITLE))
+ if (aName == SdResId(STR_PSEUDOSHEET_TITLE))
{
nDlgId = TAB_PRES_LAYOUT_TEMPLATE;
ePO = PO_TITLE;
}
- else if (aName == SD_RESSTR(STR_PSEUDOSHEET_SUBTITLE))
+ else if (aName == SdResId(STR_PSEUDOSHEET_SUBTITLE))
{
nDlgId = TAB_PRES_LAYOUT_TEMPLATE;
ePO = PO_SUBTITLE;
}
else if (aName ==
- SD_RESSTR(STR_PSEUDOSHEET_BACKGROUND))
+ SdResId(STR_PSEUDOSHEET_BACKGROUND))
{
nDlgId = TAB_PRES_LAYOUT_TEMPLATE_BACKGROUND;
ePO = PO_BACKGROUND;
}
else if (aName ==
- SD_RESSTR(STR_PSEUDOSHEET_BACKGROUNDOBJECTS))
+ SdResId(STR_PSEUDOSHEET_BACKGROUNDOBJECTS))
{
nDlgId = TAB_PRES_LAYOUT_TEMPLATE;
ePO = PO_BACKGROUNDOBJECTS;
}
else if (aName ==
- SD_RESSTR(STR_PSEUDOSHEET_NOTES))
+ SdResId(STR_PSEUDOSHEET_NOTES))
{
nDlgId = TAB_PRES_LAYOUT_TEMPLATE;
ePO = PO_NOTES;
}
- else if(aName.indexOf(SD_RESSTR(STR_PSEUDOSHEET_OUTLINE)) != -1)
+ else if(aName.indexOf(SdResId(STR_PSEUDOSHEET_OUTLINE)) != -1)
{
nDlgId = TAB_PRES_LAYOUT_TEMPLATE;
- OUString aOutlineStr(SD_RESSTR(STR_PSEUDOSHEET_OUTLINE));
+ OUString aOutlineStr(SdResId(STR_PSEUDOSHEET_OUTLINE));
// determine number, mind the blank between name and number
OUString aNumStr(aName.copy(aOutlineStr.getLength() + 1));
sal_uInt16 nLevel = (sal_uInt16)aNumStr.toInt32();
@@ -434,7 +434,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
{
SvxNumRule aRule(*aTempSet.GetItem<SvxNumBulletItem>(EE_PARA_NUMBULLET)->GetNumRule());
- OUString sStyleName(SD_RESSTR(STR_PSEUDOSHEET_OUTLINE) + " 1");
+ OUString sStyleName(SdResId(STR_PSEUDOSHEET_OUTLINE) + " 1");
SfxStyleSheetBase* pFirstStyleSheet = pSSPool->Find( sStyleName, SD_STYLE_FAMILY_PSEUDO);
if(pFirstStyleSheet)
diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx
index e22615cb5728..e794d2602479 100644
--- a/sd/source/ui/func/futext.cxx
+++ b/sd/source/ui/func/futext.cxx
@@ -1391,7 +1391,7 @@ void FuText::ChangeFontSize( bool bGrow, OutlinerView* pOLV, const FontList* pFo
else
{
- pView->BegUndo(SD_RESSTR(bGrow ? STR_GROW_FONT_SIZE : STR_SHRINK_FONT_SIZE));
+ pView->BegUndo(SdResId(bGrow ? STR_GROW_FONT_SIZE : STR_SHRINK_FONT_SIZE));
const SdrMarkList& rMarkList = pView->GetMarkedObjectList();
for( size_t nMark = 0; nMark < rMarkList.GetMarkCount(); ++nMark )
{
diff --git a/sd/source/ui/func/futransf.cxx b/sd/source/ui/func/futransf.cxx
index 45aeff70c7b5..ccee671a24f7 100644
--- a/sd/source/ui/func/futransf.cxx
+++ b/sd/source/ui/func/futransf.cxx
@@ -106,7 +106,7 @@ void FuTransform::DoExecute( SfxRequest& rReq )
{
// Undo
OUString aString( mpView->GetDescriptionOfMarkedObjects() );
- aString += " " + SD_RESSTR( STR_TRANSFORM );
+ aString += " " + SdResId( STR_TRANSFORM );
mpView->BegUndo( aString );
mpView->SetGeoAttrToMarked( *pArgs );
diff --git a/sd/source/ui/func/fuvect.cxx b/sd/source/ui/func/fuvect.cxx
index bd23fe21b7e5..0d7be7b819eb 100644
--- a/sd/source/ui/func/fuvect.cxx
+++ b/sd/source/ui/func/fuvect.cxx
@@ -73,7 +73,7 @@ void FuVectorize::DoExecute( SfxRequest& )
{
SdrGrafObj* pVectObj = static_cast<SdrGrafObj*>( pObj->Clone() );
OUString aStr( mpView->GetDescriptionOfMarkedObjects() );
- aStr += " " + SD_RESSTR( STR_UNDO_VECTORIZE );
+ aStr += " " + SdResId( STR_UNDO_VECTORIZE );
mpView->BegUndo( aStr );
pVectObj->SetGraphic( rMtf );
mpView->ReplaceObjectAtView( pObj, *pPageView, pVectObj );
diff --git a/sd/source/ui/func/unprlout.cxx b/sd/source/ui/func/unprlout.cxx
index 0e9c122d74d0..8aaed9932d89 100644
--- a/sd/source/ui/func/unprlout.cxx
+++ b/sd/source/ui/func/unprlout.cxx
@@ -43,7 +43,7 @@ SdPresentationLayoutUndoAction::SdPresentationLayoutUndoAction(
DBG_ASSERT(pThePage, "No Page set!");
pPage = pThePage;
- aComment = SD_RESSTR(STR_UNDO_SET_PRESLAYOUT);
+ aComment = SdResId(STR_UNDO_SET_PRESLAYOUT);
}
void SdPresentationLayoutUndoAction::Undo()
diff --git a/sd/source/ui/sidebar/DocumentHelper.cxx b/sd/source/ui/sidebar/DocumentHelper.cxx
index d6d7c9fd7585..ae147d43cb00 100644
--- a/sd/source/ui/sidebar/DocumentHelper.cxx
+++ b/sd/source/ui/sidebar/DocumentHelper.cxx
@@ -322,7 +322,7 @@ void DocumentHelper::AssignMasterPageToPageList (
::svl::IUndoManager* pUndoMgr = rTargetDocument.GetDocSh()->GetUndoManager();
if( pUndoMgr )
- pUndoMgr->EnterListAction(SD_RESSTR(STR_UNDO_SET_PRESLAYOUT), OUString(), 0, rTargetDocument.GetDocSh()->GetViewShell()->GetViewShellBase().GetViewShellId());
+ pUndoMgr->EnterListAction(SdResId(STR_UNDO_SET_PRESLAYOUT), OUString(), 0, rTargetDocument.GetDocSh()->GetViewShell()->GetViewShellBase().GetViewShellId());
SdPage* pMasterPageInDocument = ProvideMasterPage(rTargetDocument,pMasterPage,rpPageList);
if (pMasterPageInDocument == nullptr)
diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx
index 93159a16beae..770ea132666b 100644
--- a/sd/source/ui/sidebar/LayoutMenu.cxx
+++ b/sd/source/ui/sidebar/LayoutMenu.cxx
@@ -468,9 +468,9 @@ SfxRequest LayoutMenu::CreateRequest (
{
SdrLayerAdmin& rLayerAdmin (mrBase.GetDocument()->GetLayerAdmin());
SdrLayerID aBackground (rLayerAdmin.GetLayerID(
- SD_RESSTR(STR_LAYER_BCKGRND)));
+ SdResId(STR_LAYER_BCKGRND)));
SdrLayerID aBackgroundObject (rLayerAdmin.GetLayerID(
- SD_RESSTR(STR_LAYER_BCKGRNDOBJ)));
+ SdResId(STR_LAYER_BCKGRNDOBJ)));
ViewShell* pViewShell = mrBase.GetMainViewShell().get();
if (pViewShell == nullptr)
break;
diff --git a/sd/source/ui/sidebar/SlideBackground.cxx b/sd/source/ui/sidebar/SlideBackground.cxx
index cd71372756e7..7425518a5980 100644
--- a/sd/source/ui/sidebar/SlideBackground.cxx
+++ b/sd/source/ui/sidebar/SlideBackground.cxx
@@ -343,12 +343,12 @@ IMPL_LINK(SlideBackground, EventMultiplexerListener,
{
if( IsImpress() )
{
- SetPanelTitle(SD_RESSTR(STR_MASTERSLIDE_NAME));
+ SetPanelTitle(SdResId(STR_MASTERSLIDE_NAME));
mpEditMaster->Hide();
mpCloseMaster->Show();
}
else
- SetPanelTitle(SD_RESSTR(STR_MASTERPAGE_NAME));
+ SetPanelTitle(SdResId(STR_MASTERPAGE_NAME));
mpMasterSlide->Disable();
mpDspMasterBackground->Disable();
mpDspMasterObjects->Disable();
@@ -357,12 +357,12 @@ IMPL_LINK(SlideBackground, EventMultiplexerListener,
{
if( IsImpress() )
{
- SetPanelTitle(SD_RESSTR(STR_SLIDE_NAME));
+ SetPanelTitle(SdResId(STR_SLIDE_NAME));
mpCloseMaster->Hide();
mpEditMaster->Show();
}
else
- SetPanelTitle(SD_RESSTR(STR_PAGE_NAME));
+ SetPanelTitle(SdResId(STR_PAGE_NAME));
mpMasterSlide->Enable();
mpDspMasterBackground->Enable();
mpDspMasterObjects->Enable();
@@ -401,25 +401,25 @@ IMPL_LINK(SlideBackground, EventMultiplexerListener,
vcl::EnumContext::Context::MasterPage);
if(maContext == aDrawOtherContext || maContext == aDrawMasterContext)
{
- mpMasterLabel->SetText(SD_RESSTR(STR_MASTERPAGE_NAME));
+ mpMasterLabel->SetText(SdResId(STR_MASTERPAGE_NAME));
maApplication = vcl::EnumContext::Application::Draw;
mpCloseMaster->Hide();
mpEditMaster->Hide();
if( maContext == aDrawMasterContext)
- SetPanelTitle(SD_RESSTR(STR_MASTERPAGE_NAME));
+ SetPanelTitle(SdResId(STR_MASTERPAGE_NAME));
else
- SetPanelTitle(SD_RESSTR(STR_PAGE_NAME));
+ SetPanelTitle(SdResId(STR_PAGE_NAME));
}
else if ( maContext == aImpressOtherContext || maContext == aImpressMasterContext )
{
- mpMasterLabel->SetText(SD_RESSTR(STR_MASTERSLIDE_NAME));
+ mpMasterLabel->SetText(SdResId(STR_MASTERSLIDE_NAME));
maApplication = vcl::EnumContext::Application::Impress;
mpCloseMaster->Hide();
mpEditMaster->Show();
if( maContext == aImpressMasterContext )
- SetPanelTitle(SD_RESSTR(STR_MASTERSLIDE_NAME));
+ SetPanelTitle(SdResId(STR_MASTERSLIDE_NAME));
else
- SetPanelTitle(SD_RESSTR(STR_SLIDE_NAME));
+ SetPanelTitle(SdResId(STR_SLIDE_NAME));
}
mbTitle = true;
}
diff --git a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
index 4f3d4d23e5c8..1043ee7a1af0 100644
--- a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
@@ -118,9 +118,9 @@ public:
if (mpDocument!=nullptr && mpDocument->IsUndoEnabled())
{
if (mpMainViewShell && mpMainViewShell->GetShellType() == ViewShell::ST_DRAW)
- mpDocument->BegUndo(SD_RESSTR(STRING_DRAG_AND_DROP_PAGES));
+ mpDocument->BegUndo(SdResId(STRING_DRAG_AND_DROP_PAGES));
else
- mpDocument->BegUndo(SD_RESSTR(STRING_DRAG_AND_DROP_SLIDES));
+ mpDocument->BegUndo(SdResId(STRING_DRAG_AND_DROP_SLIDES));
}
}
diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
index aef29161a600..67180808ecf2 100644
--- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
@@ -834,7 +834,7 @@ void SlotManager::GetStatusBarState (SfxItemSet& rSet)
nPageCount = mrSlideSorter.GetModel().GetPageCount();
nActivePageCount = static_cast<sal_Int32>(mrSlideSorter.GetModel().GetDocument()->GetActiveSdPageCount());
- aPageStr = (nPageCount == nActivePageCount) ? SD_RESSTR(STR_SD_PAGE_COUNT) : SD_RESSTR(STR_SD_PAGE_COUNT_CUSTOM);
+ aPageStr = (nPageCount == nActivePageCount) ? SdResId(STR_SD_PAGE_COUNT) : SdResId(STR_SD_PAGE_COUNT_CUSTOM);
aPageStr = aPageStr.replaceFirst("%1", OUString::number(nFirstPage));
aPageStr = aPageStr.replaceFirst("%2", OUString::number(nPageCount));
@@ -946,8 +946,8 @@ bool SlotManager::RenameSlideFromDrawViewShell( sal_uInt16 nPageId, const OUStri
// Undo
SdPage* pUndoPage = pPageToRename;
SdrLayerAdmin & rLayerAdmin = pDocument->GetLayerAdmin();
- SdrLayerID nBackground = rLayerAdmin.GetLayerID( SD_RESSTR( STR_LAYER_BCKGRND ) );
- SdrLayerID nBgObj = rLayerAdmin.GetLayerID( SD_RESSTR( STR_LAYER_BCKGRNDOBJ ) );
+ SdrLayerID nBackground = rLayerAdmin.GetLayerID( SdResId( STR_LAYER_BCKGRND ) );
+ SdrLayerID nBgObj = rLayerAdmin.GetLayerID( SdResId( STR_LAYER_BCKGRNDOBJ ) );
SdrLayerIDSet aVisibleLayers = pPageToRename->TRG_GetMasterPageVisibleLayers();
// (#67720#)
@@ -1089,7 +1089,7 @@ void SlotManager::DuplicateSelectedSlides (SfxRequest& rRequest)
// created pages in aPagesToSelect.
const bool bUndo (aPagesToDuplicate.size()>1 && mrSlideSorter.GetView().IsUndoEnabled());
if (bUndo)
- mrSlideSorter.GetView().BegUndo(SD_RESSTR(STR_INSERTPAGE));
+ mrSlideSorter.GetView().BegUndo(SdResId(STR_INSERTPAGE));
::std::vector<SdPage*> aPagesToSelect;
for(::std::vector<SdPage*>::const_iterator
diff --git a/sd/source/ui/slidesorter/view/SlsToolTip.cxx b/sd/source/ui/slidesorter/view/SlsToolTip.cxx
index 515520b8371a..3835ca5bd6b2 100644
--- a/sd/source/ui/slidesorter/view/SlsToolTip.cxx
+++ b/sd/source/ui/slidesorter/view/SlsToolTip.cxx
@@ -77,7 +77,7 @@ void ToolTip::SetPage (const model::SharedPageDescriptor& rpDescriptor)
}
if (sHelpText.isEmpty())
{
- sHelpText = SD_RESSTR(STR_PAGE);
+ sHelpText = SdResId(STR_PAGE);
sHelpText += OUString::number(mpDescriptor->GetPageIndex()+1);
}
diff --git a/sd/source/ui/table/tableobjectbar.cxx b/sd/source/ui/table/tableobjectbar.cxx
index 7f69df7c14a2..139c59cfb507 100644
--- a/sd/source/ui/table/tableobjectbar.cxx
+++ b/sd/source/ui/table/tableobjectbar.cxx
@@ -91,7 +91,7 @@ TableObjectBar::TableObjectBar( ViewShell* pSdViewShell, ::sd::View* pSdView )
SetUndoManager( pDocShell->GetUndoManager() );
}
SetRepeatTarget( mpView );
- SetName( SD_RESSTR( RID_DRAW_TABLE_TOOLBOX ) );
+ SetName( SdResId( RID_DRAW_TABLE_TOOLBOX ) );
SetContextName(vcl::EnumContext::GetContextName(vcl::EnumContext::Context::Table));
}
diff --git a/sd/source/ui/unoidl/unolayer.cxx b/sd/source/ui/unoidl/unolayer.cxx
index aa2d98380918..847e101cfe21 100644
--- a/sd/source/ui/unoidl/unolayer.cxx
+++ b/sd/source/ui/unoidl/unolayer.cxx
@@ -81,23 +81,23 @@ OUString SdLayer::convertToInternalName( const OUString& rName )
{
if ( rName == sUNO_LayerName_background )
{
- return SD_RESSTR( STR_LAYER_BCKGRND );
+ return SdResId( STR_LAYER_BCKGRND );
}
else if ( rName == sUNO_LayerName_background_objects )
{
- return SD_RESSTR( STR_LAYER_BCKGRNDOBJ );
+ return SdResId( STR_LAYER_BCKGRNDOBJ );
}
else if ( rName == sUNO_LayerName_layout )
{
- return SD_RESSTR( STR_LAYER_LAYOUT );
+ return SdResId( STR_LAYER_LAYOUT );
}
else if ( rName == sUNO_LayerName_controls )
{
- return SD_RESSTR( STR_LAYER_CONTROLS );
+ return SdResId( STR_LAYER_CONTROLS );
}
else if ( rName == sUNO_LayerName_measurelines )
{
- return SD_RESSTR( STR_LAYER_MEASURELINES );
+ return SdResId( STR_LAYER_MEASURELINES );
}
else
{
@@ -107,23 +107,23 @@ OUString SdLayer::convertToInternalName( const OUString& rName )
OUString SdLayer::convertToExternalName( const OUString& rName )
{
- if( rName == SD_RESSTR( STR_LAYER_BCKGRND ) )
+ if( rName == SdResId( STR_LAYER_BCKGRND ) )
{
return OUString( sUNO_LayerName_background );
}
- else if( rName == SD_RESSTR( STR_LAYER_BCKGRNDOBJ ) )
+ else if( rName == SdResId( STR_LAYER_BCKGRNDOBJ ) )
{
return OUString( sUNO_LayerName_background_objects );
}
- else if( rName == SD_RESSTR( STR_LAYER_LAYOUT ) )
+ else if( rName == SdResId( STR_LAYER_LAYOUT ) )
{
return OUString( sUNO_LayerName_layout );
}
- else if( rName == SD_RESSTR( STR_LAYER_CONTROLS ) )
+ else if( rName == SdResId( STR_LAYER_CONTROLS ) )
{
return OUString( sUNO_LayerName_controls );
}
- else if( rName == SD_RESSTR( STR_LAYER_MEASURELINES ) )
+ else if( rName == SdResId( STR_LAYER_MEASURELINES ) )
{
return OUString( sUNO_LayerName_measurelines );
}
@@ -488,7 +488,7 @@ uno::Reference< drawing::XLayer > SAL_CALL SdLayerManager::insertNewByIndex( sal
// Test for existing names
while( aLayerName.isEmpty() || rLayerAdmin.GetLayer( aLayerName ) )
{
- aLayerName = SD_RESSTR(STR_LAYER);
+ aLayerName = SdResId(STR_LAYER);
aLayerName += OUString::number(nLayer);
++nLayer;
}
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index b5c478e549f1..bf8f41b28534 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -468,8 +468,8 @@ SdPage* SdXImpressDocument::InsertSdPage( sal_uInt16 nPage, bool bDuplicate )
{
sal_uInt16 nPageCount = mpDoc->GetSdPageCount( PageKind::Standard );
SdrLayerAdmin& rLayerAdmin = mpDoc->GetLayerAdmin();
- SdrLayerID aBckgrnd = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND));
- SdrLayerID aBckgrndObj = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ));
+ SdrLayerID aBckgrnd = rLayerAdmin.GetLayerID(SdResId(STR_LAYER_BCKGRND));
+ SdrLayerID aBckgrndObj = rLayerAdmin.GetLayerID(SdResId(STR_LAYER_BCKGRNDOBJ));
SdPage* pStandardPage = nullptr;
@@ -530,8 +530,8 @@ SdPage* SdXImpressDocument::InsertSdPage( sal_uInt16 nPage, bool bDuplicate )
pStandardPage->SetAutoLayout(AUTOLAYOUT_NONE, true );
}
- aBckgrnd = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND));
- aBckgrndObj = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ));
+ aBckgrnd = rLayerAdmin.GetLayerID(SdResId(STR_LAYER_BCKGRND));
+ aBckgrndObj = rLayerAdmin.GetLayerID(SdResId(STR_LAYER_BCKGRNDOBJ));
aVisibleLayers.Set(aBckgrnd, bIsPageBack);
aVisibleLayers.Set(aBckgrndObj, bIsPageObj);
pStandardPage->TRG_SetMasterPageVisibleLayers(aVisibleLayers);
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index 8b02b73abe77..5a161ce673b2 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -793,7 +793,7 @@ void SAL_CALL SdGenericDrawPage::setPropertyValue( const OUString& aPropertyName
{
SdrLayerAdmin& rLayerAdmin = pDoc->GetLayerAdmin();
SdrLayerIDSet aVisibleLayers = pPage->TRG_GetMasterPageVisibleLayers();
- aVisibleLayers.Set(rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND)), bVisible);
+ aVisibleLayers.Set(rLayerAdmin.GetLayerID(SdResId(STR_LAYER_BCKGRND)), bVisible);
pPage->TRG_SetMasterPageVisibleLayers(aVisibleLayers);
}
}
@@ -813,7 +813,7 @@ void SAL_CALL SdGenericDrawPage::setPropertyValue( const OUString& aPropertyName
{
SdrLayerAdmin& rLayerAdmin = pDoc->GetLayerAdmin();
SdrLayerIDSet aVisibleLayers = pPage->TRG_GetMasterPageVisibleLayers();
- aVisibleLayers.Set(rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ)), bVisible);
+ aVisibleLayers.Set(rLayerAdmin.GetLayerID(SdResId(STR_LAYER_BCKGRNDOBJ)), bVisible);
pPage->TRG_SetMasterPageVisibleLayers(aVisibleLayers);
}
}
@@ -1218,7 +1218,7 @@ Any SAL_CALL SdGenericDrawPage::getPropertyValue( const OUString& PropertyName )
{
SdrLayerAdmin& rLayerAdmin = pDoc->GetLayerAdmin();
SdrLayerIDSet aVisibleLayers = pPage->TRG_GetMasterPageVisibleLayers();
- aAny <<= aVisibleLayers.IsSet(rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND)));
+ aAny <<= aVisibleLayers.IsSet(rLayerAdmin.GetLayerID(SdResId(STR_LAYER_BCKGRND)));
}
else
{
@@ -1237,7 +1237,7 @@ Any SAL_CALL SdGenericDrawPage::getPropertyValue( const OUString& PropertyName )
{
SdrLayerAdmin& rLayerAdmin = pDoc->GetLayerAdmin();
SdrLayerIDSet aVisibleLayers = pPage->TRG_GetMasterPageVisibleLayers();
- aAny <<= aVisibleLayers.IsSet(rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ)));
+ aAny <<= aVisibleLayers.IsSet(rLayerAdmin.GetLayerID(SdResId(STR_LAYER_BCKGRNDOBJ)));
}
else
{
@@ -2164,7 +2164,7 @@ OUString getPageApiNameFromUiName( const OUString& rUIName )
{
OUString aApiName;
- OUString aDefPageName(SD_RESSTR(STR_PAGE) + " ");
+ OUString aDefPageName(SdResId(STR_PAGE) + " ");
if( rUIName.startsWith( aDefPageName ) )
{
@@ -2212,7 +2212,7 @@ OUString getUiNameFromPageApiNameImpl( const OUString& rApiName )
if( nPageNumber != -1)
{
OUStringBuffer sBuffer;
- sBuffer.append( SD_RESSTR(STR_PAGE) );
+ sBuffer.append( SdResId(STR_PAGE) );
sBuffer.append( ' ' );
sBuffer.append( aNumber );
return sBuffer.makeStringAndClear();
@@ -2295,7 +2295,7 @@ void SAL_CALL SdDrawPage::setName( const OUString& rName )
}
else
{
- OUString aDefaultPageName( SD_RESSTR(STR_PAGE) + " " );
+ OUString aDefaultPageName( SdResId(STR_PAGE) + " " );
if( aName.startsWith( aDefaultPageName ) )
aName.clear();
}
diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx
index 9d29bcac5c99..3ebc5f6c3723 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -373,7 +373,7 @@ namespace {
maProperties.push_back(aOptionsUIFile);
SvtModuleOptions aOpt;
- OUString aAppGroupname(SD_RESSTR(STR_IMPRESS_PRINT_UI_GROUP_NAME));
+ OUString aAppGroupname(SdResId(STR_IMPRESS_PRINT_UI_GROUP_NAME));
aAppGroupname = aAppGroupname.replaceFirst("%s", aOpt.GetModuleName(
mbImpress ? SvtModuleOptions::EModule::IMPRESS : SvtModuleOptions::EModule::DRAW));
AddDialogControl(vcl::PrinterOptionsHelper::setGroupControlOpt("tabcontrol-page2", aAppGroupname, ".HelpID:vcl:PrintDialog:TabPage:AppPage"));
@@ -384,7 +384,7 @@ namespace {
vcl::PrinterOptionsHelper::UIControlOptions aPrintOpt;
aPrintOpt.maGroupHint = "JobPage" ;
AddDialogControl( vcl::PrinterOptionsHelper::setSubgroupControlOpt("extraimpressprintoptions",
- SD_RESSTR(STR_IMPRESS_PRINT_UI_PRINT_GROUP),
+ SdResId(STR_IMPRESS_PRINT_UI_PRINT_GROUP),
"",
aPrintOpt ));
@@ -392,7 +392,7 @@ namespace {
aHelpIds[0] = ".HelpID:vcl:PrintDialog:PageContentType:ListBox" ;
AddDialogControl( vcl::PrinterOptionsHelper::setChoiceListControlOpt(
"impressdocument",
- SD_RESSTR(STR_IMPRESS_PRINT_UI_CONTENT),
+ SdResId(STR_IMPRESS_PRINT_UI_CONTENT),
aHelpIds,
"PageContentType" ,
CreateChoice(STR_IMPRESS_PRINT_UI_CONTENT_CHOICES),
@@ -403,7 +403,7 @@ namespace {
vcl::PrinterOptionsHelper::UIControlOptions aContentOpt( "PageContentType" , 1 );
AddDialogControl( vcl::PrinterOptionsHelper::setChoiceListControlOpt(
"slidesperpage",
- SD_RESSTR(STR_IMPRESS_PRINT_UI_SLIDESPERPAGE),
+ SdResId(STR_IMPRESS_PRINT_UI_SLIDESPERPAGE),
aHelpIds,
"SlidesPerPage" ,
GetSlidesPerPageSequence(),
@@ -417,7 +417,7 @@ namespace {
vcl::PrinterOptionsHelper::UIControlOptions aSlidesPerPageOpt( "SlidesPerPage" , -1, true );
AddDialogControl( vcl::PrinterOptionsHelper::setChoiceListControlOpt(
"slidesperpageorder",
- SD_RESSTR(STR_IMPRESS_PRINT_UI_ORDER),
+ SdResId(STR_IMPRESS_PRINT_UI_ORDER),
aHelpIds,
"SlidesPerPageOrder" ,
CreateChoice(STR_IMPRESS_PRINT_UI_ORDER_CHOICES),
@@ -428,12 +428,12 @@ namespace {
}
AddDialogControl( vcl::PrinterOptionsHelper::setSubgroupControlOpt("contents",
- SD_RESSTR(STR_IMPRESS_PRINT_UI_INCLUDE_CONTENT), "" ) );
+ SdResId(STR_IMPRESS_PRINT_UI_INCLUDE_CONTENT), "" ) );
if( mbImpress )
{
AddDialogControl( vcl::PrinterOptionsHelper::setBoolControlOpt("printname",
- SD_RESSTR(STR_IMPRESS_PRINT_UI_IS_PRINT_NAME),
+ SdResId(STR_IMPRESS_PRINT_UI_IS_PRINT_NAME),
".HelpID:vcl:PrintDialog:IsPrintName:CheckBox" ,
"IsPrintName" ,
false
@@ -443,7 +443,7 @@ namespace {
else
{
AddDialogControl( vcl::PrinterOptionsHelper::setBoolControlOpt("printname",
- SD_RESSTR(STR_DRAW_PRINT_UI_IS_PRINT_NAME),
+ SdResId(STR_DRAW_PRINT_UI_IS_PRINT_NAME),
".HelpID:vcl:PrintDialog:IsPrintName:CheckBox" ,
"IsPrintName" ,
false
@@ -452,7 +452,7 @@ namespace {
}
AddDialogControl( vcl::PrinterOptionsHelper::setBoolControlOpt("printdatetime",
- SD_RESSTR(STR_IMPRESS_PRINT_UI_IS_PRINT_DATE),
+ SdResId(STR_IMPRESS_PRINT_UI_IS_PRINT_DATE),
".HelpID:vcl:PrintDialog:IsPrintDateTime:CheckBox" ,
"IsPrintDateTime" ,
false
@@ -462,7 +462,7 @@ namespace {
if( mbImpress )
{
AddDialogControl( vcl::PrinterOptionsHelper::setBoolControlOpt("printhidden",
- SD_RESSTR(STR_IMPRESS_PRINT_UI_IS_PRINT_HIDDEN),
+ SdResId(STR_IMPRESS_PRINT_UI_IS_PRINT_HIDDEN),
".HelpID:vcl:PrintDialog:IsPrintHidden:CheckBox" ,
"IsPrintHidden" ,
false
@@ -471,7 +471,7 @@ namespace {
}
AddDialogControl( vcl::PrinterOptionsHelper::setSubgroupControlOpt("color",
- SD_RESSTR(STR_IMPRESS_PRINT_UI_QUALITY), "" ) );
+ SdResId(STR_IMPRESS_PRINT_UI_QUALITY), "" ) );
aHelpIds.realloc( 3 );
aHelpIds[0] = ".HelpID:vcl:PrintDialog:Quality:RadioButton:0" ;
@@ -491,7 +491,7 @@ namespace {
);
AddDialogControl( vcl::PrinterOptionsHelper::setSubgroupControlOpt("pagesizes",
- SD_RESSTR(STR_IMPRESS_PRINT_UI_PAGE_OPTIONS), "" ) );
+ SdResId(STR_IMPRESS_PRINT_UI_PAGE_OPTIONS), "" ) );
aHelpIds.realloc( 4 );
aHelpIds[0] = ".HelpID:vcl:PrintDialog:PageOptions:RadioButton:0" ;
@@ -520,12 +520,12 @@ namespace {
vcl::PrinterOptionsHelper::UIControlOptions aBrochureOpt;
aBrochureOpt.maGroupHint = "LayoutPage" ;
AddDialogControl( vcl::PrinterOptionsHelper::setSubgroupControlOpt("pagesides",
- SD_RESSTR(STR_IMPRESS_PRINT_UI_PAGE_SIDES), "",
+ SdResId(STR_IMPRESS_PRINT_UI_PAGE_SIDES), "",
aBrochureOpt ) );
// brochure printing
AddDialogControl( vcl::PrinterOptionsHelper::setBoolControlOpt("brochure",
- SD_RESSTR(STR_IMPRESS_PRINT_UI_BROCHURE),
+ SdResId(STR_IMPRESS_PRINT_UI_BROCHURE),
".HelpID:vcl:PrintDialog:PrintProspect:CheckBox" ,
"PrintProspect" ,
false,
@@ -540,7 +540,7 @@ namespace {
aHelpIds[0] = ".HelpID:vcl:PrintDialog:PrintProspectInclude:ListBox" ;
AddDialogControl( vcl::PrinterOptionsHelper::setChoiceListControlOpt(
"brochureinclude",
- SD_RESSTR(STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE),
+ SdResId(STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE),
aHelpIds,
"PrintProspectInclude" ,
CreateChoice(STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE_LIST),
@@ -554,7 +554,7 @@ namespace {
vcl::PrinterOptionsHelper::UIControlOptions aPaperTrayOpt;
aPaperTrayOpt.maGroupHint = "OptionsPageOptGroup" ;
AddDialogControl( vcl::PrinterOptionsHelper::setBoolControlOpt("printpaperfromsetup",
- SD_RESSTR(STR_IMPRESS_PRINT_UI_PAPER_TRAY),
+ SdResId(STR_IMPRESS_PRINT_UI_PAPER_TRAY),
".HelpID:vcl:PrintDialog:PrintPaperFromSetup:CheckBox" ,
"PrintPaperFromSetup" ,
false,
@@ -566,7 +566,7 @@ namespace {
aPrintRangeOpt.mbInternalOnly = true;
aPrintRangeOpt.maGroupHint = "PrintRange" ;
AddDialogControl( vcl::PrinterOptionsHelper::setSubgroupControlOpt("printrange",
- SD_RESSTR(STR_IMPRESS_PRINT_UI_PAGE_RANGE),
+ SdResId(STR_IMPRESS_PRINT_UI_PAGE_RANGE),
"",
aPrintRangeOpt )
);
@@ -633,7 +633,7 @@ namespace {
static Sequence<OUString> CreateChoice (const sal_uInt16 nResourceId)
{
- SdResId aResourceId (nResourceId);
+ ResId aResourceId(nResourceId, *SD_MOD()->GetResMgr());
ResStringArray aChoiceStrings (aResourceId);
const sal_uInt32 nCount (aChoiceStrings.Count());
@@ -1301,7 +1301,7 @@ public:
ScopedVclPtrInstance<WarningBox> aWarnBox(
pViewShell->GetActiveWindow(),
(WinBits)(WB_OK_CANCEL | WB_DEF_CANCEL),
- SD_RESSTR(STR_WARN_PRINTFORMAT_FAILURE));
+ SdResId(STR_WARN_PRINTFORMAT_FAILURE));
if (aWarnBox->Execute() != RET_OK)
return;
}
diff --git a/sd/source/ui/view/GraphicObjectBar.cxx b/sd/source/ui/view/GraphicObjectBar.cxx
index c03c3363777d..eb9b6be057b6 100644
--- a/sd/source/ui/view/GraphicObjectBar.cxx
+++ b/sd/source/ui/view/GraphicObjectBar.cxx
@@ -133,7 +133,7 @@ void GraphicObjectBar::ExecuteFilter( SfxRequest& rReq )
{
SdrGrafObj* pFilteredObj = static_cast<SdrGrafObj*>( pObj->Clone() );
OUString aStr = mpView->GetDescriptionOfMarkedObjects();
- aStr += " " + SD_RESSTR(STR_UNDO_GRAFFILTER);
+ aStr += " " + SdResId(STR_UNDO_GRAFFILTER);
mpView->BegUndo( aStr );
pFilteredObj->SetGraphicObject( aFilterObj );
::sd::View* const pView = mpView;
diff --git a/sd/source/ui/view/MediaObjectBar.cxx b/sd/source/ui/view/MediaObjectBar.cxx
index dbce5caf3d55..f2413042fd6a 100644
--- a/sd/source/ui/view/MediaObjectBar.cxx
+++ b/sd/source/ui/view/MediaObjectBar.cxx
@@ -65,7 +65,7 @@ MediaObjectBar::MediaObjectBar( ViewShell* pSdViewShell, ::sd::View* pSdView ) :
SetPool( &pDocShell->GetPool() );
SetUndoManager( pDocShell->GetUndoManager() );
SetRepeatTarget( mpView );
- SetName(SD_RESSTR(RID_DRAW_MEDIA_TOOLBOX));
+ SetName(SdResId(RID_DRAW_MEDIA_TOOLBOX));
}
MediaObjectBar::~MediaObjectBar()
diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index 0cd8df02d24e..002c6baf16ad 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -1196,9 +1196,9 @@ void SdOutliner::ShowEndOfSearchDialog()
OUString aString;
if (mpView->AreObjectsMarked())
- aString = SD_RESSTR(STR_END_SPELLING_OBJ);
+ aString = SdResId(STR_END_SPELLING_OBJ);
else
- aString = SD_RESSTR(STR_END_SPELLING);
+ aString = SdResId(STR_END_SPELLING);
// Show the message in an info box that is modal with respect to the
// whole application.
@@ -1241,7 +1241,7 @@ bool SdOutliner::ShowWrapArroundDialog()
// Pop up question box that asks the user whether to wrap around.
// The dialog is made modal with respect to the whole application.
- ScopedVclPtrInstance<QueryBox> aQuestionBox(nullptr, WB_YES_NO | WB_DEF_YES, SD_RESSTR(nStringId));
+ ScopedVclPtrInstance<QueryBox> aQuestionBox(nullptr, WB_YES_NO | WB_DEF_YES, SdResId(nStringId));
aQuestionBox->SetImage(QueryBox::GetStandardImage());
sal_uInt16 nBoxResult = ShowModalMessageBox(*aQuestionBox.get());
diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx
index 5a9fca237af6..d8ac5cd4401f 100644
--- a/sd/source/ui/view/ViewShellImplementation.cxx
+++ b/sd/source/ui/view/ViewShellImplementation.cxx
@@ -198,8 +198,8 @@ void ViewShell::Implementation::ProcessModifyPageSlot (
pCurrentPage->SetAutoLayout(aNewAutoLayout, true);
- SdrLayerID aBckgrnd = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND));
- SdrLayerID aBckgrndObj = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ));
+ SdrLayerID aBckgrnd = rLayerAdmin.GetLayerID(SdResId(STR_LAYER_BCKGRND));
+ SdrLayerID aBckgrndObj = rLayerAdmin.GetLayerID(SdResId(STR_LAYER_BCKGRNDOBJ));
aVisibleLayers.Set(aBckgrnd, bBVisible);
aVisibleLayers.Set(aBckgrndObj, bBObjsVisible);
pCurrentPage->TRG_SetMasterPageVisibleLayers(aVisibleLayers);
@@ -259,8 +259,8 @@ void ViewShell::Implementation::AssignLayout ( SfxRequest& rRequest, PageKind eP
// Transform the given request into the four argument form that is
// understood by ProcessModifyPageSlot().
SdrLayerAdmin& rLayerAdmin (mrViewShell.GetViewShellBase().GetDocument()->GetLayerAdmin());
- SdrLayerID aBackground (rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND)));
- SdrLayerID aBackgroundObject (rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ)));
+ SdrLayerID aBackground (rLayerAdmin.GetLayerID(SdResId(STR_LAYER_BCKGRND)));
+ SdrLayerID aBackgroundObject (rLayerAdmin.GetLayerID(SdResId(STR_LAYER_BCKGRNDOBJ)));
SdrLayerIDSet aVisibleLayers;
diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx
index 26ac7a9b4f22..314e110b8b16 100644
--- a/sd/source/ui/view/drawview.cxx
+++ b/sd/source/ui/view/drawview.cxx
@@ -180,8 +180,8 @@ bool DrawView::SetAttributes(const SfxItemSet& rSet,
mpDocSh->SetWaitCursor( true );
// replace placeholder by template name
- OUString aComment(SD_RESSTR(STR_UNDO_CHANGE_PRES_OBJECT));
- aComment = aComment.replaceFirst("$", SD_RESSTR(STR_PSEUDOSHEET_OUTLINE));
+ OUString aComment(SdResId(STR_UNDO_CHANGE_PRES_OBJECT));
+ aComment = aComment.replaceFirst("$", SdResId(STR_PSEUDOSHEET_OUTLINE));
mpDocSh->GetUndoManager()->EnterListAction( aComment, OUString(), 0, mpDrawViewShell->GetViewShellBase().GetViewShellId() );
std::vector<Paragraph*> aSelList;
@@ -435,7 +435,7 @@ bool DrawView::SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAtt
if (IsPresObjSelected(false))
{
ScopedVclPtrInstance<InfoBox>(mpDrawViewShell->GetActiveWindow(),
- SD_RESSTR(STR_ACTION_NOTPOSSIBLE))->Execute();
+ SdResId(STR_ACTION_NOTPOSSIBLE))->Execute();
bResult = false;
}
else
@@ -518,7 +518,7 @@ void DrawView::DeleteMarked()
if( pUndoManager )
{
- OUString aUndo(SVX_RESSTR(STR_EditDelete));
+ OUString aUndo(SvxResId(STR_EditDelete));
aUndo = aUndo.replaceFirst("%1", GetDescriptionOfMarkedObjects());
ViewShellId nViewShellId = mpDrawViewShell ? mpDrawViewShell->GetViewShellBase().GetViewShellId() : ViewShellId(-1);
pUndoManager->EnterListAction(aUndo, aUndo, 0, nViewShellId);
diff --git a/sd/source/ui/view/drbezob.cxx b/sd/source/ui/view/drbezob.cxx
index 0511db501b81..bf52bffe3f0b 100644
--- a/sd/source/ui/view/drbezob.cxx
+++ b/sd/source/ui/view/drbezob.cxx
@@ -261,7 +261,7 @@ void BezierObjectBar::Execute(SfxRequest& rReq)
SdrPathObj* pPathObj = static_cast<SdrPathObj*>( rMarkList.GetMark(0)->GetMarkedSdrObj() );
const bool bUndo = mpView->IsUndoEnabled();
if( bUndo )
- mpView->BegUndo(SD_RESSTR(STR_UNDO_BEZCLOSE));
+ mpView->BegUndo(SdResId(STR_UNDO_BEZCLOSE));
mpView->UnmarkAllPoints();
diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx
index 9a084422fc29..351b5a960b31 100644
--- a/sd/source/ui/view/drtxtob1.cxx
+++ b/sd/source/ui/view/drtxtob1.cxx
@@ -363,7 +363,7 @@ void TextObjectBar::Execute( SfxRequest &rReq )
{
const SvxNumBulletItem *pItem = nullptr;
SfxStyleSheetBasePool* pSSPool = mpView->GetDocSh()->GetStyleSheetPool();
- OUString sStyleName(SD_RESSTR(STR_PSEUDOSHEET_OUTLINE) + " 1");
+ OUString sStyleName(SdResId(STR_PSEUDOSHEET_OUTLINE) + " 1");
SfxStyleSheetBase* pFirstStyleSheet = pSSPool->Find(sStyleName, SD_STYLE_FAMILY_PSEUDO);
if( pFirstStyleSheet )
pFirstStyleSheet->GetItemSet().GetItemState(EE_PARA_NUMBULLET, false, reinterpret_cast<const SfxPoolItem**>(&pItem));
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index 5007bfff0f52..78e5d42b9c79 100644
--- a/sd/source/ui/view/drviews1.cxx
+++ b/sd/source/ui/view/drviews1.cxx
@@ -1149,11 +1149,11 @@ void DrawViewShell::ResetActualLayer()
OUString aName;
OUString aActiveLayer = mpDrawView->GetActiveLayer();
- OUString aBackgroundLayer = SD_RESSTR(STR_LAYER_BCKGRND);
- OUString aBackgroundObjLayer = SD_RESSTR(STR_LAYER_BCKGRNDOBJ);
- OUString aLayoutLayer = SD_RESSTR(STR_LAYER_LAYOUT);
- OUString aControlsLayer = SD_RESSTR(STR_LAYER_CONTROLS);
- OUString aMeasureLinesLayer = SD_RESSTR(STR_LAYER_MEASURELINES);
+ OUString aBackgroundLayer = SdResId(STR_LAYER_BCKGRND);
+ OUString aBackgroundObjLayer = SdResId(STR_LAYER_BCKGRNDOBJ);
+ OUString aLayoutLayer = SdResId(STR_LAYER_LAYOUT);
+ OUString aControlsLayer = SdResId(STR_LAYER_CONTROLS);
+ OUString aMeasureLinesLayer = SdResId(STR_LAYER_MEASURELINES);
sal_uInt16 nActiveLayerPos = SDRLAYERPOS_NOTFOUND;
SdrLayerAdmin& rLayerAdmin = GetDoc()->GetLayerAdmin();
sal_uInt16 nLayerCnt = rLayerAdmin.GetLayerCount();
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index 1ea7eae77139..a189006ea60d 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -425,8 +425,8 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
? GetDoc()->GetSdPage( nPage, GetPageKind() )
: GetDoc()->GetMasterSdPage( nPage, GetPageKind() );
- OUString aTitle = SD_RESSTR(STR_TITLE_RENAMESLIDE);
- OUString aDescr = SD_RESSTR(STR_DESC_RENAMESLIDE);
+ OUString aTitle = SdResId(STR_TITLE_RENAMESLIDE);
+ OUString aDescr = SdResId(STR_DESC_RENAMESLIDE);
OUString aPageName = pCurrentPage->GetName();
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
@@ -604,7 +604,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
if ( mpDrawView->IsPresObjSelected() )
{
::sd::Window* pWindow = GetActiveWindow();
- ScopedVclPtrInstance<InfoBox>(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE))->Execute();
+ ScopedVclPtrInstance<InfoBox>(pWindow, SdResId(STR_ACTION_NOTPOSSIBLE))->Execute();
}
else
{
@@ -649,7 +649,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
if ( mpDrawView->IsPresObjSelected() )
{
::sd::Window* pWindow = GetActiveWindow();
- ScopedVclPtrInstance<InfoBox>(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE))->Execute();
+ ScopedVclPtrInstance<InfoBox>(pWindow, SdResId(STR_ACTION_NOTPOSSIBLE))->Execute();
}
else
{
@@ -677,7 +677,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
if ( mpDrawView->IsPresObjSelected(true,true,true) )
{
::sd::Window* pWindow = GetActiveWindow();
- ScopedVclPtrInstance<InfoBox>(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE))->Execute();
+ ScopedVclPtrInstance<InfoBox>(pWindow, SdResId(STR_ACTION_NOTPOSSIBLE))->Execute();
}
else
{
@@ -690,7 +690,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
case SID_CONVERT_TO_METAFILE:
{
// switch on undo for the next operations
- mpDrawView->BegUndo(SD_RESSTR(STR_UNDO_CONVERT_TO_METAFILE));
+ mpDrawView->BegUndo(SdResId(STR_UNDO_CONVERT_TO_METAFILE));
GDIMetaFile aMetaFile(mpDrawView->GetMarkedObjMetaFile());
aGraphic = Graphic(aMetaFile);
}
@@ -698,7 +698,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
case SID_CONVERT_TO_BITMAP:
{
// switch on undo for the next operations
- mpDrawView->BegUndo(SD_RESSTR(STR_UNDO_CONVERT_TO_BITMAP));
+ mpDrawView->BegUndo(SdResId(STR_UNDO_CONVERT_TO_BITMAP));
bool bDone(false);
// I have to get the image here directly since GetMarkedObjBitmapEx works
@@ -1160,7 +1160,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
if ( mpDrawView->IsPresObjSelected(false) )
{
::sd::Window* pWindow = GetActiveWindow();
- ScopedVclPtrInstance<InfoBox>(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE))->Execute();
+ ScopedVclPtrInstance<InfoBox>(pWindow, SdResId(STR_ACTION_NOTPOSSIBLE))->Execute();
}
else
{
@@ -1345,7 +1345,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
#endif
::sd::Window* pWindow = GetActiveWindow();
- ScopedVclPtrInstance<InfoBox>(pWindow, SD_RESSTR(nId))->Execute();
+ ScopedVclPtrInstance<InfoBox>(pWindow, SdResId(nId))->Execute();
}
else
{
@@ -1376,7 +1376,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
SdrLayerAdmin& rLayerAdmin = GetDoc()->GetLayerAdmin();
sal_uInt16 nLayerCnt = rLayerAdmin.GetLayerCount();
sal_uInt16 nLayer = nLayerCnt - 2 + 1;
- OUString aLayerName = SD_RESSTR(STR_LAYER) + OUString::number(nLayer);
+ OUString aLayerName = SdResId(STR_LAYER) + OUString::number(nLayer);
OUString aLayerTitle, aLayerDesc;
bool bIsVisible = false;
bool bIsLocked = false;
@@ -1397,7 +1397,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
aNewAttr.Put( makeSdAttrLayerThisPage() );
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
- ScopedVclPtr<AbstractSdInsertLayerDlg> pDlg(pFact ? pFact->CreateSdInsertLayerDlg(GetActiveWindow(), aNewAttr, true, SD_RESSTR(STR_INSERTLAYER)) : nullptr);
+ ScopedVclPtr<AbstractSdInsertLayerDlg> pDlg(pFact ? pFact->CreateSdInsertLayerDlg(GetActiveWindow(), aNewAttr, true, SdResId(STR_INSERTLAYER)) : nullptr);
if( pDlg )
{
pDlg->SetHelpId( SD_MOD()->GetSlotPool()->GetSlot( SID_INSERTLAYER )->GetCommand() );
@@ -1416,7 +1416,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
ScopedVclPtrInstance<WarningBox> aWarningBox (
GetParentWindow(),
WinBits( WB_OK ),
- SD_RESSTR(STR_WARN_NAME_DUPLICATE));
+ SdResId(STR_WARN_NAME_DUPLICATE));
aWarningBox->Execute();
}
else
@@ -1539,11 +1539,11 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
// is it allowed to delete the layer?
bool bDelete = true;
- OUString aLayoutLayer = SD_RESSTR(STR_LAYER_LAYOUT);
- OUString aControlsLayer = SD_RESSTR(STR_LAYER_CONTROLS);
- OUString aMeasureLinesLayer = SD_RESSTR(STR_LAYER_MEASURELINES);
- OUString aBackgroundLayer = SD_RESSTR(STR_LAYER_BCKGRND);
- OUString aBackgroundObjLayer = SD_RESSTR(STR_LAYER_BCKGRNDOBJ);
+ OUString aLayoutLayer = SdResId(STR_LAYER_LAYOUT);
+ OUString aControlsLayer = SdResId(STR_LAYER_CONTROLS);
+ OUString aMeasureLinesLayer = SdResId(STR_LAYER_MEASURELINES);
+ OUString aBackgroundLayer = SdResId(STR_LAYER_BCKGRND);
+ OUString aBackgroundObjLayer = SdResId(STR_LAYER_BCKGRNDOBJ);
if( aLayerName == aLayoutLayer || aLayerName == aControlsLayer ||
aLayerName == aMeasureLinesLayer ||
@@ -1565,7 +1565,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
aNewAttr.Put( makeSdAttrLayerThisPage() );
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
- ScopedVclPtr<AbstractSdInsertLayerDlg> pDlg(pFact ? pFact->CreateSdInsertLayerDlg(GetActiveWindow(), aNewAttr, bDelete, SD_RESSTR(STR_MODIFYLAYER)) : nullptr);
+ ScopedVclPtr<AbstractSdInsertLayerDlg> pDlg(pFact ? pFact->CreateSdInsertLayerDlg(GetActiveWindow(), aNewAttr, bDelete, SdResId(STR_MODIFYLAYER)) : nullptr);
if( pDlg )
{
pDlg->SetHelpId( SD_MOD()->GetSlotPool()->GetSlot( SID_MODIFYLAYER )->GetCommand() );
@@ -1585,7 +1585,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
ScopedVclPtrInstance<WarningBox> aWarningBox (
GetParentWindow(),
WinBits( WB_OK ),
- SD_RESSTR(STR_WARN_NAME_DUPLICATE));
+ SdResId(STR_WARN_NAME_DUPLICATE));
aWarningBox->Execute();
}
else
@@ -1815,7 +1815,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
if (nDepth != sal_uInt16(-1) && nDepth < 8)
{
sal_uInt16 nNewDepth = nDepth+1;
- pOL->Insert(SD_RESSTR(STR_PRESOBJ_MPOUTLINE+nNewDepth), EE_PARA_APPEND, nNewDepth);
+ pOL->Insert(SdResId(STR_PRESOBJ_MPOUTLINE+nNewDepth), EE_PARA_APPEND, nNewDepth);
}
}
}
@@ -2052,7 +2052,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
if ( mpDrawView->IsPresObjSelected( true, true, true ) )
{
::sd::Window* pWindow = GetActiveWindow();
- ScopedVclPtrInstance<InfoBox>(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE))->Execute();
+ ScopedVclPtrInstance<InfoBox>(pWindow, SdResId(STR_ACTION_NOTPOSSIBLE))->Execute();
}
else
{
@@ -2171,7 +2171,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
if ( mpDrawView->IsPresObjSelected() )
{
::sd::Window* pWindow = GetActiveWindow();
- ScopedVclPtrInstance<InfoBox>(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE))->Execute();
+ ScopedVclPtrInstance<InfoBox>(pWindow, SdResId(STR_ACTION_NOTPOSSIBLE))->Execute();
}
else
{
@@ -2188,7 +2188,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
if ( mpDrawView->IsPresObjSelected() )
{
::sd::Window* pWindow = GetActiveWindow();
- ScopedVclPtrInstance<InfoBox>(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE))->Execute();
+ ScopedVclPtrInstance<InfoBox>(pWindow, SdResId(STR_ACTION_NOTPOSSIBLE))->Execute();
}
else
{
@@ -2208,7 +2208,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
if ( mpDrawView->IsPresObjSelected() )
{
::sd::Window* pWindow = GetActiveWindow();
- ScopedVclPtrInstance<InfoBox>(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE))->Execute();
+ ScopedVclPtrInstance<InfoBox>(pWindow, SdResId(STR_ACTION_NOTPOSSIBLE))->Execute();
}
else
{
@@ -2229,7 +2229,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
if ( mpDrawView->IsPresObjSelected() )
{
::sd::Window* pWindow = GetActiveWindow();
- ScopedVclPtrInstance<InfoBox>(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE))->Execute();
+ ScopedVclPtrInstance<InfoBox>(pWindow, SdResId(STR_ACTION_NOTPOSSIBLE))->Execute();
}
else
{
@@ -2250,7 +2250,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
if ( mpDrawView->IsPresObjSelected() )
{
::sd::Window* pWindow = GetActiveWindow();
- ScopedVclPtrInstance<InfoBox>(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE))->Execute();
+ ScopedVclPtrInstance<InfoBox>(pWindow, SdResId(STR_ACTION_NOTPOSSIBLE))->Execute();
}
else
{
@@ -2292,7 +2292,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
if ( mpDrawView->IsPresObjSelected() )
{
::sd::Window* pWindow = GetActiveWindow();
- ScopedVclPtrInstance<InfoBox>(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE))->Execute();
+ ScopedVclPtrInstance<InfoBox>(pWindow, SdResId(STR_ACTION_NOTPOSSIBLE))->Execute();
}
else
{
@@ -2384,7 +2384,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
if ( mpDrawView->IsPresObjSelected() )
{
::sd::Window* pWindow = GetActiveWindow();
- ScopedVclPtrInstance<InfoBox>(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE))->Execute();
+ ScopedVclPtrInstance<InfoBox>(pWindow, SdResId(STR_ACTION_NOTPOSSIBLE))->Execute();
}
else
{
@@ -2868,9 +2868,9 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
SdrLayerAdmin& rLayerAdmin = GetDoc()->GetLayerAdmin();
SdrLayerID aLayerId;
if (nSId == SID_DISPLAY_MASTER_BACKGROUND)
- aLayerId = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND));
+ aLayerId = rLayerAdmin.GetLayerID(SdResId(STR_LAYER_BCKGRND));
else
- aLayerId = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ));
+ aLayerId = rLayerAdmin.GetLayerID(SdResId(STR_LAYER_BCKGRNDOBJ));
aVisibleLayers.Set(aLayerId, !aVisibleLayers.IsSet(aLayerId));
pPage->TRG_SetMasterPageVisibleLayers(aVisibleLayers);
}
diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx
index 2a3aedf19bba..ab4aaf5f6936 100644
--- a/sd/source/ui/view/drviews3.cxx
+++ b/sd/source/ui/view/drviews3.cxx
@@ -253,7 +253,7 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq)
}
// turn on default layer of page
- mpDrawView->SetActiveLayer(SD_RESSTR(STR_LAYER_LAYOUT));
+ mpDrawView->SetActiveLayer(SdResId(STR_LAYER_LAYOUT));
ChangeEditMode(EditMode::Page, mbIsLayerModeActive);
@@ -1043,16 +1043,16 @@ void DrawViewShell::GetSnapItemState( SfxItemSet &rSet )
if ( rHelpLine.GetKind() == SdrHelpLineKind::Point )
{
rSet.Put( SfxStringItem( SID_SET_SNAPITEM,
- SD_RESSTR( STR_POPUP_EDIT_SNAPPOINT)) );
+ SdResId( STR_POPUP_EDIT_SNAPPOINT)) );
rSet.Put( SfxStringItem( SID_DELETE_SNAPITEM,
- SD_RESSTR( STR_POPUP_DELETE_SNAPPOINT)) );
+ SdResId( STR_POPUP_DELETE_SNAPPOINT)) );
}
else
{
rSet.Put( SfxStringItem( SID_SET_SNAPITEM,
- SD_RESSTR( ST