[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - avmedia/source basctl/source basic/source chart2/source cui/source desktop/inc desktop/source extensions/source filter/source include/editeng include/sfx2 include/svtools include/svx reportdesign/source scaddins/source sc/inc sc/qa sc/source sd/inc sd/Library_sd.mk sd/qa sd/source sfx2/inc sfx2/source starmath/inc starmath/source svtools/source svx/source sw/inc sw/source tools/source vcl/source vcl/unx writerperfect/inc writerperfect/source xmlsecurity/inc xmlsecurity/source
Caolán McNamara
caolanm at redhat.com
Sun May 21 17:29:27 UTC 2017
avmedia/source/framework/MediaControlBase.cxx | 18 -
avmedia/source/framework/mediacontrol.cxx | 10 -
avmedia/source/framework/mediaplayer.cxx | 2
avmedia/source/inc/mediamisc.hxx | 17 -
avmedia/source/viewer/mediawindow.cxx | 8
basctl/source/basicide/bastypes.cxx | 2
basic/source/runtime/basrdll.cxx | 2
basic/source/sbx/sbxscan.cxx | 14 -
chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx | 6
chart2/source/controller/main/ChartController_Tools.cxx | 4
chart2/source/controller/main/DrawCommandDispatch.cxx | 4
chart2/source/controller/main/UndoCommandDispatch.cxx | 4
chart2/source/inc/ResId.hxx | 7
chart2/source/tools/InternalData.cxx | 1
chart2/source/tools/ResId.cxx | 7
cui/source/customize/acccfg.cxx | 6
cui/source/customize/cfg.cxx | 60 +++---
cui/source/customize/cfgutil.cxx | 16 -
cui/source/customize/macropg.cxx | 2
cui/source/dialogs/cuifmsearch.cxx | 10 -
cui/source/dialogs/cuigaldlg.cxx | 16 -
cui/source/dialogs/cuihyperdlg.cxx | 18 -
cui/source/dialogs/hangulhanjadlg.cxx | 6
cui/source/dialogs/hldocntp.cxx | 4
cui/source/dialogs/hlmarkwn.cxx | 4
cui/source/dialogs/hltpbase.cxx | 10 -
cui/source/dialogs/insdlg.cxx | 2
cui/source/dialogs/insrc.cxx | 4
cui/source/dialogs/linkdlg.cxx | 12 -
cui/source/dialogs/multipat.cxx | 4
cui/source/dialogs/passwdomdlg.cxx | 8
cui/source/dialogs/screenshotannotationdlg.cxx | 2
cui/source/dialogs/scriptdlg.cxx | 46 ++--
cui/source/dialogs/srchxtra.cxx | 2
cui/source/dialogs/thesdlg.cxx | 2
cui/source/inc/dialmgr.hxx | 7
cui/source/options/cfgchart.cxx | 4
cui/source/options/connpooloptions.cxx | 10 -
cui/source/options/dbregister.cxx | 6
cui/source/options/doclinkdialog.cxx | 6
cui/source/options/optcolor.cxx | 8
cui/source/options/optdict.cxx | 6
cui/source/options/optfltr.cxx | 14 -
cui/source/options/optinet2.cxx | 2
cui/source/options/optjava.cxx | 14 -
cui/source/options/optlingu.cxx | 28 +-
cui/source/options/optopencl.cxx | 2
cui/source/options/optpath.cxx | 2
cui/source/options/personalization.cxx | 18 -
cui/source/options/treeopt.cxx | 26 +-
cui/source/tabpages/align.cxx | 6
cui/source/tabpages/autocdlg.cxx | 58 ++---
cui/source/tabpages/backgrnd.cxx | 4
cui/source/tabpages/border.cxx | 6
cui/source/tabpages/chardlg.cxx | 10 -
cui/source/tabpages/connect.cxx | 2
cui/source/tabpages/grfpage.cxx | 2
cui/source/tabpages/measure.cxx | 4
cui/source/tabpages/numfmt.cxx | 2
cui/source/tabpages/numpages.cxx | 6
cui/source/tabpages/page.cxx | 8
cui/source/tabpages/paragrph.cxx | 6
cui/source/tabpages/tpbitmap.cxx | 2
cui/source/tabpages/tpcolor.cxx | 4
cui/source/tabpages/tpgradnt.cxx | 8
cui/source/tabpages/tphatch.cxx | 8
cui/source/tabpages/tpline.cxx | 10 -
cui/source/tabpages/tplnedef.cxx | 6
cui/source/tabpages/tplneend.cxx | 2
cui/source/tabpages/tppattern.cxx | 6
desktop/inc/dp_gui_shared.hxx | 9
desktop/source/app/app.cxx | 8
desktop/source/deployment/gui/dp_gui_dialog2.cxx | 4
desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx | 8
desktop/source/deployment/gui/dp_gui_updatedialog.cxx | 28 +-
desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx | 16 -
desktop/source/deployment/misc/dp_dependencies.cxx | 12 -
desktop/source/deployment/misc/dp_resource.cxx | 2
desktop/source/lib/init.cxx | 2
desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx | 18 -
extensions/source/abpilot/abspilot.cxx | 6
extensions/source/abpilot/admininvokationimpl.cxx | 2
extensions/source/abpilot/datasourcehandling.cxx | 4
extensions/source/abpilot/fieldmappingimpl.cxx | 2
extensions/source/abpilot/fieldmappingpage.cxx | 2
extensions/source/bibliography/bibload.cxx | 2
extensions/source/bibliography/bibmod.cxx | 6
extensions/source/bibliography/bibresid.hxx | 11 -
extensions/source/bibliography/bibview.cxx | 2
extensions/source/bibliography/datman.cxx | 46 ++--
extensions/source/bibliography/general.cxx | 4
extensions/source/dbpilots/controlwizard.cxx | 4
extensions/source/dbpilots/gridwizard.cxx | 6
extensions/source/dbpilots/groupboxwiz.cxx | 4
extensions/source/dbpilots/listcombowizard.cxx | 8
extensions/source/propctrlr/defaultforminspection.cxx | 2
extensions/source/propctrlr/eformshelper.cxx | 2
extensions/source/propctrlr/eventhandler.cxx | 2
extensions/source/propctrlr/formbrowsertools.cxx | 42 ++--
extensions/source/propctrlr/formcomponenthandler.cxx | 10 -
extensions/source/propctrlr/formlinkdialog.cxx | 6
extensions/source/propctrlr/inspectorhelpwindow.cxx | 2
extensions/source/propctrlr/propcontroller.cxx | 2
extensions/source/propctrlr/selectlabeldialog.cxx | 2
extensions/source/propctrlr/usercontrol.cxx | 4
extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx | 2
filter/source/graphicfilter/eps/eps.cxx | 2
filter/source/xsltdialog/xmlfiltersettingsdialog.cxx | 45 ++--
include/editeng/eerdll.hxx | 2
include/sfx2/sfxresid.hxx | 9
include/svtools/svtresid.hxx | 10 -
include/svx/dialmgr.hxx | 8
include/svx/galmisc.hxx | 15 +
reportdesign/source/core/sdr/UndoActions.cxx | 2
reportdesign/source/ui/inspection/GeometryHandler.cxx | 4
reportdesign/source/ui/report/ReportController.cxx | 6
reportdesign/source/ui/report/SectionWindow.cxx | 3
sc/inc/scresid.hxx | 10 -
sc/qa/unit/screenshots/screenshots.cxx | 6
sc/source/core/data/documen8.cxx | 4
sc/source/core/data/dpdimsave.cxx | 1
sc/source/core/data/dpoutput.cxx | 4
sc/source/core/data/funcdesc.cxx | 4
sc/source/core/tool/autoform.cxx | 2
sc/source/core/tool/inputopt.cxx | 1
sc/source/core/tool/rangeutl.cxx | 1
sc/source/ui/Accessibility/AccessibleDocument.cxx | 6
sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx | 2
sc/source/ui/Accessibility/AccessiblePageHeader.cxx | 6
sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx | 6
sc/source/ui/Accessibility/AccessiblePreviewTable.cxx | 2
sc/source/ui/Accessibility/AccessibleTableBase.cxx | 2
sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx | 22 +-
sc/source/ui/StatisticsDialogs/ChiSquareTestDialog.cxx | 14 -
sc/source/ui/StatisticsDialogs/CorrelationDialog.cxx | 2
sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx | 2
sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx | 6
sc/source/ui/StatisticsDialogs/ExponentialSmoothingDialog.cxx | 6
sc/source/ui/StatisticsDialogs/FTestDialog.cxx | 32 +--
sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx | 8
sc/source/ui/StatisticsDialogs/MovingAverageDialog.cxx | 4
sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx | 28 +-
sc/source/ui/StatisticsDialogs/RegressionDialog.cxx | 14 -
sc/source/ui/StatisticsDialogs/SamplingDialog.cxx | 2
sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx | 2
sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx | 2
sc/source/ui/StatisticsDialogs/TTestDialog.cxx | 36 +--
sc/source/ui/StatisticsDialogs/ZTestDialog.cxx | 30 +--
sc/source/ui/app/inputwin.cxx | 4
sc/source/ui/app/scdll.cxx | 4
sc/source/ui/app/scmod.cxx | 4
sc/source/ui/cctrl/checklistmenu.cxx | 8
sc/source/ui/condformat/condformatdlgentry.cxx | 2
sc/source/ui/dbgui/filtdlg.cxx | 10 -
sc/source/ui/dbgui/pfiltdlg.cxx | 8
sc/source/ui/dbgui/pvfundlg.cxx | 3
sc/source/ui/dbgui/scuiimoptdlg.cxx | 4
sc/source/ui/dbgui/sfiltdlg.cxx | 2
sc/source/ui/dbgui/tpsort.cxx | 12 -
sc/source/ui/dbgui/tpsubt.cxx | 4
sc/source/ui/dialogs/searchresults.cxx | 2
sc/source/ui/docshell/docsh.cxx | 2
sc/source/ui/docshell/documentlinkmgr.cxx | 2
sc/source/ui/drawfunc/fuconrec.cxx | 18 -
sc/source/ui/drawfunc/graphsh.cxx | 2
sc/source/ui/miscdlgs/acredlin.cxx | 32 +--
sc/source/ui/miscdlgs/filldlg.cxx | 2
sc/source/ui/navipi/navipi.cxx | 6
sc/source/ui/optdlg/tpformula.cxx | 6
sc/source/ui/optdlg/tpview.cxx | 2
sc/source/ui/pagedlg/tphfedit.cxx | 6
sc/source/ui/unoobj/PivotTableDataProvider.cxx | 4
sc/source/ui/unoobj/docuno.cxx | 20 +-
sc/source/ui/view/drawvie3.cxx | 4
sc/source/ui/view/gridwin.cxx | 12 -
sc/source/ui/view/gridwin2.cxx | 6
sc/source/ui/view/tabvwshf.cxx | 10 -
scaddins/source/analysis/analysis.cxx | 2
scaddins/source/datefunc/datefunc.cxx | 2
scaddins/source/pricing/pricing.cxx | 2
sd/Library_sd.mk | 1
sd/inc/sdabstdlg.hxx | 3
sd/inc/sdresid.hxx | 10 -
sd/qa/unit/dialogs-test.cxx | 4
sd/source/core/drawdoc.cxx | 14 -
sd/source/core/drawdoc2.cxx | 18 -
sd/source/core/drawdoc3.cxx | 10 -
sd/source/core/drawdoc4.cxx | 50 ++---
sd/source/core/sdpage.cxx | 48 ++--
sd/source/core/stlfamily.cxx | 4
sd/source/core/stlpool.cxx | 14 -
sd/source/core/stlsheet.cxx | 24 +-
sd/source/core/undoanim.cxx | 6
sd/source/filter/grf/sdgrffilter.cxx | 2
sd/source/filter/html/htmlattr.cxx | 8
sd/source/filter/html/htmlex.cxx | 38 +--
sd/source/filter/html/pubdlg.cxx | 2
sd/source/filter/ppt/pptin.cxx | 18 -
sd/source/filter/xml/sdxmlwrp.cxx | 4
sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx | 16 -
sd/source/ui/accessibility/AccessibleOutlineView.cxx | 4
sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx | 6
sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx | 2
sd/source/ui/accessibility/AccessibleSlideSorterView.cxx | 4
sd/source/ui/animations/CustomAnimationDialog.cxx | 10 -
sd/source/ui/animations/CustomAnimationList.cxx | 12 -
sd/source/ui/animations/CustomAnimationPane.cxx | 42 ++--
sd/source/ui/animations/SlideTransitionPane.cxx | 4
sd/source/ui/annotations/annotationmanager.cxx | 16 -
sd/source/ui/annotations/annotationtag.cxx | 2
sd/source/ui/annotations/annotationwindow.cxx | 2
sd/source/ui/app/sdmod1.cxx | 2
sd/source/ui/app/sdmod2.cxx | 22 +-
sd/source/ui/app/sdpopup.cxx | 18 -
sd/source/ui/app/sdresid.cxx | 30 ---
sd/source/ui/app/tmplctrl.cxx | 2
sd/source/ui/controller/displaymodecontroller.cxx | 6
sd/source/ui/controller/slidelayoutcontroller.cxx | 8
sd/source/ui/dlg/LayerTabBar.cxx | 22 +-
sd/source/ui/dlg/PaneChildWindows.cxx | 2
sd/source/ui/dlg/PhotoAlbumDialog.cxx | 4
sd/source/ui/dlg/RemoteDialogClientBox.cxx | 6
sd/source/ui/dlg/animobjs.cxx | 2
sd/source/ui/dlg/brkdlg.cxx | 4
sd/source/ui/dlg/custsdlg.cxx | 2
sd/source/ui/dlg/diactrl.cxx | 6
sd/source/ui/dlg/dlgfield.cxx | 14 -
sd/source/ui/dlg/filedlg.cxx | 26 +-
sd/source/ui/dlg/gluectrl.cxx | 24 +-
sd/source/ui/dlg/inspagob.cxx | 2
sd/source/ui/dlg/navigatr.cxx | 8
sd/source/ui/dlg/prltempl.cxx | 18 -
sd/source/ui/dlg/sddlgfact.cxx | 4
sd/source/ui/dlg/sddlgfact.hxx | 2
sd/source/ui/dlg/sdpreslt.cxx | 4
sd/source/ui/dlg/sdtreelb.cxx | 4
sd/source/ui/dlg/tpaction.cxx | 22 +-
sd/source/ui/dlg/tpoption.cxx | 2
sd/source/ui/dlg/unchss.cxx | 14 -
sd/source/ui/docshell/docshel2.cxx | 4
sd/source/ui/docshell/docshel4.cxx | 8
sd/source/ui/framework/module/SlideSorterModule.cxx | 2
sd/source/ui/framework/module/ViewTabBarModule.cxx | 8
sd/source/ui/func/fubullet.cxx | 4
sd/source/ui/func/fuconrec.cxx | 32 +--
sd/source/ui/func/fuconstr.cxx | 2
sd/source/ui/func/fuconuno.cxx | 2
sd/source/ui/func/fucopy.cxx | 6
sd/source/ui/func/fudraw.cxx | 24 +-
sd/source/ui/func/fuexpand.cxx | 2
sd/source/ui/func/fuhhconv.cxx | 2
sd/source/ui/func/fuinsert.cxx | 6
sd/source/ui/func/fuinsfil.cxx | 16 -
sd/source/ui/func/fulinend.cxx | 6
sd/source/ui/func/fumorph.cxx | 2
sd/source/ui/func/fupage.cxx | 4
sd/source/ui/func/fuprobjs.cxx | 2
sd/source/ui/func/fusldlg.cxx | 2
sd/source/ui/func/fusnapln.cxx | 4
sd/source/ui/func/fusumry.cxx | 2
sd/source/ui/func/futempl.cxx | 22 +-
sd/source/ui/func/futext.cxx | 2
sd/source/ui/func/futransf.cxx | 2
sd/source/ui/func/fuvect.cxx | 2
sd/source/ui/func/unprlout.cxx | 2
sd/source/ui/inc/prltempl.hxx | 2
sd/source/ui/sidebar/DocumentHelper.cxx | 2
sd/source/ui/sidebar/LayoutMenu.cxx | 4
sd/source/ui/sidebar/SlideBackground.cxx | 20 +-
sd/source/ui/slidesorter/controller/SlsClipboard.cxx | 4
sd/source/ui/slidesorter/controller/SlsSlotManager.cxx | 8
sd/source/ui/slidesorter/view/SlsToolTip.cxx | 2
sd/source/ui/table/tableobjectbar.cxx | 2
sd/source/ui/unoidl/unolayer.cxx | 22 +-
sd/source/ui/unoidl/unomodel.cxx | 8
sd/source/ui/unoidl/unopage.cxx | 14 -
sd/source/ui/view/DocumentRenderer.cxx | 38 +--
sd/source/ui/view/GraphicObjectBar.cxx | 2
sd/source/ui/view/MediaObjectBar.cxx | 2
sd/source/ui/view/Outliner.cxx | 6
sd/source/ui/view/ViewShellImplementation.cxx | 8
sd/source/ui/view/drawview.cxx | 8
sd/source/ui/view/drbezob.cxx | 2
sd/source/ui/view/drtxtob1.cxx | 2
sd/source/ui/view/drviews1.cxx | 10 -
sd/source/ui/view/drviews2.cxx | 60 +++---
sd/source/ui/view/drviews3.cxx | 10 -
sd/source/ui/view/drviews4.cxx | 10 -
sd/source/ui/view/drviews6.cxx | 2
sd/source/ui/view/drviews7.cxx | 14 -
sd/source/ui/view/drviews9.cxx | 2
sd/source/ui/view/drviewsa.cxx | 2
sd/source/ui/view/drviewsb.cxx | 4
sd/source/ui/view/drviewse.cxx | 18 -
sd/source/ui/view/drviewsi.cxx | 4
sd/source/ui/view/frmview.cxx | 2
sd/source/ui/view/outlnvsh.cxx | 2
sd/source/ui/view/outlview.cxx | 8
sd/source/ui/view/sdview.cxx | 20 +-
sd/source/ui/view/sdview2.cxx | 8
sd/source/ui/view/sdview3.cxx | 10 -
sd/source/ui/view/sdview4.cxx | 10 -
sd/source/ui/view/unmodpg.cxx | 16 -
sd/source/ui/view/viewoverlaymanager.cxx | 6
sd/source/ui/view/viewshe3.cxx | 10 -
sfx2/inc/doc.hrc | 8
sfx2/source/appl/app.cxx | 3
sfx2/source/appl/appcfg.cxx | 2
sfx2/source/appl/appopen.cxx | 2
sfx2/source/appl/appquit.cxx | 4
sfx2/source/appl/appserv.cxx | 4
sfx2/source/appl/fileobj.cxx | 2
sfx2/source/appl/linkmgr2.cxx | 4
sfx2/source/appl/lnkbase2.cxx | 2
sfx2/source/appl/newhelp.cxx | 36 +--
sfx2/source/appl/opengrf.cxx | 2
sfx2/source/appl/sfxhelp.cxx | 2
sfx2/source/appl/shutdownicon.cxx | 10 -
sfx2/source/bastyp/fltfnc.cxx | 4
sfx2/source/bastyp/sfxresid.cxx | 11 -
sfx2/source/control/msgpool.cxx | 6
sfx2/source/control/templatedefaultview.cxx | 4
sfx2/source/control/templatelocalview.cxx | 22 +-
sfx2/source/control/templatesearchview.cxx | 10 -
sfx2/source/dialog/dinfdlg.cxx | 28 +-
sfx2/source/dialog/filedlghelper.cxx | 18 -
sfx2/source/dialog/filtergrouping.cxx | 2
sfx2/source/dialog/mailmodel.cxx | 2
sfx2/source/dialog/mgetempl.cxx | 8
sfx2/source/dialog/navigat.cxx | 2
sfx2/source/dialog/passwd.cxx | 6
sfx2/source/dialog/recfloat.cxx | 4
sfx2/source/dialog/securitypage.cxx | 4
sfx2/source/dialog/styledlg.cxx | 2
sfx2/source/dialog/tabdlg.cxx | 4
sfx2/source/dialog/templdlg.cxx | 20 +-
sfx2/source/doc/doc.src | 35 ---
sfx2/source/doc/docfac.cxx | 22 --
sfx2/source/doc/doctempl.cxx | 4
sfx2/source/doc/doctemplates.cxx | 7
sfx2/source/doc/guisaveas.cxx | 4
sfx2/source/doc/new.cxx | 6
sfx2/source/doc/objcont.cxx | 2
sfx2/source/doc/objmisc.cxx | 8
sfx2/source/doc/objserv.cxx | 8
sfx2/source/doc/objstor.cxx | 14 -
sfx2/source/doc/objxtor.cxx | 2
sfx2/source/doc/querytemplate.cxx | 4
sfx2/source/doc/saveastemplatedlg.cxx | 6
sfx2/source/doc/sfxbasemodel.cxx | 8
sfx2/source/doc/templatedlg.cxx | 44 ++--
sfx2/source/sidebar/DeckTitleBar.cxx | 2
sfx2/source/sidebar/PanelTitleBar.cxx | 2
sfx2/source/sidebar/SidebarController.cxx | 10 -
sfx2/source/sidebar/TabBar.cxx | 2
sfx2/source/view/viewfrm.cxx | 6
sfx2/source/view/viewprn.cxx | 8
starmath/inc/smmod.hxx | 8
starmath/source/ElementsDockingWindow.cxx | 84 ++++----
starmath/source/accessibility.cxx | 4
starmath/source/document.cxx | 8
starmath/source/mathmlexport.cxx | 2
starmath/source/mathmlimport.cxx | 2
starmath/source/parse.cxx | 4
starmath/source/smmod.cxx | 12 -
starmath/source/unomodel.cxx | 18 -
starmath/source/utility.cxx | 4
starmath/source/view.cxx | 2
svtools/source/contnr/fileview.cxx | 24 +-
svtools/source/contnr/svtabbx.cxx | 4
svtools/source/contnr/templwin.cxx | 2
svtools/source/control/calendar.cxx | 8
svtools/source/control/collatorres.cxx | 26 +-
svtools/source/control/ctrlbox.cxx | 16 -
svtools/source/control/ctrltool.cxx | 24 +-
svtools/source/control/filectrl.cxx | 2
svtools/source/control/indexentryres.cxx | 22 +-
svtools/source/control/tabbar.cxx | 10 -
svtools/source/dialogs/PlaceEditDialog.cxx | 2
svtools/source/dialogs/addresstemplate.cxx | 66 +++---
svtools/source/dialogs/insdlg.cxx | 6
svtools/source/dialogs/prnsetup.cxx | 4
svtools/source/dialogs/roadmapwizard.cxx | 2
svtools/source/dialogs/wizardmachine.cxx | 6
svtools/source/filter/exportdialog.cxx | 20 +-
svtools/source/misc/imagemgr.cxx | 6
svtools/source/misc/langtab.cxx | 4
svtools/source/misc/svtresid.cxx | 11 -
svx/source/accessibility/AccessibleFrameSelector.cxx | 4
svx/source/accessibility/DescriptionGenerator.cxx | 20 +-
svx/source/accessibility/GraphCtlAccessibleContext.cxx | 4
svx/source/accessibility/ShapeTypeHandler.cxx | 2
svx/source/accessibility/charmapacc.cxx | 10 -
svx/source/accessibility/svxrectctaccessiblecontext.cxx | 8
svx/source/core/graphichelper.cxx | 4
svx/source/dialog/SafeModeDialog.cxx | 2
svx/source/dialog/_bmpmask.cxx | 5
svx/source/dialog/charmap.cxx | 2
svx/source/dialog/compressgraphicdialog.cxx | 28 +-
svx/source/dialog/contimp.hxx | 2
svx/source/dialog/dlgctl3d.cxx | 2
svx/source/dialog/dlgctrl.cxx | 12 -
svx/source/dialog/docrecovery.cxx | 8
svx/source/dialog/langbox.cxx | 4
svx/source/dialog/pagenumberlistbox.cxx | 2
svx/source/dialog/papersizelistbox.cxx | 4
svx/source/dialog/passwd.cxx | 4
svx/source/dialog/prtqry.cxx | 8
svx/source/dialog/samecontentlistbox.cxx | 2
svx/source/dialog/spacinglistbox.cxx | 2
svx/source/dialog/srchdlg.cxx | 22 +-
svx/source/dialog/strarray.cxx | 6
svx/source/dialog/svxbmpnumvalueset.cxx | 6
svx/source/dialog/svxruler.cxx | 2
svx/source/dialog/swframeposstrings.cxx | 2
svx/source/dialog/txenctab.cxx | 3
svx/source/engine3d/dragmt3d.cxx | 2
svx/source/engine3d/float3d.cxx | 6
svx/source/engine3d/view3d.cxx | 8
svx/source/engine3d/view3d1.cxx | 2
svx/source/fmcomp/fmgridcl.cxx | 8
svx/source/fmcomp/gridcell.cxx | 2
svx/source/fmcomp/gridctrl.cxx | 6
svx/source/form/ParseContext.cxx | 26 +-
svx/source/form/databaselocationinput.cxx | 2
svx/source/form/datanavi.cxx | 98 +++++-----
svx/source/form/filtnav.cxx | 12 -
svx/source/form/fmPropBrw.cxx | 14 -
svx/source/form/fmexpl.cxx | 2
svx/source/form/fmpgeimp.cxx | 14 -
svx/source/form/fmshimp.cxx | 4
svx/source/form/fmundo.cxx | 4
svx/source/form/fmvwimp.cxx | 6
svx/source/form/formcontrolfactory.cxx | 4
svx/source/form/formcontroller.cxx | 12 -
svx/source/form/navigatortree.cxx | 28 +-
svx/source/form/navigatortreemodel.cxx | 12 -
svx/source/form/tabwin.cxx | 6
svx/source/form/tbxform.cxx | 4
svx/source/gallery2/galbrws1.cxx | 6
svx/source/gallery2/galbrws2.cxx | 14 -
svx/source/gallery2/galctrl.cxx | 2
svx/source/gallery2/gallery1.cxx | 12 -
svx/source/gallery2/galmisc.cxx | 2
svx/source/gallery2/galobj.cxx | 2
svx/source/gallery2/galtheme.cxx | 2
svx/source/inc/datanavi.hxx | 12 -
svx/source/items/algitem.cxx | 10 -
svx/source/items/pageitem.cxx | 22 +-
svx/source/items/postattr.cxx | 6
svx/source/sidebar/EmptyPanel.cxx | 2
svx/source/sidebar/graphic/GraphicPropertyPanel.cxx | 8
svx/source/sidebar/line/LinePropertyPanelBase.cxx | 2
svx/source/sidebar/line/LineWidthPopup.cxx | 4
svx/source/sidebar/nbdtmg.cxx | 12 -
svx/source/stbctrls/insctrl.cxx | 6
svx/source/stbctrls/modctrl.cxx | 2
svx/source/stbctrls/xmlsecctrl.cxx | 2
svx/source/stbctrls/zoomctrl.cxx | 4
svx/source/stbctrls/zoomsliderctrl.cxx | 4
svx/source/svdraw/svdetc.cxx | 2
svx/source/svdraw/svdhdl.cxx | 2
svx/source/svdraw/svdmrkv.cxx | 2
svx/source/table/tabledesign.cxx | 2
svx/source/tbxctrls/PaletteManager.cxx | 6
svx/source/tbxctrls/bulletsnumbering.cxx | 6
svx/source/tbxctrls/colrctrl.cxx | 6
svx/source/tbxctrls/extrusioncontrols.cxx | 26 +-
svx/source/tbxctrls/fontworkgallery.cxx | 26 +-
svx/source/tbxctrls/grafctrl.cxx | 28 +-
svx/source/tbxctrls/layctrl.cxx | 4
svx/source/tbxctrls/lboxctrl.cxx | 4
svx/source/tbxctrls/linectrl.cxx | 8
svx/source/tbxctrls/tbcontrl.cxx | 32 +--
svx/source/tbxctrls/tbunosearchcontrollers.cxx | 6
svx/source/toolbars/extrusionbar.cxx | 4
svx/source/toolbars/fontworkbar.cxx | 6
svx/source/unodraw/unoprov.cxx | 13 -
svx/source/xoutdev/xattr.cxx | 13 -
svx/source/xoutdev/xattr2.cxx | 8
svx/source/xoutdev/xtabcolr.cxx | 50 ++---
svx/source/xoutdev/xtabdash.cxx | 6
svx/source/xoutdev/xtabgrdt.cxx | 2
svx/source/xoutdev/xtabhtch.cxx | 2
svx/source/xoutdev/xtablend.cxx | 6
svx/source/xoutdev/xtabptrn.cxx | 2
sw/inc/swtypes.hxx | 11 -
sw/source/core/access/acccontext.cxx | 2
sw/source/core/crsr/crsrsh.cxx | 2
sw/source/core/crsr/findcoll.cxx | 2
sw/source/core/doc/DocumentFieldsManager.cxx | 8
sw/source/core/doc/DocumentRedlineManager.cxx | 4
sw/source/core/doc/doc.cxx | 8
sw/source/core/doc/docnum.cxx | 2
sw/source/core/doc/docredln.cxx | 8
sw/source/core/doc/notxtfrm.cxx | 2
sw/source/core/edit/eddel.cxx | 2
sw/source/core/fields/authfld.cxx | 2
sw/source/core/fields/docufld.cxx | 2
sw/source/core/fields/fldbas.cxx | 2
sw/source/core/fields/reffld.cxx | 4
sw/source/core/fields/scrptfld.cxx | 2
sw/source/core/frmedt/feshview.cxx | 18 -
sw/source/core/layout/atrfrm.cxx | 4
sw/source/core/layout/pagedesc.cxx | 2
sw/source/core/layout/paintfrm.cxx | 4
sw/source/core/ole/ndole.cxx | 6
sw/source/core/tox/tox.cxx | 10 -
sw/source/core/tox/txmsrt.cxx | 4
sw/source/core/txtnode/fntcache.cxx | 2
sw/source/core/undo/SwUndoFmt.cxx | 4
sw/source/core/undo/SwUndoPageDesc.cxx | 2
sw/source/core/undo/docundo.cxx | 4
sw/source/core/undo/rolbck.cxx | 6
sw/source/core/undo/unbkmk.cxx | 6
sw/source/core/undo/undel.cxx | 22 +-
sw/source/core/undo/undobj.cxx | 4
sw/source/core/undo/unins.cxx | 30 +--
sw/source/core/undo/unovwr.cxx | 6
sw/source/core/undo/untbl.cxx | 4
sw/source/core/unocore/unochart.cxx | 8
sw/source/core/unocore/unofield.cxx | 8
sw/source/core/unocore/unosett.cxx | 4
sw/source/core/unocore/unostyle.cxx | 4
sw/source/core/view/pagepreviewlayout.cxx | 2
sw/source/core/view/printdata.cxx | 62 +++---
sw/source/filter/xml/swxml.cxx | 2
sw/source/filter/xml/wrtxml.cxx | 2
sw/source/filter/xml/xmlimp.cxx | 2
sw/source/ui/chrdlg/break.cxx | 2
sw/source/ui/chrdlg/chardlg.cxx | 2
sw/source/ui/chrdlg/drpcps.cxx | 2
sw/source/ui/chrdlg/numpara.cxx | 2
sw/source/ui/chrdlg/pardlg.cxx | 2
sw/source/ui/config/optload.cxx | 20 +-
sw/source/ui/config/optpage.cxx | 10 -
sw/source/ui/dbui/createaddresslistdialog.cxx | 2
sw/source/ui/dbui/dbinsdlg.cxx | 2
sw/source/ui/dbui/mailmergewizard.cxx | 16 -
sw/source/ui/dbui/mmaddressblockpage.cxx | 38 +--
sw/source/ui/dbui/mmoutputtypepage.cxx | 12 -
sw/source/ui/dbui/mmresultdialogs.cxx | 4
sw/source/ui/dbui/selectdbtabledialog.cxx | 8
sw/source/ui/dialog/macassgn.cxx | 26 +-
sw/source/ui/dialog/uiregionsw.cxx | 10 -
sw/source/ui/envelp/label1.cxx | 6
sw/source/ui/envelp/labfmt.cxx | 22 +-
sw/source/ui/fldui/changedb.cxx | 2
sw/source/ui/fldui/flddinf.cxx | 2
sw/source/ui/fldui/flddok.cxx | 14 -
sw/source/ui/fldui/fldfunc.cxx | 22 +-
sw/source/ui/fldui/fldref.cxx | 4
sw/source/ui/fldui/fldvar.cxx | 28 +-
sw/source/ui/fldui/javaedit.cxx | 2
sw/source/ui/frmdlg/column.cxx | 16 -
sw/source/ui/frmdlg/cption.cxx | 12 -
sw/source/ui/frmdlg/frmdlg.cxx | 2
sw/source/ui/frmdlg/frmpage.cxx | 4
sw/source/ui/frmdlg/pattern.cxx | 2
sw/source/ui/frmdlg/uiborder.cxx | 2
sw/source/ui/index/cnttab.cxx | 46 ++--
sw/source/ui/index/swuiidxmrk.cxx | 10 -
sw/source/ui/misc/bookmark.cxx | 10 -
sw/source/ui/misc/glosbib.cxx | 4
sw/source/ui/misc/glossary.cxx | 14 -
sw/source/ui/misc/linenum.cxx | 6
sw/source/ui/misc/outline.cxx | 2
sw/source/ui/misc/pgfnote.cxx | 2
sw/source/ui/misc/srtdlg.cxx | 8
sw/source/ui/table/convert.cxx | 2
sw/source/ui/table/tabledlg.cxx | 2
sw/source/ui/table/tautofmt.cxx | 28 +-
sw/source/uibase/app/appenv.cxx | 2
sw/source/uibase/app/applab.cxx | 2
sw/source/uibase/app/docsh.cxx | 4
sw/source/uibase/app/docsh2.cxx | 20 +-
sw/source/uibase/app/docstyle.cxx | 8
sw/source/uibase/app/mainwn.cxx | 4
sw/source/uibase/app/swmodul1.cxx | 2
sw/source/uibase/app/swmodule.cxx | 24 +-
sw/source/uibase/dbui/dbmgr.cxx | 22 +-
sw/source/uibase/dbui/mailmergehelper.cxx | 2
sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx | 2
sw/source/uibase/dbui/mmconfigitem.cxx | 2
sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx | 4
sw/source/uibase/dochdl/gloshdl.cxx | 4
sw/source/uibase/dochdl/swdtflvr.cxx | 20 +-
sw/source/uibase/docvw/AnnotationMenuButton.cxx | 6
sw/source/uibase/docvw/AnnotationWin.cxx | 2
sw/source/uibase/docvw/AnnotationWin2.cxx | 8
sw/source/uibase/docvw/HeaderFooterWin.cxx | 26 +-
sw/source/uibase/docvw/PostItMgr.cxx | 8
sw/source/uibase/docvw/SidebarTxtControl.cxx | 2
sw/source/uibase/docvw/edtwin2.cxx | 10 -
sw/source/uibase/envelp/envimg.cxx | 2
sw/source/uibase/fldui/fldmgr.cxx | 16 -
sw/source/uibase/globdoc/globdoc.cxx | 6
sw/source/uibase/lingu/hyp.cxx | 2
sw/source/uibase/lingu/olmenu.cxx | 18 -
sw/source/uibase/misc/glshell.cxx | 4
sw/source/uibase/misc/numberingtypelistbox.cxx | 2
sw/source/uibase/misc/redlndlg.cxx | 18 -
sw/source/uibase/misc/swruler.cxx | 4
sw/source/uibase/ribbar/drawbase.cxx | 2
sw/source/uibase/ribbar/inputwin.cxx | 18 -
sw/source/uibase/ribbar/workctrl.cxx | 18 -
sw/source/uibase/shells/annotsh.cxx | 4
sw/source/uibase/shells/basesh.cxx | 24 +-
sw/source/uibase/shells/drawsh.cxx | 2
sw/source/uibase/shells/frmsh.cxx | 6
sw/source/uibase/shells/tabsh.cxx | 2
sw/source/uibase/shells/textfld.cxx | 4
sw/source/uibase/shells/textsh.cxx | 4
sw/source/uibase/shells/textsh1.cxx | 12 -
sw/source/uibase/sidebar/PageMarginControl.cxx | 12 -
sw/source/uibase/uiview/pview.cxx | 2
sw/source/uibase/uiview/srcview.cxx | 12 -
sw/source/uibase/uiview/uivwimp.cxx | 2
sw/source/uibase/uiview/view2.cxx | 24 +-
sw/source/uibase/uiview/viewdlg2.cxx | 2
sw/source/uibase/uiview/viewling.cxx | 6
sw/source/uibase/uiview/viewprt.cxx | 4
sw/source/uibase/uiview/viewsrch.cxx | 4
sw/source/uibase/uno/unotxdoc.cxx | 18 -
sw/source/uibase/utlui/attrdesc.cxx | 84 ++++----
sw/source/uibase/utlui/bookctrl.cxx | 4
sw/source/uibase/utlui/content.cxx | 30 +--
sw/source/uibase/utlui/glbltree.cxx | 2
sw/source/uibase/utlui/initui.cxx | 64 +++---
sw/source/uibase/utlui/navipi.cxx | 10 -
sw/source/uibase/utlui/numfmtlb.cxx | 6
sw/source/uibase/utlui/tmplctrl.cxx | 2
sw/source/uibase/utlui/uiitems.cxx | 2
sw/source/uibase/utlui/unotools.cxx | 20 +-
sw/source/uibase/utlui/viewlayoutctrl.cxx | 6
sw/source/uibase/utlui/wordcountctrl.cxx | 2
sw/source/uibase/web/wdocsh.cxx | 6
sw/source/uibase/wrtsh/wrtsh1.cxx | 28 +-
sw/source/uibase/wrtsh/wrtundo.cxx | 4
tools/source/rc/resmgr.cxx | 2
vcl/source/app/stdtext.cxx | 2
vcl/source/app/svapp.cxx | 12 -
vcl/source/control/button.cxx | 2
vcl/source/edit/textundo.cxx | 4
vcl/source/outdev/font.cxx | 2
vcl/source/window/brdwin.cxx | 2
vcl/source/window/menubarwindow.cxx | 6
vcl/source/window/msgbox.cxx | 4
vcl/source/window/printdlg.cxx | 8
vcl/source/window/splitwin.cxx | 2
vcl/unx/gtk/fpicker/resourceprovider.cxx | 2
vcl/unx/gtk/gtksalframe.cxx | 10 -
vcl/unx/gtk3/gtk3gtkframe.cxx | 10 -
vcl/unx/kde4/KDE4FilePicker.cxx | 2
writerperfect/inc/WPFTResMgr.hxx | 6
writerperfect/source/calc/MSWorksCalcImportFilter.cxx | 8
writerperfect/source/writer/MSWorksImportFilter.cxx | 8
xmlsecurity/inc/resourcemanager.hxx | 5
xmlsecurity/source/component/documentdigitalsignatures.cxx | 2
xmlsecurity/source/dialogs/certificateviewer.cxx | 28 +-
xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx | 4
661 files changed, 2960 insertions(+), 3088 deletions(-)
New commits:
commit d666c2f87d56da1f4dd3d421665ac3078c447a17
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu May 18 21:14:00 2017 +0100
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 at libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
(cherry picked from commit 2155e04d6343638ca9815d394cbc4f78c2b17c3a)
drop toString
Change-Id: I0f67c8931523bbe90bfbc8cc7d9a5bd523758ee5
(cherry picked from commit 8b1101023f01b2c7478a014b5ead73ada4fd4861)
pNameResId is unused
Change-Id: Ic1fe6abc7066517187695266c4d1a0888b41ffe7
(cherry picked from commit c2667d7ff558a1b7bf83e694909465f00d1a16f6)
Reviewed-on: https://gerrit.libreoffice.org/37843
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
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 f785bbec456e..8b41a475fbff 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 )
{
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list