avmedia/inc/helpids.h | 24
avmedia/inc/mediacontrol.hxx | 2
avmedia/source/framework/MediaControlBase.cxx | 14
avmedia/source/framework/mediacontrol.cxx | 2
basctl/inc/helpids.h | 26
basctl/source/basicide/baside2.cxx | 2
basctl/source/basicide/baside2.hxx | 2
basctl/source/basicide/baside2b.cxx | 4
basctl/source/basicide/baside3.cxx | 2
basctl/source/basicide/bastypes.cxx | 2
basctl/source/basicide/macrodlg.cxx | 2
basctl/source/basicide/moduldlg.cxx | 10
basctl/source/basicide/moduldlg.hxx | 6
basctl/source/inc/baside3.hxx | 2
basctl/source/inc/bastypes.hxx | 4
chart2/source/controller/dialogs/dlg_CreationWizard.cxx | 2
chart2/source/controller/dialogs/dlg_DataEditor.cxx | 2
chart2/source/controller/dialogs/dlg_DataSource.cxx | 4
chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx | 4
chart2/source/controller/dialogs/dlg_ObjectProperties.cxx | 2
chart2/source/controller/dialogs/dlg_ShapeFont.cxx | 2
chart2/source/controller/dialogs/dlg_ShapeParagraph.cxx | 2
chart2/source/controller/dialogs/dlg_View3D.cxx | 2
chart2/source/controller/inc/dlg_DataEditor.hxx | 2
chart2/source/controller/inc/dlg_DataSource.hxx | 4
chart2/source/controller/inc/dlg_ObjectProperties.hxx | 2
chart2/source/controller/inc/dlg_ShapeFont.hxx | 2
chart2/source/controller/inc/dlg_ShapeParagraph.hxx | 2
chart2/source/controller/inc/dlg_View3D.hxx | 2
chart2/source/controller/inc/helpids.h | 10
cui/source/customize/SvxMenuConfigPage.cxx | 10
cui/source/customize/SvxToolbarConfigPage.cxx | 10
cui/source/customize/cfg.cxx | 4
cui/source/customize/cfgutil.cxx | 2
cui/source/customize/macropg.cxx | 2
cui/source/dialogs/AdditionsDialog.cxx | 2
cui/source/dialogs/SignatureLineDialogBase.cxx | 2
cui/source/dialogs/SpellDialog.cxx | 8
cui/source/dialogs/cuigaldlg.cxx | 2
cui/source/dialogs/cuigrfflt.cxx | 2
cui/source/dialogs/cuihyperdlg.cxx | 2
cui/source/dialogs/hltpbase.cxx | 2
cui/source/dialogs/iconcdlg.cxx | 14
cui/source/dialogs/insdlg.cxx | 2
cui/source/dialogs/insrc.cxx | 2
cui/source/dialogs/screenshotannotationdlg.cxx | 11
cui/source/dialogs/sdrcelldlg.cxx | 2
cui/source/dialogs/srchxtra.cxx | 2
cui/source/factory/dlgfact.cxx | 24
cui/source/factory/dlgfact.hxx | 20
cui/source/inc/AdditionsDialog.hxx | 2
cui/source/inc/SignatureLineDialogBase.hxx | 2
cui/source/inc/SpellDialog.hxx | 6
cui/source/inc/SvxMenuConfigPage.hxx | 6
cui/source/inc/SvxToolbarConfigPage.hxx | 6
cui/source/inc/bbdlg.hxx | 2
cui/source/inc/cfg.hxx | 4
cui/source/inc/chardlg.hxx | 2
cui/source/inc/cuigaldlg.hxx | 2
cui/source/inc/cuigrfflt.hxx | 2
cui/source/inc/cuihyperdlg.hxx | 18
cui/source/inc/cuitabarea.hxx | 2
cui/source/inc/cuitabline.hxx | 4
cui/source/inc/dlgname.hxx | 2
cui/source/inc/helpids.h | 57
cui/source/inc/hltpbase.hxx | 2
cui/source/inc/iconcdlg.hxx | 8
cui/source/inc/insdlg.hxx | 4
cui/source/inc/insrc.hxx | 2
cui/source/inc/labdlg.hxx | 2
cui/source/inc/macropg.hxx | 2
cui/source/inc/numpages.hxx | 2
cui/source/inc/sdrcelldlg.hxx | 2
cui/source/inc/srchxtra.hxx | 2
cui/source/inc/textanim.hxx | 2
cui/source/inc/transfrm.hxx | 2
cui/source/options/optcolor.cxx | 14
cui/source/options/optgenrl.cxx | 4
cui/source/options/personalization.cxx | 2
cui/source/options/treeopt.cxx | 6
cui/source/tabpages/autocdlg.cxx | 2
cui/source/tabpages/bbdlg.cxx | 6
cui/source/tabpages/chardlg.cxx | 2
cui/source/tabpages/labdlg.cxx | 2
cui/source/tabpages/numpages.cxx | 4
cui/source/tabpages/tabarea.cxx | 2
cui/source/tabpages/tabline.cxx | 2
cui/source/tabpages/textanim.cxx | 2
cui/source/tabpages/tpline.cxx | 4
cui/source/tabpages/transfrm.cxx | 12
dbaccess/inc/helpids.h | 174 -
dbaccess/source/ui/app/AppDetailPageHelper.cxx | 10
dbaccess/source/ui/app/AppDetailPageHelper.hxx | 4
dbaccess/source/ui/app/ChildWindow.cxx | 2
dbaccess/source/ui/browser/sbagrid.cxx | 4
dbaccess/source/ui/control/FieldDescControl.cxx | 6
dbaccess/source/ui/control/RelationControl.cxx | 2
dbaccess/source/ui/control/sqledit.cxx | 2
dbaccess/source/ui/dlg/ConnectionHelper.cxx | 2
dbaccess/source/ui/dlg/ConnectionHelper.hxx | 2
dbaccess/source/ui/dlg/ConnectionPage.cxx | 2
dbaccess/source/ui/dlg/ConnectionPageSetup.cxx | 2
dbaccess/source/ui/dlg/ConnectionPageSetup.hxx | 2
dbaccess/source/ui/dlg/UserAdmin.cxx | 2
dbaccess/source/ui/dlg/UserAdmin.hxx | 2
dbaccess/source/ui/dlg/UserAdminDlg.cxx | 2
dbaccess/source/ui/dlg/adminpages.cxx | 2
dbaccess/source/ui/dlg/adminpages.hxx | 2
dbaccess/source/ui/dlg/advancedsettings.cxx | 4
dbaccess/source/ui/dlg/dbadmin.cxx | 8
dbaccess/source/ui/dlg/dbwiz.cxx | 2
dbaccess/source/ui/dlg/dbwizsetup.cxx | 2
dbaccess/source/ui/dlg/detailpages.cxx | 2
dbaccess/source/ui/dlg/detailpages.hxx | 2
dbaccess/source/ui/dlg/dlgattr.cxx | 2
dbaccess/source/ui/dlg/dlgsize.cxx | 2
dbaccess/source/ui/dlg/indexdialog.cxx | 2
dbaccess/source/ui/dlg/sqlmessage.cxx | 2
dbaccess/source/ui/inc/ChildWindow.hxx | 4
dbaccess/source/ui/inc/FieldDescControl.hxx | 8
dbaccess/source/ui/inc/UserAdminDlg.hxx | 2
dbaccess/source/ui/inc/WTabPage.hxx | 2
dbaccess/source/ui/inc/advancedsettingsdlg.hxx | 2
dbaccess/source/ui/inc/curledit.hxx | 2
dbaccess/source/ui/inc/dbadmin.hxx | 6
dbaccess/source/ui/inc/dlgattr.hxx | 2
dbaccess/source/ui/inc/indexdialog.hxx | 2
dbaccess/source/ui/inc/sbagrid.hxx | 4
dbaccess/source/ui/inc/sqlmessage.hxx | 2
dbaccess/source/ui/misc/WColumnSelect.cxx | 2
dbaccess/source/ui/misc/WCopyTable.cxx | 2
dbaccess/source/ui/misc/WTypeSelect.cxx | 2
dbaccess/source/ui/querydesign/JoinTableView.cxx | 2
dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx | 6
dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx | 2
dbaccess/source/ui/tabledesign/TEditControl.cxx | 2
dbaccess/source/ui/tabledesign/TableDesignControl.cxx | 2
desktop/source/deployment/gui/dp_gui_dialog2.cxx | 6
desktop/source/inc/helpids.h | 6
desktop/source/lib/init.cxx | 31
editeng/source/editeng/editview.cxx | 4
extensions/inc/helpids.h | 102
extensions/source/abpilot/abspage.cxx | 2
extensions/source/abpilot/abspage.hxx | 2
extensions/source/abpilot/abspilot.cxx | 2
extensions/source/bibliography/general.cxx | 2
extensions/source/bibliography/general.hxx | 2
extensions/source/bibliography/toolbar.cxx | 4
extensions/source/bibliography/toolbar.hxx | 2
extensions/source/dbpilots/commonpagesdbp.cxx | 2
extensions/source/dbpilots/commonpagesdbp.hxx | 2
extensions/source/dbpilots/controlwizard.cxx | 2
extensions/source/dbpilots/controlwizard.hxx | 2
extensions/source/dbpilots/gridwizard.cxx | 2
extensions/source/dbpilots/gridwizard.hxx | 2
extensions/source/dbpilots/groupboxwiz.cxx | 2
extensions/source/dbpilots/groupboxwiz.hxx | 2
extensions/source/dbpilots/listcombowizard.cxx | 2
extensions/source/dbpilots/listcombowizard.hxx | 2
extensions/source/propctrlr/browserline.cxx | 2
extensions/source/propctrlr/browserline.hxx | 2
extensions/source/propctrlr/browserpage.hxx | 2
extensions/source/propctrlr/browserview.cxx | 2
extensions/source/propctrlr/browserview.hxx | 2
extensions/source/propctrlr/fontdialog.cxx | 2
extensions/source/propctrlr/fontdialog.hxx | 2
extensions/source/propctrlr/pcrcommon.cxx | 6
extensions/source/propctrlr/pcrcommon.hxx | 2
extensions/source/propctrlr/propcontroller.cxx | 4
extensions/source/propctrlr/propertyeditor.cxx | 18
extensions/source/propctrlr/propertyeditor.hxx | 12
filter/source/pdf/impdialog.cxx | 22
filter/source/pdf/impdialog.hxx | 2
filter/source/xsltdialog/xmlfiltertabdialog.cxx | 2
formula/source/ui/dlg/FormulaHelper.cxx | 2
formula/source/ui/dlg/formula.cxx | 6
formula/source/ui/dlg/funcpage.cxx | 2
formula/source/ui/dlg/funcpage.hxx | 2
formula/source/ui/dlg/parawin.cxx | 2
fpicker/source/office/OfficeControlAccess.cxx | 14
fpicker/source/office/PlacesListBox.hxx | 2
fpicker/source/office/RemoteFilesDialog.cxx | 8
fpicker/source/office/RemoteFilesDialog.hxx | 2
fpicker/source/office/fileview.cxx | 18
fpicker/source/office/fileview.hxx | 4
fpicker/source/office/fpdialogbase.hxx | 2
fpicker/source/office/iodlg.cxx | 4
fpicker/source/office/iodlgimp.cxx | 4
fpicker/source/office/iodlgimp.hxx | 6
framework/inc/uielement/toolbarmanager.hxx | 2
framework/source/fwe/classes/addonmenu.cxx | 10
framework/source/helper/persistentwindowstate.cxx | 8
framework/source/layoutmanager/helpers.cxx | 2
framework/source/loadenv/loadenv.cxx | 2
framework/source/uielement/edittoolbarcontroller.cxx | 2
framework/source/uielement/generictoolbarcontroller.cxx | 20
framework/source/uielement/menubarmerger.cxx | 4
framework/source/uielement/subtoolbarcontroller.cxx | 2
framework/source/uielement/toolbarmanager.cxx | 46
include/avmedia/MediaControlBase.hxx | 2
include/formula/IFunctionDescription.hxx | 2
include/sfx2/basedlgs.hxx | 8
include/sfx2/charwin.hxx | 2
include/sfx2/childwin.hxx | 2
include/sfx2/devtools/DevelopmentToolDockingWindow.hxx | 2
include/sfx2/devtools/ObjectInspectorTreeHandler.hxx | 6
include/sfx2/dinfdlg.hxx | 2
include/sfx2/dockwin.hxx | 2
include/sfx2/infobar.hxx | 2
include/sfx2/msg.hxx | 28
include/sfx2/passwd.hxx | 4
include/sfx2/sfxdlg.hxx | 2
include/sfx2/sidebar/PanelLayout.hxx | 2
include/sfx2/sidebar/SidebarController.hxx | 4
include/sfx2/sidebar/TabBar.hxx | 2
include/sfx2/styledlg.hxx | 2
include/sfx2/tabdlg.hxx | 50
include/sfx2/templatedlg.hxx | 4
include/sfx2/templatedlglocalview.hxx | 2
include/sfx2/templatelocalview.hxx | 2
include/sfx2/weldutils.hxx | 4
include/svtools/editbrowsebox.hxx | 2
include/svtools/helpids.h | 44
include/svtools/inettbc.hxx | 2
include/svtools/recorditemwindow.hxx | 2
include/svtools/toolbarmenu.hxx | 2
include/svx/SvxPresetListBox.hxx | 2
include/svx/charmap.hxx | 2
include/svx/colorbox.hxx | 2
include/svx/colorwindow.hxx | 4
include/svx/ctredlin.hxx | 6
include/svx/dlgctrl.hxx | 2
include/svx/fmgridcl.hxx | 2
include/svx/fontwork.hxx | 12
include/svx/gridctrl.hxx | 2
include/svx/imapdlg.hxx | 4
include/svx/ruler.hxx | 4
include/svx/sidebar/AreaPropertyPanelBase.hxx | 2
include/svx/sidebar/AreaTransparencyGradientPopup.hxx | 4
include/svx/sidebar/LinePropertyPanelBase.hxx | 2
include/svx/svxdlg.hxx | 6
include/test/screenshot_test.hxx | 2
include/unotools/viewoptions.hxx | 4
include/vcl/InterimItemWindow.hxx | 2
include/vcl/abstdlg.hxx | 6
include/vcl/builder.hxx | 110 -
include/vcl/builderpage.hxx | 6
include/vcl/customweld.hxx | 6
include/vcl/dockwin.hxx | 4
include/vcl/fieldvalues.hxx | 2
include/vcl/jsdialog/executor.hxx | 14
include/vcl/layout.hxx | 12
include/vcl/menu.hxx | 26
include/vcl/notebookbar/NotebookBarAddonsMerger.hxx | 2
include/vcl/notebookbar/notebookbar.hxx | 2
include/vcl/roadmapwizard.hxx | 4
include/vcl/status.hxx | 2
include/vcl/syswin.hxx | 6
include/vcl/tabctrl.hxx | 8
include/vcl/toolbox.hxx | 4
include/vcl/toolkit/button.hxx | 8
include/vcl/toolkit/combobox.hxx | 2
include/vcl/toolkit/dialog.hxx | 4
include/vcl/toolkit/edit.hxx | 2
include/vcl/toolkit/field.hxx | 2
include/vcl/toolkit/fixed.hxx | 4
include/vcl/toolkit/fixedhyper.hxx | 2
include/vcl/toolkit/floatwin.hxx | 2
include/vcl/toolkit/fmtfield.hxx | 2
include/vcl/toolkit/lstbox.hxx | 2
include/vcl/toolkit/menubtn.hxx | 4
include/vcl/toolkit/treelistbox.hxx | 2
include/vcl/toolkit/vclmedit.hxx | 2
include/vcl/weld.hxx | 274 +-
include/vcl/window.hxx | 8
include/vcl/windowstate.hxx | 4
include/vcl/wizardmachine.hxx | 6
reportdesign/inc/helpids.h | 96
reportdesign/source/ui/dlg/AddField.cxx | 6
reportdesign/source/ui/dlg/Condition.cxx | 18
reportdesign/source/ui/dlg/Condition.hxx | 4
reportdesign/source/ui/dlg/Formula.cxx | 4
reportdesign/source/ui/dlg/GroupsSorting.cxx | 2
reportdesign/source/ui/dlg/Navigator.cxx | 18
reportdesign/source/ui/dlg/dlgpage.cxx | 4
reportdesign/source/ui/inc/AddField.hxx | 2
reportdesign/source/ui/inc/FunctionHelper.hxx | 2
reportdesign/source/ui/inc/GroupsSorting.hxx | 2
reportdesign/source/ui/inc/dlgpage.hxx | 2
reportdesign/source/ui/inc/metadata.hxx | 4
reportdesign/source/ui/inspection/DefaultInspection.cxx | 9
reportdesign/source/ui/inspection/metadata.cxx | 10
reportdesign/source/ui/misc/FunctionHelper.cxx | 4
reportdesign/source/ui/report/DesignView.cxx | 12
reportdesign/source/ui/report/ReportController.cxx | 8
sc/inc/addincol.hxx | 6
sc/inc/funcdesc.hxx | 4
sc/inc/helpids.h | 1090
+++++-----
sc/inc/scabstdlg.hxx | 12
sc/source/core/data/funcdesc.cxx | 4
sc/source/core/inc/addinhelpid.hxx | 2
sc/source/core/tool/addincol.cxx | 6
sc/source/core/tool/addinhelpid.cxx | 8
sc/source/filter/oox/workbookfragment.cxx | 2
sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx | 2
sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx | 2
sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx | 2
sc/source/ui/app/inputhdl.cxx | 2
sc/source/ui/app/inputwin.cxx | 24
sc/source/ui/attrdlg/attrdlg.cxx | 2
sc/source/ui/attrdlg/scdlgfact.cxx | 48
sc/source/ui/attrdlg/scdlgfact.hxx | 48
sc/source/ui/cctrl/checklistmenu.cxx | 2
sc/source/ui/condformat/condformatdlgentry.cxx | 2
sc/source/ui/condformat/condformatmgr.cxx | 6
sc/source/ui/dbgui/csvgrid.cxx | 2
sc/source/ui/dbgui/sortkeydlg.cxx | 2
sc/source/ui/dbgui/tpsubt.cxx | 4
sc/source/ui/docshell/docsh.cxx | 2
sc/source/ui/drawfunc/fuins2.cxx | 2
sc/source/ui/inc/MatrixComparisonGenerator.hxx | 2
sc/source/ui/inc/StatisticsInputOutputDialog.hxx | 2
sc/source/ui/inc/StatisticsTwoVariableDialog.hxx | 2
sc/source/ui/inc/anyrefdg.hxx | 6
sc/source/ui/inc/attrdlg.hxx | 2
sc/source/ui/inc/gototabdlg.hxx | 4
sc/source/ui/inc/hfedtdlg.hxx | 4
sc/source/ui/inc/inputwin.hxx | 2
sc/source/ui/inc/mtrindlg.hxx | 2
sc/source/ui/inc/navipi.hxx | 6
sc/source/ui/inc/scuitphfedit.hxx | 2
sc/source/ui/inc/shtabdlg.hxx | 2
sc/source/ui/inc/strindlg.hxx | 2
sc/source/ui/inc/styledlg.hxx | 4
sc/source/ui/inc/tabvwsh.hxx | 2
sc/source/ui/inc/textdlgs.hxx | 4
sc/source/ui/inc/validate.hxx | 2
sc/source/ui/miscdlgs/acredlin.cxx | 4
sc/source/ui/miscdlgs/gototabdlg.cxx | 4
sc/source/ui/miscdlgs/groupdlg.cxx | 4
sc/source/ui/miscdlgs/mtrindlg.cxx | 5
sc/source/ui/miscdlgs/shtabdlg.cxx | 2
sc/source/ui/miscdlgs/strindlg.cxx | 2
sc/source/ui/miscdlgs/textdlgs.cxx | 4
sc/source/ui/navipi/content.cxx | 4
sc/source/ui/navipi/navipi.cxx | 12
sc/source/ui/navipi/scenwnd.cxx | 2
sc/source/ui/pagedlg/hfedtdlg.cxx | 4
sc/source/ui/pagedlg/scuitphfedit.cxx | 2
sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx | 12
sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx | 8
sc/source/ui/sidebar/CellBorderStyleControl.cxx | 8
sc/source/ui/sidebar/CellBorderStyleControl.hxx | 8
sc/source/ui/sidebar/CellLineStyleControl.cxx | 2
sc/source/ui/sidebar/CellLineStyleControl.hxx | 2
sc/source/ui/styleui/styledlg.cxx | 8
sc/source/ui/view/tabcont.cxx | 4
sc/source/ui/view/tabvwsha.cxx | 2
sc/source/ui/view/tabvwshf.cxx | 2
sd/inc/helpids.h | 60
sd/inc/sdabstdlg.hxx | 2
sd/inc/sdcommands.h | 6
sd/source/filter/html/pubdlg.cxx | 2
sd/source/ui/animations/CustomAnimationDialog.cxx | 24
sd/source/ui/animations/CustomAnimationDialog.hxx | 2
sd/source/ui/animations/CustomAnimationList.cxx | 4
sd/source/ui/animations/CustomAnimationPane.cxx | 4
sd/source/ui/annotations/annotationwindow.cxx | 2
sd/source/ui/annotations/annotationwindow.hxx | 2
sd/source/ui/app/scalectrl.cxx | 2
sd/source/ui/app/sdpopup.cxx | 20
sd/source/ui/app/tmplctrl.cxx | 2
sd/source/ui/dlg/BulletAndPositionDlg.cxx | 4
sd/source/ui/dlg/PaneShells.cxx | 4
sd/source/ui/dlg/animobjs.cxx | 2
sd/source/ui/dlg/copydlg.cxx | 4
sd/source/ui/dlg/dlgchar.cxx | 2
sd/source/ui/dlg/dlgolbul.cxx | 2
sd/source/ui/dlg/dlgpage.cxx | 2
sd/source/ui/dlg/headerfooterdlg.cxx | 6
sd/source/ui/dlg/navigatr.cxx | 20
sd/source/ui/dlg/paragr.cxx | 2
sd/source/ui/dlg/prltempl.cxx | 2
sd/source/ui/dlg/sddlgfact.cxx | 44
sd/source/ui/dlg/sddlgfact.hxx | 44
sd/source/ui/dlg/tabtempl.cxx | 2
sd/source/ui/func/fuinsert.cxx | 2
sd/source/ui/inc/BulletAndPositionDlg.hxx | 2
sd/source/ui/inc/CustomAnimationList.hxx | 4
sd/source/ui/inc/CustomAnimationPane.hxx | 4
sd/source/ui/inc/OutlineBulletDlg.hxx | 2
sd/source/ui/inc/TableDesignPane.hxx | 2
sd/source/ui/inc/ViewTabBar.hxx | 2
sd/source/ui/inc/dlg_char.hxx | 2
sd/source/ui/inc/dlgpage.hxx | 2
sd/source/ui/inc/headerfooterdlg.hxx | 2
sd/source/ui/inc/navigatr.hxx | 10
sd/source/ui/inc/paragr.hxx | 2
sd/source/ui/inc/prltempl.hxx | 2
sd/source/ui/inc/tabtempl.hxx | 2
sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx | 2
sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx | 2
sd/source/ui/sidebar/LayoutMenu.cxx | 6
sd/source/ui/sidebar/LayoutMenu.hxx | 2
sd/source/ui/sidebar/MasterPagesSelector.cxx | 8
sd/source/ui/sidebar/MasterPagesSelector.hxx | 6
sd/source/ui/slideshow/slideshowimpl.cxx | 38
sd/source/ui/slideshow/slideshowimpl.hxx | 2
sd/source/ui/table/TableDesignPane.cxx | 28
sd/source/ui/view/ViewTabBar.cxx | 8
sdext/source/minimizer/optimizerdialog.cxx | 2
sfx2/inc/sidebar/PanelTitleBar.hxx | 2
sfx2/inc/sidebar/TitleBar.hxx | 2
sfx2/source/appl/appdispatchprovider.cxx | 2
sfx2/source/appl/appserv.cxx | 4
sfx2/source/appl/appuno.cxx | 12
sfx2/source/appl/childwin.cxx | 4
sfx2/source/appl/newhelp.cxx | 70
sfx2/source/appl/newhelp.hxx | 14
sfx2/source/appl/sfxhelp.cxx | 22
sfx2/source/control/bindings.cxx | 4
sfx2/source/control/charwin.cxx | 6
sfx2/source/control/dispatch.cxx | 2
sfx2/source/control/msg.cxx | 9
sfx2/source/control/objface.cxx | 3
sfx2/source/control/request.cxx | 6
sfx2/source/control/shell.cxx | 24
sfx2/source/control/statcach.cxx | 4
sfx2/source/control/templatedlglocalview.cxx | 16
sfx2/source/control/templatelocalview.cxx | 12
sfx2/source/control/unoctitm.cxx | 6
sfx2/source/devtools/DevelopmentToolDockingWindow.cxx | 3
sfx2/source/devtools/ObjectInspectorTreeHandler.cxx | 8
sfx2/source/dialog/StyleList.cxx | 14
sfx2/source/dialog/backingwindow.cxx | 4
sfx2/source/dialog/backingwindow.hxx | 2
sfx2/source/dialog/basedlgs.cxx | 15
sfx2/source/dialog/dinfdlg.cxx | 10
sfx2/source/dialog/dockwin.cxx | 4
sfx2/source/dialog/filedlghelper.cxx | 4
sfx2/source/dialog/infobar.cxx | 2
sfx2/source/dialog/styledlg.cxx | 4
sfx2/source/dialog/tabdlg.cxx | 73
sfx2/source/dialog/templdlg.cxx | 26
sfx2/source/doc/autoredactdialog.cxx | 9
sfx2/source/doc/new.cxx | 4
sfx2/source/doc/objserv.cxx | 2
sfx2/source/doc/sfxbasemodel.cxx | 5
sfx2/source/doc/templatedlg.cxx | 24
sfx2/source/inc/StyleList.hxx | 6
sfx2/source/inc/helpids.h | 42
sfx2/source/inc/templdgi.hxx | 20
sfx2/source/sidebar/DeckLayouter.cxx | 2
sfx2/source/sidebar/PanelLayout.cxx | 2
sfx2/source/sidebar/PanelTitleBar.cxx | 2
sfx2/source/sidebar/SidebarController.cxx | 20
sfx2/source/sidebar/TabBar.cxx | 6
sfx2/source/sidebar/TitleBar.cxx | 2
sfx2/source/statbar/stbitem.cxx | 2
sfx2/source/toolbox/weldutils.cxx | 21
sfx2/source/view/lokhelper.cxx | 5
sfx2/source/view/sfxbasecontroller.cxx | 2
starmath/inc/dialog.hxx | 4
starmath/inc/helpids.h | 56
starmath/source/dialog.cxx | 37
svtools/source/brwbox/ebbcontrols.cxx | 2
svtools/source/control/scrolladaptor.cxx | 3
svtools/source/control/toolbarmenu.cxx | 2
svtools/source/control/valueset.cxx | 2
svtools/source/dialogs/addresstemplate.cxx | 4
svtools/source/uno/popupwindowcontroller.cxx | 9
svtools/source/uno/wizard/unowizard.cxx | 14
svtools/source/uno/wizard/wizardshell.cxx | 8
svtools/source/uno/wizard/wizardshell.hxx | 4
svx/inc/galbrws2.hxx | 2
svx/inc/helpids.h | 74
svx/inc/tbxcolorupdate.hxx | 4
svx/source/dialog/_bmpmask.cxx | 4
svx/source/dialog/_contdlg.cxx | 24
svx/source/dialog/charmap.cxx | 8
svx/source/dialog/contimp.hxx | 6
svx/source/dialog/ctredlin.cxx | 6
svx/source/dialog/fontwork.cxx | 12
svx/source/dialog/imapdlg.cxx | 30
svx/source/dialog/imapwnd.cxx | 2
svx/source/dialog/imapwnd.hxx | 2
svx/source/dialog/svxruler.cxx | 10
svx/source/fmcomp/fmgridcl.cxx | 18
svx/source/fmcomp/fmgridif.cxx | 2
svx/source/fmcomp/gridctrl.cxx | 2
svx/source/form/datanavi.cxx | 60
svx/source/form/filtnav.cxx | 2
svx/source/form/fmshell.cxx | 2
svx/source/form/fmshimp.cxx | 62
svx/source/form/fmtextcontroldialogs.cxx | 2
svx/source/form/fmtextcontrolshell.cxx | 20
svx/source/form/navigatortree.cxx | 2
svx/source/gallery2/galbrws1.cxx | 22
svx/source/gallery2/galbrws1.hxx | 4
svx/source/gallery2/galbrws2.cxx | 20
svx/source/inc/datanavi.hxx | 24
svx/source/inc/fmshimp.hxx | 10
svx/source/inc/fmtextcontroldialogs.hxx | 2
svx/source/mnuctrls/clipboardctl.cxx | 2
svx/source/sidebar/area/AreaPropertyPanelBase.cxx | 4
svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx | 4
svx/source/sidebar/line/LinePropertyPanelBase.cxx | 4
svx/source/sidebar/media/MediaPlaybackPanel.cxx | 2
svx/source/sidebar/media/MediaPlaybackPanel.hxx | 2
svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx | 6
svx/source/sidebar/possize/PosSizePropertyPanel.cxx | 2
svx/source/sidebar/text/TextCharacterSpacingPopup.cxx | 2
svx/source/sidebar/text/TextUnderlinePopup.cxx | 2
svx/source/stbctrls/pszctrl.cxx | 34
svx/source/stbctrls/selctrl.cxx | 20
svx/source/stbctrls/zoomctrl.cxx | 20
svx/source/tbxctrls/StylesPreviewWindow.cxx | 4
svx/source/tbxctrls/SvxPresetListBox.cxx | 6
svx/source/tbxctrls/bulletsnumbering.cxx | 2
svx/source/tbxctrls/fontworkgallery.cxx | 4
svx/source/tbxctrls/grafctrl.cxx | 2
svx/source/tbxctrls/lboxctrl.cxx | 6
svx/source/tbxctrls/linectrl.cxx | 20
svx/source/tbxctrls/tbcontrl.cxx | 38
svx/source/tbxctrls/tbunocontroller.cxx | 2
svx/source/tbxctrls/tbxcolorupdate.cxx | 4
svx/source/tbxctrls/verttexttbxctrl.cxx | 9
svx/source/toolbars/extrusionbar.cxx | 2
svx/source/toolbars/fontworkbar.cxx | 2
sw/inc/AnnotationWin.hxx | 2
sw/inc/docsh.hxx | 4
sw/inc/helpids.h | 133 -
sw/inc/swabstdlg.hxx | 8
sw/qa/extras/odfimport/odfimport.cxx | 4
sw/source/ui/chrdlg/chardlg.cxx | 2
sw/source/ui/chrdlg/pardlg.cxx | 4
sw/source/ui/dbui/customizeaddresslistdialog.cxx | 2
sw/source/ui/dbui/customizeaddresslistdialog.hxx | 2
sw/source/ui/dbui/mailmergewizard.cxx | 4
sw/source/ui/dbui/mmresultdialogs.cxx | 4
sw/source/ui/dialog/ascfldlg.cxx | 4
sw/source/ui/dialog/swdlgfact.cxx | 14
sw/source/ui/dialog/swdlgfact.hxx | 14
sw/source/ui/dialog/swmessdialog.cxx | 2
sw/source/ui/dialog/uiregionsw.cxx | 4
sw/source/ui/envelp/envfmt.cxx | 10
sw/source/ui/envelp/envfmt.hxx | 6
sw/source/ui/envelp/envlop1.cxx | 2
sw/source/ui/envelp/label1.cxx | 2
sw/source/ui/fldui/fldpage.cxx | 2
sw/source/ui/fldui/fldpage.hxx | 2
sw/source/ui/fldui/fldtdlg.cxx | 28
sw/source/ui/fmtui/tmpdlg.cxx | 6
sw/source/ui/frmdlg/frmdlg.cxx | 6
sw/source/ui/index/cnttab.cxx | 4
sw/source/ui/index/swuiidxmrk.cxx | 4
sw/source/ui/misc/bookmark.cxx | 6
sw/source/ui/misc/docfnote.cxx | 8
sw/source/ui/misc/glossary.cxx | 2
sw/source/ui/misc/num.cxx | 2
sw/source/ui/misc/outline.cxx | 10
sw/source/ui/misc/swmodalredlineacceptdlg.cxx | 4
sw/source/ui/table/tabledlg.cxx | 2
sw/source/uibase/app/docst.cxx | 8
sw/source/uibase/docvw/AnnotationMenuButton.cxx | 2
sw/source/uibase/docvw/FrameControlsManager.cxx | 2
sw/source/uibase/docvw/HeaderFooterWin.cxx | 16
sw/source/uibase/docvw/PageBreakWin.cxx | 8
sw/source/uibase/docvw/romenu.cxx | 46
sw/source/uibase/inc/FrameControl.hxx | 2
sw/source/uibase/inc/HeaderFooterWin.hxx | 4
sw/source/uibase/inc/PageBreakWin.hxx | 4
sw/source/uibase/inc/chrdlg.hxx | 2
sw/source/uibase/inc/condedit.hxx | 4
sw/source/uibase/inc/conttree.hxx | 10
sw/source/uibase/inc/docfnote.hxx | 2
sw/source/uibase/inc/envlop.hxx | 2
sw/source/uibase/inc/fldtdlg.hxx | 6
sw/source/uibase/inc/frmdlg.hxx | 4
sw/source/uibase/inc/glossary.hxx | 2
sw/source/uibase/inc/inputwin.hxx | 2
sw/source/uibase/inc/label.hxx | 2
sw/source/uibase/inc/navipi.hxx | 14
sw/source/uibase/inc/num.hxx | 2
sw/source/uibase/inc/numfmtlb.hxx | 8
sw/source/uibase/inc/outline.hxx | 4
sw/source/uibase/inc/regionsw.hxx | 4
sw/source/uibase/inc/swmessdialog.hxx | 2
sw/source/uibase/inc/swuicnttab.hxx | 4
sw/source/uibase/inc/swuipardlg.hxx | 4
sw/source/uibase/inc/tabledlg.hxx | 2
sw/source/uibase/inc/tmpdlg.hxx | 4
sw/source/uibase/inc/unotools.hxx | 2
sw/source/uibase/lingu/olmenu.cxx | 72
sw/source/uibase/misc/redlndlg.cxx | 4
sw/source/uibase/ribbar/inputwin.cxx | 4
sw/source/uibase/ribbar/workctrl.cxx | 4
sw/source/uibase/shells/annotsh.cxx | 2
sw/source/uibase/shells/basesh.cxx | 4
sw/source/uibase/shells/drwtxtex.cxx | 2
sw/source/uibase/shells/frmsh.cxx | 4
sw/source/uibase/shells/tabsh.cxx | 2
sw/source/uibase/shells/textsh1.cxx | 6
sw/source/uibase/shells/txtnum.cxx | 2
sw/source/uibase/uitest/uiobject.cxx | 2
sw/source/uibase/uno/unomod.cxx | 4
sw/source/uibase/utlui/bookctrl.cxx | 2
sw/source/uibase/utlui/content.cxx | 108
sw/source/uibase/utlui/glbltree.cxx | 42
sw/source/uibase/utlui/navipi.cxx | 18
sw/source/uibase/utlui/tmplctrl.cxx | 2
sw/source/uibase/utlui/unotools.cxx | 8
sw/source/uibase/wrtsh/wrtsh1.cxx | 4
test/source/screenshot_test.cxx | 20
toolkit/source/awt/vclxmenu.cxx | 4
toolkit/source/awt/vclxwindow.cxx | 9
toolkit/source/awt/vclxwindows.cxx | 2
unotools/source/config/viewoptions.cxx | 8
uui/source/logindlg.cxx | 4
vcl/inc/jsdialog/jsdialogbuilder.hxx | 120 -
vcl/inc/messagedialog.hxx | 2
vcl/inc/salvtables.hxx | 218 +-
vcl/inc/toolbox.h | 2
vcl/inc/unx/gtk/gtkdata.hxx | 6
vcl/inc/verticaltabctrl.hxx | 22
vcl/inc/window.h | 2
vcl/inc/wizdlg.hxx | 2
vcl/jsdialog/executor.cxx | 19
vcl/jsdialog/jsdialogbuilder.cxx | 165 -
vcl/source/app/customweld.cxx | 2
vcl/source/app/salvtables.cxx | 315 +-
vcl/source/app/svdata.cxx | 5
vcl/source/app/weldutils.cxx | 10
vcl/source/control/InterimItemWindow.cxx | 2
vcl/source/control/button.cxx | 8
vcl/source/control/combobox.cxx | 2
vcl/source/control/edit.cxx | 36
vcl/source/control/field.cxx | 2
vcl/source/control/fixed.cxx | 4
vcl/source/control/fixedhyper.cxx | 2
vcl/source/control/fmtfield.cxx | 2
vcl/source/control/ivctrl.cxx | 24
vcl/source/control/listbox.cxx | 2
vcl/source/control/notebookbar.cxx | 4
vcl/source/control/roadmapwizard.cxx | 12
vcl/source/control/tabctrl.cxx | 16
vcl/source/control/wizardmachine.cxx | 12
vcl/source/edit/vclmedit.cxx | 18
vcl/source/treelist/treelistbox.cxx | 2
vcl/source/uitest/uiobject.cxx | 6
vcl/source/window/NotebookBarAddonsMerger.cxx | 2
vcl/source/window/abstdlg.cxx | 6
vcl/source/window/builder.cxx | 373 +--
vcl/source/window/dialog.cxx | 8
vcl/source/window/dockwin.cxx | 6
vcl/source/window/floatwin.cxx | 2
vcl/source/window/layout.cxx | 14
vcl/source/window/menu.cxx | 32
vcl/source/window/menuitemlist.cxx | 4
vcl/source/window/menuitemlist.hxx | 8
vcl/source/window/menuwindow.cxx | 4
vcl/source/window/printdlg.cxx | 18
vcl/source/window/status.cxx | 6
vcl/source/window/syswin.cxx | 18
vcl/source/window/toolbox.cxx | 4
vcl/source/window/toolbox2.cxx | 2
vcl/source/window/window.cxx | 4
vcl/source/window/window2.cxx | 10
vcl/unx/generic/print/prtsetup.cxx | 2
vcl/unx/generic/print/prtsetup.hxx | 2
vcl/unx/gtk3/gtkdata.cxx | 36
vcl/unx/gtk3/gtkinst.cxx | 479 ++--
vcl/unx/gtk3/gtksalmenu.cxx | 4
vcl/unx/gtk4/convert3to4.cxx | 4
xmlsecurity/inc/certificateviewer.hxx | 4
xmlsecurity/inc/macrosecurity.hxx | 4
xmlsecurity/source/dialogs/certificateviewer.cxx | 4
xmlsecurity/source/dialogs/macrosecurity.cxx | 4
678 files changed, 4144 insertions(+), 4250 deletions(-)
New commits:
commit 116b9d6ddf2b61186b29f0370234eec9c1bbe306
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Sun Apr 2 01:18:42 2023 +0300
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Sun Apr 2 18:46:47 2023 +0200
Avoid conversions between OUString and OString in VCL
Standardize on OUString, which is the main internal string class.
Convert from/to OUString only when communicating with respective
external APIs.
Removes about 200 conversions from the code.
Change-Id: I96ecee7c6fd271bb76639220e96d69d2964bed26
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149930
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/avmedia/inc/helpids.h b/avmedia/inc/helpids.h
index 1f9a4c305e1d..f49f12fb3e00 100644
--- a/avmedia/inc/helpids.h
+++ b/avmedia/inc/helpids.h
@@ -19,18 +19,18 @@
#pragma once
-#include <rtl/string.hxx>
+#include <rtl/ustring.hxx>
-inline constexpr OStringLiteral HID_AVMEDIA_TOOLBOXITEM_PLAY
= "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_PLAY";
-inline constexpr OStringLiteral HID_AVMEDIA_TOOLBOXITEM_PAUSE
= "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_PAUSE";
-inline constexpr OStringLiteral HID_AVMEDIA_TOOLBOXITEM_STOP
= "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_STOP";
-inline constexpr OStringLiteral HID_AVMEDIA_TOOLBOXITEM_MUTE
= "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_MUTE";
-inline constexpr OStringLiteral HID_AVMEDIA_TOOLBOXITEM_LOOP
= "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_LOOP";
-inline constexpr OStringLiteral HID_AVMEDIA_TOOLBOXITEM_OPEN
= "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_OPEN";
-inline constexpr OStringLiteral HID_AVMEDIA_TOOLBOXITEM_INSERT
= "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_INSERT";
-inline constexpr OStringLiteral HID_AVMEDIA_ZOOMLISTBOX
= "AVMEDIA_HID_AVMEDIA_ZOOMLISTBOX";
-inline constexpr OStringLiteral HID_AVMEDIA_TIMEEDIT
= "AVMEDIA_HID_AVMEDIA_TIMEEDIT";
-inline constexpr OStringLiteral HID_AVMEDIA_VOLUMESLIDER
= "AVMEDIA_HID_AVMEDIA_VOLUMESLIDER";
-inline constexpr OStringLiteral HID_AVMEDIA_PLAYERWINDOW
= "AVMEDIA_HID_AVMEDIA_PLAYERWINDOW";
+inline constexpr OUStringLiteral HID_AVMEDIA_TOOLBOXITEM_PLAY =
u"AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_PLAY";
+inline constexpr OUStringLiteral HID_AVMEDIA_TOOLBOXITEM_PAUSE =
u"AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_PAUSE";
+inline constexpr OUStringLiteral HID_AVMEDIA_TOOLBOXITEM_STOP =
u"AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_STOP";
+inline constexpr OUStringLiteral HID_AVMEDIA_TOOLBOXITEM_MUTE =
u"AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_MUTE";
+inline constexpr OUStringLiteral HID_AVMEDIA_TOOLBOXITEM_LOOP =
u"AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_LOOP";
+inline constexpr OUStringLiteral HID_AVMEDIA_TOOLBOXITEM_OPEN =
u"AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_OPEN";
+inline constexpr OUStringLiteral HID_AVMEDIA_TOOLBOXITEM_INSERT =
u"AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_INSERT";
+inline constexpr OUStringLiteral HID_AVMEDIA_ZOOMLISTBOX =
u"AVMEDIA_HID_AVMEDIA_ZOOMLISTBOX";
+inline constexpr OUStringLiteral HID_AVMEDIA_TIMEEDIT =
u"AVMEDIA_HID_AVMEDIA_TIMEEDIT";
+inline constexpr OUStringLiteral HID_AVMEDIA_VOLUMESLIDER =
u"AVMEDIA_HID_AVMEDIA_VOLUMESLIDER";
+inline constexpr OUStringLiteral HID_AVMEDIA_PLAYERWINDOW =
u"AVMEDIA_HID_AVMEDIA_PLAYERWINDOW";
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/inc/mediacontrol.hxx b/avmedia/inc/mediacontrol.hxx
index 6b004626ff83..f168ef566807 100644
--- a/avmedia/inc/mediacontrol.hxx
+++ b/avmedia/inc/mediacontrol.hxx
@@ -57,7 +57,7 @@ private:
DECL_LINK(implTimeHdl, weld::Scale&, void);
DECL_LINK(implTimeEndHdl, Timer*, void);
DECL_LINK(implVolumeHdl, weld::Scale&, void);
- DECL_LINK(implSelectHdl, const OString&, void);
+ DECL_LINK(implSelectHdl, const OUString&, void);
DECL_LINK(implZoomSelectHdl, weld::ComboBox&, void);
DECL_LINK(implTimeoutHdl, Timer*, void);
diff --git a/avmedia/source/framework/MediaControlBase.cxx
b/avmedia/source/framework/MediaControlBase.cxx
index 534c27c2c33c..d2c254293811 100644
--- a/avmedia/source/framework/MediaControlBase.cxx
+++ b/avmedia/source/framework/MediaControlBase.cxx
@@ -209,16 +209,16 @@ void MediaControlBase::UpdateToolBoxes(const MediaItem&
rMediaItem)
}
}
-void MediaControlBase::SelectPlayToolBoxItem( MediaItem& aExecItem, MediaItem
const & aItem, std::string_view rId)
+void MediaControlBase::SelectPlayToolBoxItem( MediaItem& aExecItem, MediaItem
const & aItem, std::u16string_view rId)
{
- if (rId == "apply")
+ if (rId == u"apply")
{
MediaFloater* pFloater = avmedia::getMediaFloater();
if( pFloater )
pFloater->dispatchCurrentURL();
}
- else if (rId == "play")
+ else if (rId == u"play")
{
aExecItem.setState( MediaState::Play );
@@ -229,24 +229,24 @@ void MediaControlBase::SelectPlayToolBoxItem( MediaItem&
aExecItem, MediaItem co
UpdatePlayState(aExecItem);
}
- else if (rId == "pause")
+ else if (rId == u"pause")
{
aExecItem.setState( MediaState::Pause );
UpdatePlayState(aExecItem);
}
- else if (rId == "stop")
+ else if (rId == u"stop")
{
aExecItem.setState( MediaState::Stop );
aExecItem.setTime( 0.0 );
UpdatePlayState(aExecItem);
}
- else if (rId == "mute")
+ else if (rId == u"mute")
{
aExecItem.setMute( mxMuteToolBox->get_item_active("mute") );
}
- else if (rId == "loop")
+ else if (rId == u"loop")
{
aExecItem.setLoop( mxPlayToolBox->get_item_active("loop") );
}
diff --git a/avmedia/source/framework/mediacontrol.cxx
b/avmedia/source/framework/mediacontrol.cxx
index 23d700595f95..a9c33ff45455 100644
--- a/avmedia/source/framework/mediacontrol.cxx
+++ b/avmedia/source/framework/mediacontrol.cxx
@@ -156,7 +156,7 @@ IMPL_LINK( MediaControl, implVolumeHdl, weld::Scale&,
rSlider, void )
update();
}
-IMPL_LINK( MediaControl, implSelectHdl, const OString&, rIdent, void )
+IMPL_LINK( MediaControl, implSelectHdl, const OUString&, rIdent, void )
{
MediaItem aExecItem;
if (rIdent == "open")
diff --git a/basctl/inc/helpids.h b/basctl/inc/helpids.h
index 28b855ffb602..e34d054ed899 100644
--- a/basctl/inc/helpids.h
+++ b/basctl/inc/helpids.h
@@ -18,22 +18,22 @@
*/
#pragma once
-#include <rtl/string.hxx>
+#include <rtl/ustring.hxx>
-inline constexpr OStringLiteral HID_BASICIDE_OBJECTCAT =
"BASCTL_HID_BASICIDE_OBJECTCAT";
+inline constexpr OUStringLiteral HID_BASICIDE_OBJECTCAT =
u"BASCTL_HID_BASICIDE_OBJECTCAT";
-inline constexpr OStringLiteral HID_BASICIDE_REMOVEWATCH =
"BASCTL_HID_BASICIDE_REMOVEWATCH";
+inline constexpr OUStringLiteral HID_BASICIDE_REMOVEWATCH =
u"BASCTL_HID_BASICIDE_REMOVEWATCH";
-inline constexpr OStringLiteral HID_BASICIDE_MODULWINDOW =
"BASCTL_HID_BASICIDE_MODULWINDOW";
-inline constexpr OStringLiteral HID_BASICIDE_DIALOGWINDOW =
"BASCTL_HID_BASICIDE_DIALOGWINDOW";
+inline constexpr OUStringLiteral HID_BASICIDE_MODULWINDOW =
u"BASCTL_HID_BASICIDE_MODULWINDOW";
+inline constexpr OUStringLiteral HID_BASICIDE_DIALOGWINDOW =
u"BASCTL_HID_BASICIDE_DIALOGWINDOW";
-inline constexpr OStringLiteral HID_BASICIDE_EDITORWINDOW =
"BASCTL_HID_BASICIDE_EDITORWINDOW";
-inline constexpr OStringLiteral HID_BASICIDE_BREAKPOINTWINDOW =
"BASCTL_HID_BASICIDE_BREAKPOINTWINDOW";
-inline constexpr OStringLiteral HID_BASICIDE_WATCHWINDOW =
"BASCTL_HID_BASICIDE_WATCHWINDOW";
-inline constexpr OStringLiteral HID_BASICIDE_STACKWINDOW =
"BASCTL_HID_BASICIDE_STACKWINDOW";
-inline constexpr OStringLiteral HID_BASICIDE_TABBAR =
"BASCTL_HID_BASICIDE_TABBAR";
-inline constexpr OStringLiteral HID_BASICIDE_WATCHWINDOW_EDIT =
"BASCTL_HID_BASICIDE_WATCHWINDOW_EDIT";
-inline constexpr OStringLiteral HID_BASICIDE_WATCHWINDOW_LIST =
"BASCTL_HID_BASICIDE_WATCHWINDOW_LIST";
-inline constexpr OStringLiteral HID_BASICIDE_STACKWINDOW_LIST =
"BASCTL_HID_BASICIDE_STACKWINDOW_LIST";
+inline constexpr OUStringLiteral HID_BASICIDE_EDITORWINDOW =
u"BASCTL_HID_BASICIDE_EDITORWINDOW";
+inline constexpr OUStringLiteral HID_BASICIDE_BREAKPOINTWINDOW =
u"BASCTL_HID_BASICIDE_BREAKPOINTWINDOW";
+inline constexpr OUStringLiteral HID_BASICIDE_WATCHWINDOW =
u"BASCTL_HID_BASICIDE_WATCHWINDOW";
+inline constexpr OUStringLiteral HID_BASICIDE_STACKWINDOW =
u"BASCTL_HID_BASICIDE_STACKWINDOW";
+inline constexpr OUStringLiteral HID_BASICIDE_TABBAR =
u"BASCTL_HID_BASICIDE_TABBAR";
+inline constexpr OUStringLiteral HID_BASICIDE_WATCHWINDOW_EDIT =
u"BASCTL_HID_BASICIDE_WATCHWINDOW_EDIT";
+inline constexpr OUStringLiteral HID_BASICIDE_WATCHWINDOW_LIST =
u"BASCTL_HID_BASICIDE_WATCHWINDOW_LIST";
+inline constexpr OUStringLiteral HID_BASICIDE_STACKWINDOW_LIST =
u"BASCTL_HID_BASICIDE_STACKWINDOW_LIST";
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/baside2.cxx
b/basctl/source/basicide/baside2.cxx
index 12a78d9b65f4..5384eb70fa89 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -1400,7 +1400,7 @@ void ModulWindow::OnNewDocument ()
m_aXEditorWindow->SetLineNumberDisplay(bLineNumbers);
}
-OString ModulWindow::GetHid () const
+OUString ModulWindow::GetHid () const
{
return HID_BASICIDE_MODULWINDOW;
}
diff --git a/basctl/source/basicide/baside2.hxx
b/basctl/source/basicide/baside2.hxx
index 2c9bc3f9930f..116dab2bb905 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -387,7 +387,7 @@ public:
virtual void Deactivating () override;
virtual void OnNewDocument () override;
- virtual OString GetHid () const override;
+ virtual OUString GetHid () const override;
virtual ItemType GetType () const override;
virtual bool HasActiveEditor () const override;
diff --git a/basctl/source/basicide/baside2b.cxx
b/basctl/source/basicide/baside2b.cxx
index 6e4208747f4a..4819de623900 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -1555,7 +1555,7 @@ void BreakPointWindow::Command( const CommandEvent& rCEvt
)
// test if break point is enabled...
std::unique_ptr<weld::Menu> xBrkPropMenu =
xUIBuilder->weld_menu("breakmenu");
xBrkPropMenu->set_active("active", pBrk->bEnabled);
- OString sCommand = xBrkPropMenu->popup_at_rect(pPopupParent, aRect);
+ OUString sCommand = xBrkPropMenu->popup_at_rect(pPopupParent, aRect);
if (sCommand == "active")
{
pBrk->bEnabled = !pBrk->bEnabled;
@@ -1573,7 +1573,7 @@ void BreakPointWindow::Command( const CommandEvent& rCEvt
)
else
{
std::unique_ptr<weld::Menu> xBrkListMenu =
xUIBuilder->weld_menu("breaklistmenu");
- OString sCommand = xBrkListMenu->popup_at_rect(pPopupParent, aRect);
+ OUString sCommand = xBrkListMenu->popup_at_rect(pPopupParent, aRect);
if (sCommand == "manage")
{
BreakPointDialog aBrkDlg(pPopupParent, GetBreakPoints());
diff --git a/basctl/source/basicide/baside3.cxx
b/basctl/source/basicide/baside3.cxx
index 309caa0357c9..4e51cd4ed760 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -1242,7 +1242,7 @@ css::uno::Reference< css::accessibility::XAccessible >
DialogWindow::CreateAcces
return new AccessibleDialogWindow(this);
}
-OString DialogWindow::GetHid () const
+OUString DialogWindow::GetHid () const
{
return HID_BASICIDE_DIALOGWINDOW;
}
diff --git a/basctl/source/basicide/bastypes.cxx
b/basctl/source/basicide/bastypes.cxx
index 5fd607108dc1..bbd71ad08ce0 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -313,7 +313,7 @@ WinBits const DockingWindow::StyleBits =
WB_BORDER | WB_3DLOOK | WB_CLIPCHILDREN |
WB_MOVEABLE | WB_SIZEABLE | WB_DOCKABLE;
-DockingWindow::DockingWindow(vcl::Window* pParent, const OUString&
rUIXMLDescription, const OString& rID)
+DockingWindow::DockingWindow(vcl::Window* pParent, const OUString&
rUIXMLDescription, const OUString& rID)
: ResizableDockingWindow(pParent)
, m_xBuilder(Application::CreateInterimBuilder(m_xBox.get(),
rUIXMLDescription, true))
, pLayout(nullptr)
diff --git a/basctl/source/basicide/macrodlg.cxx
b/basctl/source/basicide/macrodlg.cxx
index e2511ee53b6b..6b4afb79f772 100644
--- a/basctl/source/basicide/macrodlg.cxx
+++ b/basctl/source/basicide/macrodlg.cxx
@@ -791,7 +791,7 @@ IMPL_LINK(MacroChooser, ContextMenuHdl, const
CommandEvent&, rCEvt, bool)
xDropMenu->set_active("alphabetically", m_xMacroBox->get_sort_order());
xDropMenu->set_active("properorder", !m_xMacroBox->get_sort_order());
- OString sCommand(xPopup->popup_at_rect(m_xMacroBox.get(),
tools::Rectangle(rCEvt.GetMousePosPixel(), Size(1,1))));
+ OUString sCommand(xPopup->popup_at_rect(m_xMacroBox.get(),
tools::Rectangle(rCEvt.GetMousePosPixel(), Size(1,1))));
if (sCommand == "alphabetically")
{
m_xMacroBox->make_sorted();
diff --git a/basctl/source/basicide/moduldlg.cxx
b/basctl/source/basicide/moduldlg.cxx
index 617d80e7f033..4b67e320b5ac 100644
--- a/basctl/source/basicide/moduldlg.cxx
+++ b/basctl/source/basicide/moduldlg.cxx
@@ -211,7 +211,7 @@ OrganizeDialog::OrganizeDialog(weld::Window* pParent, const
css::uno::Reference<
SetCurrentEntry(xDocFrame);
- OString sPage;
+ OUString sPage;
if (tabId == 0)
sPage = "modules";
else if (tabId == 1)
@@ -225,7 +225,7 @@ OrganizeDialog::OrganizeDialog(weld::Window* pParent, const
css::uno::Reference<
pDispatcher->Execute( SID_BASICIDE_STOREALLMODULESOURCES );
}
-IMPL_LINK(OrganizeDialog, ActivatePageHdl, const OString&, rPage, void)
+IMPL_LINK(OrganizeDialog, ActivatePageHdl, const OUString&, rPage, void)
{
if (rPage == "modules")
m_xModulePage->ActivatePage();
@@ -239,7 +239,7 @@ OrganizeDialog::~OrganizeDialog()
{
}
-OrganizePage::OrganizePage(weld::Container* pParent, const OUString& rUIFile,
const OString &rName, OrganizeDialog* pDialog)
+OrganizePage::OrganizePage(weld::Container* pParent, const OUString& rUIFile,
const OUString &rName, OrganizeDialog* pDialog)
: m_pDialog(pDialog)
, m_xBuilder(Application::CreateBuilder(pParent, rUIFile))
, m_xContainer(m_xBuilder->weld_container(rName))
@@ -563,8 +563,8 @@ public:
};
// ObjectPage
-ObjectPage::ObjectPage(weld::Container* pParent, const OString &rName,
BrowseMode nMode, OrganizeDialog* pDialog)
- : OrganizePage(pParent, "modules/BasicIDE/ui/" + OStringToOUString(rName,
RTL_TEXTENCODING_UTF8).toAsciiLowerCase() + ".ui",
+ObjectPage::ObjectPage(weld::Container* pParent, const OUString &rName,
BrowseMode nMode, OrganizeDialog* pDialog)
+ : OrganizePage(pParent, "modules/BasicIDE/ui/" + rName.toAsciiLowerCase()
+ ".ui",
rName, pDialog)
, m_xBasicBox(new SbTreeListBox(m_xBuilder->weld_tree_view("library"),
pDialog->getDialog()))
, m_xEditButton(m_xBuilder->weld_button("edit"))
diff --git a/basctl/source/basicide/moduldlg.hxx
b/basctl/source/basicide/moduldlg.hxx
index 37e8567b5e6c..4f4cbcbda3ad 100644
--- a/basctl/source/basicide/moduldlg.hxx
+++ b/basctl/source/basicide/moduldlg.hxx
@@ -115,7 +115,7 @@ protected:
std::unique_ptr<weld::Builder> m_xBuilder;
std::unique_ptr<weld::Container> m_xContainer;
- OrganizePage(weld::Container* pParent, const OUString& rUIFile, const
OString &rName, OrganizeDialog* pDialog);
+ OrganizePage(weld::Container* pParent, const OUString& rUIFile, const
OUString &rName, OrganizeDialog* pDialog);
virtual ~OrganizePage();
public:
@@ -147,7 +147,7 @@ class ObjectPage final : public OrganizePage
void EndTabDialog();
public:
- ObjectPage(weld::Container* pParent, const OString& rName, BrowseMode
nMode, OrganizeDialog* pDialog);
+ ObjectPage(weld::Container* pParent, const OUString& rName, BrowseMode
nMode, OrganizeDialog* pDialog);
virtual ~ObjectPage() override;
void SetCurrentEntry(const EntryDescriptor& rDesc) {
m_xBasicBox->SetCurrentEntry(rDesc); }
@@ -206,7 +206,7 @@ private:
std::unique_ptr<ObjectPage> m_xDialogPage;
std::unique_ptr<LibPage> m_xLibPage;
- DECL_LINK(ActivatePageHdl, const OString&, void);
+ DECL_LINK(ActivatePageHdl, const OUString&, void);
void SetCurrentEntry(const css::uno::Reference<css::frame::XFrame>&
xDocFrame);
diff --git a/basctl/source/inc/baside3.hxx b/basctl/source/inc/baside3.hxx
index 5b61e1b88748..14fc68f07951 100644
--- a/basctl/source/inc/baside3.hxx
+++ b/basctl/source/inc/baside3.hxx
@@ -107,7 +107,7 @@ public:
virtual css::uno::Reference< css::accessibility::XAccessible >
CreateAccessible() override;
- virtual OString GetHid () const override;
+ virtual OUString GetHid () const override;
virtual ItemType GetType () const override;
};
diff --git a/basctl/source/inc/bastypes.hxx b/basctl/source/inc/bastypes.hxx
index 4bc92481f3ca..513fbce3a41c 100644
--- a/basctl/source/inc/bastypes.hxx
+++ b/basctl/source/inc/bastypes.hxx
@@ -82,7 +82,7 @@ struct BasicStatus
class DockingWindow : public ResizableDockingWindow
{
public:
- DockingWindow(vcl::Window* pParent, const OUString& rUIXMLDescription,
const OString& rID);
+ DockingWindow(vcl::Window* pParent, const OUString& rUIXMLDescription,
const OUString& rID);
DockingWindow(Layout* pParent);
virtual ~DockingWindow() override;
virtual void dispose() override;
@@ -237,7 +237,7 @@ public:
void SetName( const OUString& aName ) { m_aName = aName; }
virtual void OnNewDocument ();
- virtual OString GetHid () const = 0;
+ virtual OUString GetHid () const = 0;
virtual ItemType GetType () const = 0;
void InsertLibInfo () const;
bool Is (ScriptDocument const&, std::u16string_view, std::u16string_view,
ItemType, bool bFindSuspended);
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
index ac6f8bb9a976..12d22805790f 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
@@ -95,7 +95,7 @@ std::unique_ptr<BuilderPage>
CreationWizard::createPage(WizardState nState)
{
std::unique_ptr<vcl::OWizardPage> xRet;
- OString sIdent(OString::number(nState));
+ OUString sIdent(OUString::number(nState));
weld::Container* pPageContainer = m_xAssistant->append_page(sIdent);
switch( nState )
diff --git a/chart2/source/controller/dialogs/dlg_DataEditor.cxx
b/chart2/source/controller/dialogs/dlg_DataEditor.cxx
index 0a236282f4ab..367b1d183a54 100644
--- a/chart2/source/controller/dialogs/dlg_DataEditor.cxx
+++ b/chart2/source/controller/dialogs/dlg_DataEditor.cxx
@@ -74,7 +74,7 @@ DataEditor::~DataEditor()
}
// react on click (or keypress) on toolbar icon
-IMPL_LINK(DataEditor, ToolboxHdl, const OString&, rId, void)
+IMPL_LINK(DataEditor, ToolboxHdl, const OUString&, rId, void)
{
if (rId == "InsertRow")
m_xBrwData->InsertRow();
diff --git a/chart2/source/controller/dialogs/dlg_DataSource.cxx
b/chart2/source/controller/dialogs/dlg_DataSource.cxx
index 87af01aaa33a..4946edc0ffc5 100644
--- a/chart2/source/controller/dialogs/dlg_DataSource.cxx
+++ b/chart2/source/controller/dialogs/dlg_DataSource.cxx
@@ -126,7 +126,7 @@ short DataSourceDialog::run()
return nResult;
}
-IMPL_LINK(DataSourceDialog, ActivatePageHdl, const OString&, rPage, void)
+IMPL_LINK(DataSourceDialog, ActivatePageHdl, const OUString&, rPage, void)
{
if (rPage == "range")
m_xRangeChooserTabPage->Activate();
@@ -135,7 +135,7 @@ IMPL_LINK(DataSourceDialog, ActivatePageHdl, const
OString&, rPage, void)
}
// allow/disallow user to leave page
-IMPL_LINK_NOARG(DataSourceDialog, DeactivatePageHdl, const OString&, bool)
+IMPL_LINK_NOARG(DataSourceDialog, DeactivatePageHdl, const OUString&, bool)
{
return m_bTogglingEnabled;
}
diff --git a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
index f20571e22f55..6a79bac4a414 100644
--- a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
+++ b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
@@ -37,8 +37,8 @@ SchAxisDlg::SchAxisDlg(weld::Window* pWindow,
OUString("modules/schart/ui/insertaxisdlg.ui") :
OUString("modules/schart/ui/insertgriddlg.ui"),
bAxisDlg ?
- OString("InsertAxisDialog") :
- OString("InsertGridDialog"))
+ OUString("InsertAxisDialog") :
+ OUString("InsertGridDialog"))
, m_xCbPrimaryX(m_xBuilder->weld_check_button("primaryX"))
, m_xCbPrimaryY(m_xBuilder->weld_check_button("primaryY"))
, m_xCbPrimaryZ(m_xBuilder->weld_check_button("primaryZ"))
diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
index 359a998c9466..a0b548e43767 100644
--- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
+++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
@@ -497,7 +497,7 @@ SchAttribTabDlg::~SchAttribTabDlg()
{
}
-void SchAttribTabDlg::PageCreated(const OString& rId, SfxTabPage &rPage)
+void SchAttribTabDlg::PageCreated(const OUString& rId, SfxTabPage &rPage)
{
SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));
if (rId == "border")
diff --git a/chart2/source/controller/dialogs/dlg_ShapeFont.cxx
b/chart2/source/controller/dialogs/dlg_ShapeFont.cxx
index f5fc702a2a76..b742e8a22eda 100644
--- a/chart2/source/controller/dialogs/dlg_ShapeFont.cxx
+++ b/chart2/source/controller/dialogs/dlg_ShapeFont.cxx
@@ -41,7 +41,7 @@ ShapeFontDialog::ShapeFontDialog(weld::Window* pParent, const
SfxItemSet* pAttr,
AddTabPage("position", RID_SVXPAGE_CHAR_POSITION );
}
-void ShapeFontDialog::PageCreated(const OString& rId, SfxTabPage& rPage)
+void ShapeFontDialog::PageCreated(const OUString& rId, SfxTabPage& rPage)
{
SfxAllItemSet aSet( *( GetInputSetImpl()->GetPool() ) );
if (rId == "font")
diff --git a/chart2/source/controller/dialogs/dlg_ShapeParagraph.cxx
b/chart2/source/controller/dialogs/dlg_ShapeParagraph.cxx
index e5b422ceaf16..4c72d4d8126b 100644
--- a/chart2/source/controller/dialogs/dlg_ShapeParagraph.cxx
+++ b/chart2/source/controller/dialogs/dlg_ShapeParagraph.cxx
@@ -47,7 +47,7 @@ ShapeParagraphDialog::ShapeParagraphDialog(weld::Window*
pParent,
AddTabPage("labelTP_TABULATOR", RID_SVXPAGE_TABULATOR);
}
-void ShapeParagraphDialog::PageCreated(const OString& rId, SfxTabPage& rPage)
+void ShapeParagraphDialog::PageCreated(const OUString& rId, SfxTabPage& rPage)
{
if (rId == "labelTP_TABULATOR")
{
diff --git a/chart2/source/controller/dialogs/dlg_View3D.cxx
b/chart2/source/controller/dialogs/dlg_View3D.cxx
index 367f1104e0d0..1891ffff679e 100644
--- a/chart2/source/controller/dialogs/dlg_View3D.cxx
+++ b/chart2/source/controller/dialogs/dlg_View3D.cxx
@@ -57,7 +57,7 @@ View3DDialog::View3DDialog(weld::Window* pParent, const
rtl::Reference<::chart::
m_xTabControl->set_current_page(m_nLastPageId);
}
-IMPL_LINK(View3DDialog, ActivatePageHdl, const OString&, rPage, void)
+IMPL_LINK(View3DDialog, ActivatePageHdl, const OUString&, rPage, void)
{
if (rPage == "appearance")
m_xAppearance->ActivatePage();
diff --git a/chart2/source/controller/inc/dlg_DataEditor.hxx
b/chart2/source/controller/inc/dlg_DataEditor.hxx
index 9671169db019..205e822a12a5 100644
--- a/chart2/source/controller/inc/dlg_DataEditor.hxx
+++ b/chart2/source/controller/inc/dlg_DataEditor.hxx
@@ -63,7 +63,7 @@ private:
VclPtr<DataBrowser> m_xBrwData;
/// handles actions of the toolbox
- DECL_LINK( ToolboxHdl, const OString&, void );
+ DECL_LINK( ToolboxHdl, const OUString&, void );
/// is called, if the cursor of the table has moved
DECL_LINK( BrowserCursorMovedHdl, DataBrowser*, void);
};
diff --git a/chart2/source/controller/inc/dlg_DataSource.hxx
b/chart2/source/controller/inc/dlg_DataSource.hxx
index 2dce4169d22b..166131e30ec9 100644
--- a/chart2/source/controller/inc/dlg_DataSource.hxx
+++ b/chart2/source/controller/inc/dlg_DataSource.hxx
@@ -52,8 +52,8 @@ public:
virtual void setValidPage( BuilderPage * pTabPage ) override;
private:
- DECL_LINK(ActivatePageHdl, const OString&, void);
- DECL_LINK(DeactivatePageHdl, const OString&, bool);
+ DECL_LINK(ActivatePageHdl, const OUString&, void);
+ DECL_LINK(DeactivatePageHdl, const OUString&, bool);
std::unique_ptr< ChartTypeTemplateProvider > m_apDocTemplateProvider;
std::unique_ptr< DialogModel > m_apDialogModel;
diff --git a/chart2/source/controller/inc/dlg_ObjectProperties.hxx
b/chart2/source/controller/inc/dlg_ObjectProperties.hxx
index 4311add0f733..621f096753e4 100644
--- a/chart2/source/controller/inc/dlg_ObjectProperties.hxx
+++ b/chart2/source/controller/inc/dlg_ObjectProperties.hxx
@@ -122,7 +122,7 @@ private:
DECL_LINK(OKPressed, weld::Button&, void);
- virtual void PageCreated(const OString& rId, SfxTabPage& rPage) override;
+ virtual void PageCreated(const OUString& rId, SfxTabPage& rPage) override;
public:
SchAttribTabDlg(weld::Window* pParent, const SfxItemSet* pAttr,
diff --git a/chart2/source/controller/inc/dlg_ShapeFont.hxx
b/chart2/source/controller/inc/dlg_ShapeFont.hxx
index 6998ba47094b..cfeb002fb92d 100644
--- a/chart2/source/controller/inc/dlg_ShapeFont.hxx
+++ b/chart2/source/controller/inc/dlg_ShapeFont.hxx
@@ -33,7 +33,7 @@ public:
const ViewElementListProvider* pViewElementListProvider);
private:
- virtual void PageCreated(const OString& rId, SfxTabPage& rPage) override;
+ virtual void PageCreated(const OUString& rId, SfxTabPage& rPage) override;
const ViewElementListProvider* m_pViewElementListProvider;
};
diff --git a/chart2/source/controller/inc/dlg_ShapeParagraph.hxx
b/chart2/source/controller/inc/dlg_ShapeParagraph.hxx
index 9d4d7496d64d..15d0c014d848 100644
--- a/chart2/source/controller/inc/dlg_ShapeParagraph.hxx
+++ b/chart2/source/controller/inc/dlg_ShapeParagraph.hxx
@@ -30,7 +30,7 @@ public:
ShapeParagraphDialog(weld::Window* pParent, const SfxItemSet* pAttr);
private:
- virtual void PageCreated(const OString& rId, SfxTabPage& rPage) override;
+ virtual void PageCreated(const OUString& rId, SfxTabPage& rPage) override;
};
} // namespace chart
diff --git a/chart2/source/controller/inc/dlg_View3D.hxx
b/chart2/source/controller/inc/dlg_View3D.hxx
index c165e828535e..66c4a8eaf41a 100644
--- a/chart2/source/controller/inc/dlg_View3D.hxx
+++ b/chart2/source/controller/inc/dlg_View3D.hxx
@@ -41,7 +41,7 @@ public:
virtual short run() override;
private:
- DECL_LINK(ActivatePageHdl, const OString&, void);
+ DECL_LINK(ActivatePageHdl, const OUString&, void);
ControllerLockHelper m_aControllerLocker;
diff --git a/chart2/source/controller/inc/helpids.h
b/chart2/source/controller/inc/helpids.h
index 69a23771c8dd..8e683334fdd3 100644
--- a/chart2/source/controller/inc/helpids.h
+++ b/chart2/source/controller/inc/helpids.h
@@ -19,14 +19,14 @@
#pragma once
-#include <rtl/string.hxx>
+#include <rtl/ustring.hxx>
-inline constexpr OStringLiteral HID_SCH_WIN_DOCUMENT =
"CHART2_HID_SCH_WIN_DOCUMENT";
-inline constexpr OStringLiteral HID_SCH_ERROR_BARS_FROM_DATA =
"CHART2_SCH_ERROR_BARS_FROM_DATA";
+inline constexpr OUStringLiteral HID_SCH_WIN_DOCUMENT =
u"CHART2_HID_SCH_WIN_DOCUMENT";
+inline constexpr OUStringLiteral HID_SCH_ERROR_BARS_FROM_DATA =
u"CHART2_SCH_ERROR_BARS_FROM_DATA";
-inline constexpr OStringLiteral HID_SCH_WIZARD_ROADMAP =
"CHART2_HID_SCH_WIZARD_ROADMAP";
-inline constexpr OStringLiteral HID_SCH_DATA_SERIES_LABEL =
"CHART2_HID_SCH_DATA_SERIES_LABEL";
+inline constexpr OUStringLiteral HID_SCH_WIZARD_ROADMAP =
u"CHART2_HID_SCH_WIZARD_ROADMAP";
+inline constexpr OUStringLiteral HID_SCH_DATA_SERIES_LABEL =
u"CHART2_HID_SCH_DATA_SERIES_LABEL";
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/customize/SvxMenuConfigPage.cxx
b/cui/source/customize/SvxMenuConfigPage.cxx
index 5793825b5d76..dad5b5e1fc55 100644
--- a/cui/source/customize/SvxMenuConfigPage.cxx
+++ b/cui/source/customize/SvxMenuConfigPage.cxx
@@ -275,7 +275,7 @@ void SvxMenuConfigPage::SelectElement()
UpdateButtonStates();
}
-IMPL_LINK(SvxMenuConfigPage, GearHdl, const OString&, rIdent, void)
+IMPL_LINK(SvxMenuConfigPage, GearHdl, const OUString&, rIdent, void)
{
if (rIdent == "menu_gear_add")
{
@@ -371,7 +371,7 @@ IMPL_LINK_NOARG(SvxMenuConfigPage, RemoveCommandHdl,
weld::Button&, void)
}
}
-IMPL_LINK(SvxMenuConfigPage, InsertHdl, const OString&, rIdent, void)
+IMPL_LINK(SvxMenuConfigPage, InsertHdl, const OUString&, rIdent, void)
{
weld::TreeView& rTreeView = m_xContentsListBox->get_widget();
if (rIdent == "insertseparator")
@@ -423,7 +423,7 @@ IMPL_LINK(SvxMenuConfigPage, InsertHdl, const OString&,
rIdent, void)
}
}
-IMPL_LINK(SvxMenuConfigPage, ModifyItemHdl, const OString&, rIdent, void)
+IMPL_LINK(SvxMenuConfigPage, ModifyItemHdl, const OUString&, rIdent, void)
{
if (rIdent == "renameItem")
{
@@ -541,7 +541,7 @@ IMPL_LINK(SvxMenuConfigPage, ContentContextMenuHdl, const
CommandEvent&, rCEvt,
xContextMenu->set_visible("changeIcon", false);
xContextMenu->set_visible("resetIcon", false);
xContextMenu->set_visible("restoreDefault", false);
- OString sCommand(xContextMenu->popup_at_rect(
+ OUString sCommand(xContextMenu->popup_at_rect(
&rTreeView, tools::Rectangle(rCEvt.GetMousePosPixel(), Size(1, 1))));
if (sCommand == "remove")
@@ -580,7 +580,7 @@ IMPL_LINK(SvxMenuConfigPage, FunctionContextMenuHdl, const
CommandEvent&, rCEvt,
xContextMenu->set_visible("changeIcon", false);
xContextMenu->set_visible("resetIcon", false);
xContextMenu->set_visible("restoreDefault", false);
- OString sCommand(xContextMenu->popup_at_rect(
+ OUString sCommand(xContextMenu->popup_at_rect(
&rTreeView, tools::Rectangle(rCEvt.GetMousePosPixel(), Size(1, 1))));
if (sCommand == "add")
diff --git a/cui/source/customize/SvxToolbarConfigPage.cxx
b/cui/source/customize/SvxToolbarConfigPage.cxx
index 359dc02bb1f5..73a836ff7a17 100644
--- a/cui/source/customize/SvxToolbarConfigPage.cxx
+++ b/cui/source/customize/SvxToolbarConfigPage.cxx
@@ -287,7 +287,7 @@ IMPL_LINK_NOARG(SvxToolbarConfigPage, SelectToolbarEntry,
weld::TreeView&, void)
UpdateButtonStates();
}
-IMPL_LINK(SvxToolbarConfigPage, GearHdl, const OString&, rIdent, void)
+IMPL_LINK(SvxToolbarConfigPage, GearHdl, const OUString&, rIdent, void)
{
SvxConfigEntry* pCurrentToolbar = GetTopLevelSelection();
@@ -427,7 +427,7 @@ IMPL_LINK_NOARG(SvxToolbarConfigPage, RemoveCommandHdl,
weld::Button&, void)
DeleteSelectedContent();
}
-IMPL_LINK(SvxToolbarConfigPage, InsertHdl, const OString&, rIdent, void)
+IMPL_LINK(SvxToolbarConfigPage, InsertHdl, const OUString&, rIdent, void)
{
if (rIdent == "insertseparator")
{
@@ -452,7 +452,7 @@ IMPL_LINK(SvxToolbarConfigPage, InsertHdl, const OString&,
rIdent, void)
}
}
-IMPL_LINK(SvxToolbarConfigPage, ModifyItemHdl, const OString&, rIdent, void)
+IMPL_LINK(SvxToolbarConfigPage, ModifyItemHdl, const OUString&, rIdent, void)
{
bool bNeedsApply = false;
@@ -876,7 +876,7 @@ IMPL_LINK(SvxToolbarConfigPage, ContentContextMenuHdl,
const CommandEvent&, rCEv
xContextMenu->set_visible("changeIcon", bIsValidSelection &&
!bIsSeparator);
xContextMenu->set_visible("resetIcon", bIsValidSelection && !bIsSeparator);
xContextMenu->set_visible("restoreDefault", bIsValidSelection &&
!bIsSeparator);
- OString sCommand(xContextMenu->popup_at_rect(
+ OUString sCommand(xContextMenu->popup_at_rect(
&rTreeView, tools::Rectangle(rCEvt.GetMousePosPixel(), Size(1, 1))));
if (sCommand == "remove")
@@ -916,7 +916,7 @@ IMPL_LINK(SvxToolbarConfigPage, FunctionContextMenuHdl,
const CommandEvent&, rCE
xContextMenu->set_visible("changeIcon", false);
xContextMenu->set_visible("resetIcon", false);
xContextMenu->set_visible("restoreDefault", false);
- OString sCommand(xContextMenu->popup_at_rect(
+ OUString sCommand(xContextMenu->popup_at_rect(
&rTreeView, tools::Rectangle(rCEvt.GetMousePosPixel(), Size(1, 1))));
if (sCommand == "add")
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 91584562a647..d41012850bce 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -236,7 +236,7 @@ SvxConfigDialog::SvxConfigDialog(weld::Window * pParent,
const SfxItemSet* pInSe
#endif
}
-void SvxConfigDialog::ActivatePage(const OString& rPage)
+void SvxConfigDialog::ActivatePage(const OUString& rPage)
{
SfxTabDialogController::ActivatePage(rPage);
GetResetButton()->set_visible(rPage != "keyboard");
@@ -257,7 +257,7 @@ void SvxConfigDialog::SetFrame(const
css::uno::Reference<css::frame::XFrame>& xF
RemoveTabPage("keyboard");
}
-void SvxConfigDialog::PageCreated(const OString &rId, SfxTabPage& rPage)
+void SvxConfigDialog::PageCreated(const OUString &rId, SfxTabPage& rPage)
{
if (rId == "menus" || rId == "keyboard" || rId == "notebookbar"
|| rId == "toolbars" || rId == "contextmenus")
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index 7746333fe796..aa77952563a8 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -1204,7 +1204,7 @@ IMPL_LINK(SvxScriptSelectorDialog, ContextMenuHdl, const
CommandEvent&, rCEvt, b
xDropMenu->set_active("alphabetically", xTreeView.get_sort_order());
xDropMenu->set_active("properorder", !xTreeView.get_sort_order());
- OString sCommand(xPopup->popup_at_rect(&xTreeView,
tools::Rectangle(rCEvt.GetMousePosPixel(), Size(1,1))));
+ OUString sCommand(xPopup->popup_at_rect(&xTreeView,
tools::Rectangle(rCEvt.GetMousePosPixel(), Size(1,1))));
if (sCommand == "alphabetically")
{
xTreeView.make_sorted();
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index 3980c8b6c3f7..6a22ee2c3d99 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -72,7 +72,7 @@ void SvxMacroTabPage_::EnableButtons()
}
SvxMacroTabPage_::SvxMacroTabPage_(weld::Container* pPage,
weld::DialogController* pController, const OUString& rUIXMLDescription,
- const OString& rID, const SfxItemSet& rAttrSet)
+ const OUString& rID, const SfxItemSet& rAttrSet)
: SfxTabPage(pPage, pController, rUIXMLDescription, rID, &rAttrSet)
, m_nAssignedEvents(0)
, bDocModified(false)
diff --git a/cui/source/dialogs/AdditionsDialog.cxx
b/cui/source/dialogs/AdditionsDialog.cxx
index bf386e597412..d46a22a9071f 100644
--- a/cui/source/dialogs/AdditionsDialog.cxx
+++ b/cui/source/dialogs/AdditionsDialog.cxx
@@ -848,7 +848,7 @@ void TmpRepositoryCommandEnv::update(uno::Any const&
/*Status */) {}
void TmpRepositoryCommandEnv::pop() {}
-IMPL_LINK(AdditionsDialog, GearHdl, const OString&, rIdent, void)
+IMPL_LINK(AdditionsDialog, GearHdl, const OUString&, rIdent, void)
{
if (rIdent == "gear_sort_voting")
{
diff --git a/cui/source/dialogs/SignatureLineDialogBase.cxx
b/cui/source/dialogs/SignatureLineDialogBase.cxx
index 4e591124bc44..e0ae28fe5040 100644
--- a/cui/source/dialogs/SignatureLineDialogBase.cxx
+++ b/cui/source/dialogs/SignatureLineDialogBase.cxx
@@ -18,7 +18,7 @@ using namespace css::uno;
using namespace css::frame;
SignatureLineDialogBase::SignatureLineDialogBase(weld::Widget* pParent,
Reference<XModel> xModel,
- const OUString& rUIFile,
const OString& rDialogId)
+ const OUString& rUIFile,
const OUString& rDialogId)
: GenericDialogController(pParent, rUIFile, rDialogId)
, m_xModel(std::move(xModel))
{
diff --git a/cui/source/dialogs/SpellDialog.cxx
b/cui/source/dialogs/SpellDialog.cxx
index 7b671fd84dfa..b5356aa30a45 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -833,15 +833,15 @@ int SpellDialog::InitUserDicts()
IMPL_LINK_NOARG(SpellDialog, AddToDictClickHdl, weld::Button&, void)
{
- AddToDictionaryExecute(OString::number(1));
+ AddToDictionaryExecute(OUString::number(1));
}
-IMPL_LINK(SpellDialog, AddToDictSelectHdl, const OString&, rIdent, void)
+IMPL_LINK(SpellDialog, AddToDictSelectHdl, const OUString&, rIdent, void)
{
AddToDictionaryExecute(rIdent);
}
-void SpellDialog::AddToDictionaryExecute(const OString& rItemId)
+void SpellDialog::AddToDictionaryExecute(const OUString& rItemId)
{
auto xGuard(std::make_unique<UndoChangeGroupGuard>(*m_xSentenceED));
@@ -1526,7 +1526,7 @@ void SentenceEditWindow_Impl::Init(weld::Toolbar*
pToolbar)
m_pToolbar->connect_clicked(LINK(this,SentenceEditWindow_Impl,ToolbarHdl));
}
-IMPL_LINK(SentenceEditWindow_Impl, ToolbarHdl, const OString&, rCurItemId,
void)
+IMPL_LINK(SentenceEditWindow_Impl, ToolbarHdl, const OUString&, rCurItemId,
void)
{
if (rCurItemId == "paste")
{
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index e432b4fce85b..530ef109c216 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -492,7 +492,7 @@
GalleryThemeProperties::GalleryThemeProperties(weld::Widget* pParent,
m_xDialog->set_title(aText);
}
-void GalleryThemeProperties::PageCreated(const OString& rId, SfxTabPage &rPage)
+void GalleryThemeProperties::PageCreated(const OUString& rId, SfxTabPage
&rPage)
{
if (rId == "general")
static_cast<TPGalleryThemeGeneral&>( rPage ).SetXChgData( pData );
diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx
index c67ee92d141c..48373e7f1968 100644
--- a/cui/source/dialogs/cuigrfflt.cxx
+++ b/cui/source/dialogs/cuigrfflt.cxx
@@ -124,7 +124,7 @@ void CuiGraphicPreviewWindow::Resize()
}
GraphicFilterDialog::GraphicFilterDialog(weld::Window* pParent,
- const OUString& rUIXMLDescription, const OString& rID,
+ const OUString& rUIXMLDescription, const OUString& rID,
const Graphic& rGraphic)
: GenericDialogController(pParent, rUIXMLDescription, rID)
, maTimer("cui GraphicFilterDialog maTimer")
diff --git a/cui/source/dialogs/cuihyperdlg.cxx
b/cui/source/dialogs/cuihyperdlg.cxx
index 3352a7a10f5a..9eb5a1fa367e 100644
--- a/cui/source/dialogs/cuihyperdlg.cxx
+++ b/cui/source/dialogs/cuihyperdlg.cxx
@@ -222,7 +222,7 @@ IMPL_LINK_NOARG(SvxHpLinkDlg, ClickApplyHdl_Impl,
weld::Button&, void)
|************************************************************************/
void SvxHpLinkDlg::SetPage ( SvxHyperlinkItem const * pItem )
{
- OString sPageId("internet");
+ OUString sPageId("internet");
OUString aStrURL(pItem->GetURL());
INetURLObject aURL(aStrURL);
diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx
index 77d335f109c2..c1b9b270f9c9 100644
--- a/cui/source/dialogs/hltpbase.cxx
+++ b/cui/source/dialogs/hltpbase.cxx
@@ -105,7 +105,7 @@ sal_Int8 SvxHyperURLBox::ExecuteDrop( const
ExecuteDropEvent& rEvt )
SvxHyperlinkTabPageBase::SvxHyperlinkTabPageBase(weld::Container* pParent,
SvxHpLinkDlg* pDlg,
const OUString&
rUIXMLDescription,
- const OString& rID,
+ const OUString& rID,
const SfxItemSet* pItemSet)
: IconChoicePage(pParent, rUIXMLDescription, rID, pItemSet)
, mxCbbFrame(xBuilder->weld_combo_box("frame"))
diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx
index 6e6ffaf5c53a..0c2219f0ee71 100644
--- a/cui/source/dialogs/iconcdlg.cxx
+++ b/cui/source/dialogs/iconcdlg.cxx
@@ -31,7 +31,7 @@
\**********************************************************************/
IconChoicePage::IconChoicePage(weld::Container* pParent,
- const OUString& rUIXMLDescription, const
OString& rID,
+ const OUString& rUIXMLDescription, const
OUString& rID,
const SfxItemSet* pItemSet)
: xBuilder(Application::CreateBuilder(pParent, rUIXMLDescription))
, xContainer(xBuilder->weld_container(rID))
@@ -70,7 +70,7 @@ bool IconChoicePage::QueryClose()
| add new page
|
\**********************************************************************/
-void SvxHpLinkDlg::AddTabPage(const OString& rId, CreatePage pCreateFunc /* !=
0 */)
+void SvxHpLinkDlg::AddTabPage(const OUString& rId, CreatePage pCreateFunc /*
!= 0 */)
{
weld::Container* pPage = m_xIconCtrl->get_page(rId);
maPageList.emplace_back(new IconChoicePageData(rId, pCreateFunc(pPage,
this, pSet)));
@@ -83,9 +83,9 @@ void SvxHpLinkDlg::AddTabPage(const OString& rId, CreatePage
pCreateFunc /* != 0
| Show / Hide page or button
|
\**********************************************************************/
-void SvxHpLinkDlg::ShowPage(const OString& rId)
+void SvxHpLinkDlg::ShowPage(const OUString& rId)
{
- OString sOldPageId = GetCurPageId();
+ OUString sOldPageId = GetCurPageId();
bool bInvalidate = sOldPageId != rId;
if (bInvalidate)
{
@@ -104,7 +104,7 @@ void SvxHpLinkDlg::ShowPage(const OString& rId)
| select a page
|
\**********************************************************************/
-IMPL_LINK(SvxHpLinkDlg, ChosePageHdl_Impl, const OString&, rId, void)
+IMPL_LINK(SvxHpLinkDlg, ChosePageHdl_Impl, const OUString&, rId, void)
{
if (rId != msCurrentPageId)
{
@@ -280,7 +280,7 @@ void SvxHpLinkDlg::Start()
|
\**********************************************************************/
-IconChoicePageData* SvxHpLinkDlg::GetPageData ( std::string_view rId )
+IconChoicePageData* SvxHpLinkDlg::GetPageData ( std::u16string_view rId )
{
IconChoicePageData *pRet = nullptr;
for (const auto & pData : maPageList)
@@ -300,7 +300,7 @@ IconChoicePageData* SvxHpLinkDlg::GetPageData (
std::string_view rId )
|
\**********************************************************************/
-void SvxHpLinkDlg::SwitchPage( const OString& rId )
+void SvxHpLinkDlg::SwitchPage( const OUString& rId )
{
m_xIconCtrl->set_current_page(rId);
}
diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index 53488a72e334..3cb50c2a6066 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -72,7 +72,7 @@ uno::Reference< io::XInputStream >
InsertObjectDialog_Impl::GetIconIfIconified(
}
InsertObjectDialog_Impl::InsertObjectDialog_Impl(weld::Window* pParent,
- const OUString& rUIXMLDescription, const OString& rID,
+ const OUString& rUIXMLDescription, const OUString& rID,
css::uno::Reference < css::embed::XStorage > xStorage)
: GenericDialogController(pParent, rUIXMLDescription, rID)
, m_xStorage(std::move( xStorage ))
diff --git a/cui/source/dialogs/insrc.cxx b/cui/source/dialogs/insrc.cxx
index bec311442756..1ff1a14411cb 100644
--- a/cui/source/dialogs/insrc.cxx
+++ b/cui/source/dialogs/insrc.cxx
@@ -31,7 +31,7 @@ sal_uInt16 SvxInsRowColDlg::getInsertCount() const
return m_xCountEdit->get_value();
}
-SvxInsRowColDlg::SvxInsRowColDlg(weld::Window* pParent, bool bColumn, const
OString& rHelpId)
+SvxInsRowColDlg::SvxInsRowColDlg(weld::Window* pParent, bool bColumn, const
OUString& rHelpId)
: GenericDialogController(pParent, "cui/ui/insertrowcolumn.ui",
"InsertRowColumnDialog")
, m_xCountEdit(m_xBuilder->weld_spin_button("insert_number"))
, m_xBeforeBtn(m_xBuilder->weld_radio_button("insert_before"))
diff --git a/cui/source/dialogs/screenshotannotationdlg.cxx
b/cui/source/dialogs/screenshotannotationdlg.cxx
index c23146f91fbd..fca03c02d42d 100644
--- a/cui/source/dialogs/screenshotannotationdlg.cxx
+++ b/cui/source/dialogs/screenshotannotationdlg.cxx
@@ -252,7 +252,7 @@ ScreenshotAnnotationDlg_Impl::ScreenshotAnnotationDlg_Impl(
if (mxText)
{
mxText->set_size_request(400, mxText->get_height_rows(10));
- OUString aHelpId = OStringToOUString( mrParentDialog.get_help_id(),
RTL_TEXTENCODING_UTF8 );
+ OUString aHelpId = mrParentDialog.get_help_id();
Size aSizeCm =
Application::GetDefaultDevice()->PixelToLogic(maParentDialogSize,
MapMode(MapUnit::MapCM));
maMainMarkupText = lcl_ParagraphWithImage( aHelpId, aSizeCm );
mxText->set_text( maMainMarkupText );
@@ -276,7 +276,7 @@ IMPL_LINK_NOARG(ScreenshotAnnotationDlg_Impl,
saveButtonHandler, weld::Button&,
// 'save screenshot...' pressed, offer to save maParentDialogBitmap
// as PNG image, use *.id file name as screenshot file name offering
// get a suggestion for the filename from buildable name
- OString aDerivedFileName = mrParentDialog.get_buildable_name();
+ OUString aDerivedFileName = mrParentDialog.get_buildable_name();
auto xFileDlg =
std::make_unique<sfx2::FileDialogHelper>(ui::dialogs::TemplateDescription::FILESAVE_AUTOEXTENSION,
FileDialogFlags::NONE, mpParentWindow);
@@ -293,7 +293,7 @@ IMPL_LINK_NOARG(ScreenshotAnnotationDlg_Impl,
saveButtonHandler, weld::Button&,
xFilePicker->appendFilter("*.png", "*.png");
xFilePicker->setCurrentFilter("*.png");
- xFilePicker->setDefaultName(OStringToOUString(aDerivedFileName,
RTL_TEXTENCODING_UTF8));
+ xFilePicker->setDefaultName(aDerivedFileName);
xFilePicker->setMultiSelectionMode(false);
if (xFilePicker->execute() != ui::dialogs::ExecutableDialogResults::OK)
@@ -546,10 +546,7 @@ bool ScreenshotAnnotationDlg_Impl::MouseButtonUp()
OUStringBuffer aBookmarks(maMainMarkupText);
for (auto&& rCandidate : maSelected)
- {
- OUString aHelpId = OStringToOUString( rCandidate->GetHelpId(),
RTL_TEXTENCODING_UTF8 );
- aBookmarks.append(lcl_Bookmark( aHelpId ));
- }
+ aBookmarks.append(lcl_Bookmark(rCandidate->GetHelpId()));
mxText->set_text( aBookmarks.makeStringAndClear() );
bRepaint = true;
diff --git a/cui/source/dialogs/sdrcelldlg.cxx
b/cui/source/dialogs/sdrcelldlg.cxx
index 3afbc0f694d3..c5c4d22e162c 100644
--- a/cui/source/dialogs/sdrcelldlg.cxx
+++ b/cui/source/dialogs/sdrcelldlg.cxx
@@ -67,7 +67,7 @@ SvxFormatCellsDialog::SvxFormatCellsDialog(weld::Window*
pParent, const SfxItemS
RemoveTabPage("asian");
}
-void SvxFormatCellsDialog::PageCreated(const OString& rId, SfxTabPage &rPage)
+void SvxFormatCellsDialog::PageCreated(const OUString& rId, SfxTabPage &rPage)
{
if (rId == "area")
{
diff --git a/cui/source/dialogs/srchxtra.cxx b/cui/source/dialogs/srchxtra.cxx
index 40c2e369ab6b..9ed00b46377d 100644
--- a/cui/source/dialogs/srchxtra.cxx
+++ b/cui/source/dialogs/srchxtra.cxx
@@ -59,7 +59,7 @@ SvxSearchFormatDialog::~SvxSearchFormatDialog()
{
}
-void SvxSearchFormatDialog::PageCreated(const OString& rId, SfxTabPage& rPage)
+void SvxSearchFormatDialog::PageCreated(const OUString& rId, SfxTabPage& rPage)
{
if (rId == "font")
{
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index f0177530fa70..5478b62ad55c 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -165,7 +165,7 @@ void AbstractSvxCharacterMapDialog_Impl::SetText(const
OUString& rStr)
m_xDlg->set_title(rStr);
}
-void CuiAbstractTabController_Impl::SetCurPageId( const OString &rName )
+void CuiAbstractTabController_Impl::SetCurPageId( const OUString &rName )
{
m_xDlg->SetCurPageId( rName );
}
@@ -191,12 +191,12 @@ void CuiAbstractTabController_Impl::SetText( const
OUString& rStr )
m_xDlg->set_title(rStr);
}
-std::vector<OString>
CuiAbstractTabController_Impl::getAllPageUIXMLDescriptions() const
+std::vector<OUString>
CuiAbstractTabController_Impl::getAllPageUIXMLDescriptions() const
{
return m_xDlg->getAllPageUIXMLDescriptions();
}
-bool CuiAbstractTabController_Impl::selectPageByUIXMLDescription(const
OString& rUIXMLDescription)
+bool CuiAbstractTabController_Impl::selectPageByUIXMLDescription(const
OUString& rUIXMLDescription)
{
return m_xDlg->selectPageByUIXMLDescription(rUIXMLDescription);
}
@@ -206,7 +206,7 @@ BitmapEx CuiAbstractTabController_Impl::createScreenshot()
const
return m_xDlg->createScreenshot();
}
-OString CuiAbstractTabController_Impl::GetScreenshotId() const
+OUString CuiAbstractTabController_Impl::GetScreenshotId() const
{
return m_xDlg->GetScreenshotId();
}
@@ -466,7 +466,7 @@ bool AbstractSvxSearchSimilarityDialog_Impl::IsRelaxed()
}
// AbstractSvxTransformTabDialog implementations just forwards everything to
the dialog
-void AbstractSvxTransformTabDialog_Impl::SetCurPageId( const OString& rName )
+void AbstractSvxTransformTabDialog_Impl::SetCurPageId( const OUString& rName )
{
m_xDlg->SetCurPageId( rName );
}
@@ -498,7 +498,7 @@ void
AbstractSvxTransformTabDialog_Impl::SetValidateFramePosLink( const Link<Svx
}
// AbstractSvxCaptionDialog implementations just forwards everything to the
dialog
-void AbstractSvxCaptionDialog_Impl::SetCurPageId( const OString& rName )
+void AbstractSvxCaptionDialog_Impl::SetCurPageId( const OUString& rName )
{
m_xDlg->SetCurPageId(rName);
}
@@ -571,12 +571,12 @@ void AbstractSvxNameDialog_Impl::SetCheckNameTooltipHdl(
const Link<AbstractSvxN
m_xDlg->SetCheckNameTooltipHdl( Link<SvxNameDialog&,OUString>());
}
-void AbstractSvxNameDialog_Impl::SetEditHelpId(const OString& rHelpId)
+void AbstractSvxNameDialog_Impl::SetEditHelpId(const OUString& rHelpId)
{
m_xDlg->SetEditHelpId(rHelpId);
}
-void AbstractSvxNameDialog_Impl::SetHelpId(const OString& rHelpId)
+void AbstractSvxNameDialog_Impl::SetHelpId(const OUString& rHelpId)
{
m_xDlg->set_help_id(rHelpId);
}
@@ -691,7 +691,7 @@ Graphic
AbstractGraphicFilterDialog_Impl::GetFilteredGraphic(const Graphic& rGra
}
// AbstractSvxAreaTabDialog implementations just forwards everything to the
dialog
-void AbstractSvxAreaTabDialog_Impl::SetCurPageId( const OString& rName )
+void AbstractSvxAreaTabDialog_Impl::SetCurPageId( const OUString& rName )
{
m_xDlg->SetCurPageId( rName );
}
@@ -1409,7 +1409,7 @@ VclPtr<SfxAbstractInsertObjectDialog>
AbstractDialogFactory_Impl::CreateInsertOb
if ( pDlg )
{
- pDlg->SetHelpId( OUStringToOString( rCommand, RTL_TEXTENCODING_UTF8 )
);
+ pDlg->SetHelpId(rCommand);
return VclPtr<AbstractInsertObjectDialog_Impl>::Create(
std::move(pDlg) );
}
return nullptr;
@@ -1421,7 +1421,7 @@ VclPtr<VclAbstractDialog>
AbstractDialogFactory_Impl::CreateEditObjectDialog(wel
if ( rCommand == ".uno:InsertObjectFloatingFrame" )
{
auto pDlg = std::make_unique<SfxInsertFloatingFrameDialog>(pParent,
xObj);
- pDlg->SetHelpId( OUStringToOString( rCommand, RTL_TEXTENCODING_UTF8 )
);
+ pDlg->SetHelpId(rCommand);
return VclPtr<AbstractInsertObjectDialog_Impl>::Create(
std::move(pDlg) );
}
return nullptr;
@@ -1460,7 +1460,7 @@ VclPtr<VclAbstractDialog>
AbstractDialogFactory_Impl::CreateOptionsDialog(weld::
return
VclPtr<CuiAbstractController_Impl>::Create(std::make_unique<OfaTreeOptionsDialog>(pParent,
rExtensionId));
}
-VclPtr<SvxAbstractInsRowColDlg>
AbstractDialogFactory_Impl::CreateSvxInsRowColDlg(weld::Window* pParent, bool
bCol, const OString& rHelpId)
+VclPtr<SvxAbstractInsRowColDlg>
AbstractDialogFactory_Impl::CreateSvxInsRowColDlg(weld::Window* pParent, bool
bCol, const OUString& rHelpId)
{
return VclPtr<SvxInsRowColDlg>::Create(pParent, bCol, rHelpId);
}
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index 991ec082ad48..8e23592d87b7 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -122,17 +122,17 @@ DECL_ABSTDLG_CLASS_UNIQUE(CuiAbstractSingleTabController,
SfxAbstractDialog, Sfx
// CuiAbstractTabController_Impl
DECL_ABSTDLG_CLASS_SHARED_ASYNC(CuiAbstractTabController,
SfxAbstractTabDialog, SfxTabDialogController)
- virtual void SetCurPageId( const OString &rName ) override;
+ virtual void SetCurPageId( const OUString &rName ) override;
virtual const SfxItemSet* GetOutputItemSet() const override;
virtual WhichRangesContainer GetInputRanges( const SfxItemPool& pItem )
override;
virtual void SetInputSet( const SfxItemSet* pInSet )
override;
virtual void SetText( const OUString& rStr ) override;
// screenshotting
- virtual std::vector<OString> getAllPageUIXMLDescriptions() const override;
- virtual bool selectPageByUIXMLDescription(const OString&
rUIXMLDescription) override;
+ virtual std::vector<OUString> getAllPageUIXMLDescriptions() const override;
+ virtual bool selectPageByUIXMLDescription(const OUString&
rUIXMLDescription) override;
virtual BitmapEx createScreenshot() const override;
- virtual OString GetScreenshotId() const override;
+ virtual OUString GetScreenshotId() const override;
};
// AbstractHangulHanjaConversionDialog_Impl
@@ -235,7 +235,7 @@
DECL_ABSTDLG_CLASS(AbstractSvxJSearchOptionsDialog,SvxJSearchOptionsDialog)
// AbstractSvxTransformTabDialog_Impl
DECL_ABSTDLG_CLASS_ASYNC(AbstractSvxTransformTabDialog,SvxTransformTabDialog)
virtual void SetValidateFramePosLink( const
Link<SvxSwFrameValidation&,void>& rLink ) override;
- virtual void SetCurPageId( const OString& rName ) override;
+ virtual void SetCurPageId( const OUString& rName ) override;
virtual const SfxItemSet* GetOutputItemSet() const override;
virtual WhichRangesContainer GetInputRanges( const SfxItemPool& pItem )
override;
virtual void SetInputSet( const SfxItemSet* pInSet )
override;
@@ -245,7 +245,7 @@
DECL_ABSTDLG_CLASS_ASYNC(AbstractSvxTransformTabDialog,SvxTransformTabDialog)
// AbstractSvxCaptionDialog_Impl
DECL_ABSTDLG_CLASS_ASYNC(AbstractSvxCaptionDialog,SvxCaptionTabDialog)
virtual void SetValidateFramePosLink( const
Link<SvxSwFrameValidation&,void>& rLink ) override;
- virtual void SetCurPageId( const OString& rName ) override;
+ virtual void SetCurPageId( const OUString& rName ) override;
virtual const SfxItemSet* GetOutputItemSet() const override;
virtual WhichRangesContainer GetInputRanges( const SfxItemPool& pItem )
override;
virtual void SetInputSet( const SfxItemSet* pInSet )
override;
@@ -268,9 +268,9 @@ DECL_ABSTDLG_CLASS(AbstractSvxNameDialog,SvxNameDialog)
virtual void GetName( OUString& rName ) override ;
virtual void SetCheckNameHdl( const Link<AbstractSvxNameDialog&,bool>&
rLink, bool bCheckImmediately = false ) override ;
virtual void SetCheckNameTooltipHdl( const Link<AbstractSvxNameDialog&,
OUString>& rLink ) override ;
- virtual void SetEditHelpId(const OString&) override ;
+ virtual void SetEditHelpId(const OUString&) override ;
//from class Window
- virtual void SetHelpId( const OString& ) override ;
+ virtual void SetHelpId( const OUString& ) override ;
virtual void SetText( const OUString& rStr ) override ;
private:
@@ -334,7 +334,7 @@
DECL_ABSTDLG_CLASS(AbstractGraphicFilterDialog,GraphicFilterDialog)
// AbstractSvxAreaTabDialog_Impl
DECL_ABSTDLG_CLASS_ASYNC(AbstractSvxAreaTabDialog,SvxAreaTabDialog)
- virtual void SetCurPageId(const OString& rName) override;
+ virtual void SetCurPageId(const OUString& rName) override;
virtual const SfxItemSet* GetOutputItemSet() const override;
virtual WhichRangesContainer GetInputRanges( const SfxItemPool& pItem )
override;
virtual void SetInputSet(const SfxItemSet* pInSet) override;
@@ -586,7 +586,7 @@ public:
virtual VclPtr<VclAbstractDialog> CreateOptionsDialog(
weld::Window* pParent, const OUString& rExtensionId ) override;
- virtual VclPtr<SvxAbstractInsRowColDlg>
CreateSvxInsRowColDlg(weld::Window* pParent, bool bCol, const OString& rHelpId)
override;
+ virtual VclPtr<SvxAbstractInsRowColDlg>
CreateSvxInsRowColDlg(weld::Window* pParent, bool bCol, const OUString&
rHelpId) override;
virtual VclPtr<AbstractPasswordToOpenModifyDialog>
CreatePasswordToOpenModifyDialog(weld::Window* pParent, sal_uInt16
nMaxPasswdLen, bool bIsPasswordToModify) override;
diff --git a/cui/source/inc/AdditionsDialog.hxx
b/cui/source/inc/AdditionsDialog.hxx
index 415aa1e9da36..302d11bbc6ea 100644
--- a/cui/source/inc/AdditionsDialog.hxx
+++ b/cui/source/inc/AdditionsDialog.hxx
@@ -58,7 +58,7 @@ class AdditionsDialog : public weld::GenericDialogController
private:
Timer m_aSearchDataTimer;
- DECL_LINK(GearHdl, const OString&, void);
+ DECL_LINK(GearHdl, const OUString&, void);
DECL_LINK(SearchUpdateHdl, weld::Entry&, void);
DECL_LINK(ImplUpdateDataHdl, Timer*, void);
DECL_LINK(FocusOut_Impl, weld::Widget&, void);
diff --git a/cui/source/inc/SignatureLineDialogBase.hxx
b/cui/source/inc/SignatureLineDialogBase.hxx
index 3cc645819be8..dd114d81ab7d 100644
--- a/cui/source/inc/SignatureLineDialogBase.hxx
+++ b/cui/source/inc/SignatureLineDialogBase.hxx
@@ -21,7 +21,7 @@ class SignatureLineDialogBase : public
weld::GenericDialogController
{
public:
SignatureLineDialogBase(weld::Widget* pParent,
css::uno::Reference<css::frame::XModel> xModel,
- const OUString& rUIFile, const OString& rDialogId);
+ const OUString& rUIFile, const OUString&
rDialogId);
virtual short run() override;
diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx
index 3c6a7b229ebb..3c45ffce043b 100644
--- a/cui/source/inc/SpellDialog.hxx
+++ b/cui/source/inc/SpellDialog.hxx
@@ -61,7 +61,7 @@ private:
bool GetErrorDescription(SpellErrorDescription& rSpellErrorDescription,
sal_Int32 nPosition);
- DECL_LINK(ToolbarHdl, const OString&, void);
+ DECL_LINK(ToolbarHdl, const OUString&, void);
protected:
virtual bool KeyInput( const KeyEvent& rKEvt ) override;
@@ -176,14 +176,14 @@ private:
DECL_LINK(CancelHdl, weld::Button&, void);
DECL_LINK(ModifyHdl, LinkParamNone*, void);
DECL_LINK(UndoHdl, weld::Button&, void);
- DECL_LINK(AddToDictSelectHdl, const OString&, void);
+ DECL_LINK(AddToDictSelectHdl, const OUString&, void);
DECL_LINK(AddToDictClickHdl, weld::Button&, void);
DECL_LINK(LanguageSelectHdl, weld::ComboBox&, void);
DECL_LINK(DialogUndoHdl, SpellUndoAction_Impl&, void);
DECL_LINK(InitHdl, void*, void);
- void AddToDictionaryExecute(const OString& rItemId);
+ void AddToDictionaryExecute(const OUString& rItemId);
void StartSpellOptDlg_Impl();
int InitUserDicts();
void UpdateBoxes_Impl(bool bCallFromSelectHdl = false);
diff --git a/cui/source/inc/SvxMenuConfigPage.hxx
b/cui/source/inc/SvxMenuConfigPage.hxx
index bc8fba3f5780..36fee041de76 100644
--- a/cui/source/inc/SvxMenuConfigPage.hxx
+++ b/cui/source/inc/SvxMenuConfigPage.hxx
@@ -33,15 +33,15 @@ private:
DECL_LINK(ContentContextMenuHdl, const CommandEvent&, bool);
DECL_LINK(FunctionContextMenuHdl, const CommandEvent&, bool);
- DECL_LINK(GearHdl, const OString&, void);
+ DECL_LINK(GearHdl, const OUString&, void);
DECL_LINK(SelectCategory, weld::ComboBox&, void);
DECL_LINK(AddCommandHdl, weld::Button&, void);
DECL_LINK(RemoveCommandHdl, weld::Button&, void);
- DECL_LINK(InsertHdl, const OString&, void);
- DECL_LINK(ModifyItemHdl, const OString&, void);
+ DECL_LINK(InsertHdl, const OUString&, void);
+ DECL_LINK(ModifyItemHdl, const OUString&, void);
DECL_LINK(ResetMenuHdl, weld::Button&, void);
DECL_LINK(MenuEntriesSizeAllocHdl, const Size&, void);
diff --git a/cui/source/inc/SvxToolbarConfigPage.hxx
b/cui/source/inc/SvxToolbarConfigPage.hxx
index e035d6b7ef31..28fe658f2cca 100644
--- a/cui/source/inc/SvxToolbarConfigPage.hxx
+++ b/cui/source/inc/SvxToolbarConfigPage.hxx
@@ -32,7 +32,7 @@ private:
DECL_LINK(SelectToolbarEntry, weld::TreeView&, void);
DECL_LINK(MoveHdl, weld::Button&, void);
- DECL_LINK(GearHdl, const OString&, void);
+ DECL_LINK(GearHdl, const OUString&, void);
DECL_LINK(SelectCategory, weld::ComboBox&, void);
@@ -42,8 +42,8 @@ private:
DECL_LINK(AddCommandHdl, weld::Button&, void);
DECL_LINK(RemoveCommandHdl, weld::Button&, void);
- DECL_LINK(InsertHdl, const OString&, void);
- DECL_LINK(ModifyItemHdl, const OString&, void);
+ DECL_LINK(InsertHdl, const OUString&, void);
+ DECL_LINK(ModifyItemHdl, const OUString&, void);
DECL_LINK(ResetToolbarHdl, weld::Button&, void);
virtual void ListModified() override;
diff --git a/cui/source/inc/bbdlg.hxx b/cui/source/inc/bbdlg.hxx
index 1c7a289723a6..c18b5b3da4e6 100644
--- a/cui/source/inc/bbdlg.hxx
+++ b/cui/source/inc/bbdlg.hxx
@@ -32,7 +32,7 @@ public:
bool bEnableSelector,
bool bEnableDrawingLayerFillStyles);
protected:
- virtual void PageCreated(const OString& rPageId, SfxTabPage& rTabPage)
override;
+ virtual void PageCreated(const OUString& rPageId, SfxTabPage& rTabPage)
override;
private:
bool mbEnableBackgroundSelector : 1; ///< for
Border/Background
diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx
index 0ee8e1ba89fe..aaf15b5a870c 100644
--- a/cui/source/inc/cfg.hxx
+++ b/cui/source/inc/cfg.hxx
@@ -69,12 +69,12 @@ class SvxConfigDialog : public SfxTabDialogController
private:
css::uno::Reference< css::frame::XFrame > m_xFrame;
- virtual void ActivatePage(const OString& rPage) override;
+ virtual void ActivatePage(const OUString& rPage) override;
public:
SvxConfigDialog(weld::Window*, const SfxItemSet*);
- virtual void PageCreated(const OString& rId, SfxTabPage &rPage) override;
+ virtual void PageCreated(const OUString& rId, SfxTabPage &rPage) override;
void SetFrame(const css::uno::Reference< css::frame::XFrame >& xFrame);
};
diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx
index e61675c1e2c3..b1fd167d6a72 100644
--- a/cui/source/inc/chardlg.hxx
+++ b/cui/source/inc/chardlg.hxx
@@ -39,7 +39,7 @@ protected:
bool m_bPreviewBackgroundToCharacter;
- SvxCharBasePage(weld::Container* pPage, weld::DialogController*
pController, const OUString& rUIXMLDescription, const OString& rID, const
SfxItemSet& rAttrSet);
+ SvxCharBasePage(weld::Container* pPage, weld::DialogController*
pController, const OUString& rUIXMLDescription, const OUString& rID, const
SfxItemSet& rAttrSet);
void SetPrevFontWidthScale( const SfxItemSet& rSet );
void SetPrevFontEscapement( sal_uInt8 nProp, sal_uInt8 nEscProp, short
nEsc );
diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx
index 6467e0bf1f63..cac63d8a6b1e 100644
--- a/cui/source/inc/cuigaldlg.hxx
+++ b/cui/source/inc/cuigaldlg.hxx
@@ -182,7 +182,7 @@ class GalleryThemeProperties : public SfxTabDialogController
{
ExchangeData* pData;
- virtual void PageCreated(const OString& rId, SfxTabPage &rPage) override;
+ virtual void PageCreated(const OUString& rId, SfxTabPage &rPage) override;
public:
GalleryThemeProperties(weld::Widget* pParent, ExchangeData* pData,
SfxItemSet const * pItemSet);
diff --git a/cui/source/inc/cuigrfflt.hxx b/cui/source/inc/cuigrfflt.hxx
index 122ac87724da..075c74c29f42 100644
--- a/cui/source/inc/cuigrfflt.hxx
+++ b/cui/source/inc/cuigrfflt.hxx
@@ -79,7 +79,7 @@ protected:
public:
- GraphicFilterDialog(weld::Window* pParent, const OUString&
rUIXMLDescription, const OString& rID, const Graphic& rGraphic);
+ GraphicFilterDialog(weld::Window* pParent, const OUString&
rUIXMLDescription, const OUString& rID, const Graphic& rGraphic);
virtual Graphic GetFilteredGraphic(const Graphic& rGraphic, double
fScaleX, double fScaleY) = 0;
};
diff --git a/cui/source/inc/cuihyperdlg.hxx b/cui/source/inc/cuihyperdlg.hxx
index b43361edfea1..cc85db7cfe3c 100644
--- a/cui/source/inc/cuihyperdlg.hxx
+++ b/cui/source/inc/cuihyperdlg.hxx
@@ -67,7 +67,7 @@ private:
std::vector< std::unique_ptr<IconChoicePageData> > maPageList;
- OString msCurrentPageId;
+ OUString msCurrentPageId;
const SfxItemSet* pSet;
std::unique_ptr<SfxItemSet> pOutSet;
@@ -87,17 +87,17 @@ private:
std::unique_ptr<weld::Button> m_xHelpBtn;
std::unique_ptr<weld::Button> m_xResetBtn;
- DECL_LINK( ChosePageHdl_Impl, const OString&, void );
+ DECL_LINK( ChosePageHdl_Impl, const OUString&, void );
- IconChoicePageData* GetPageData ( std::string_view rId );
+ IconChoicePageData* GetPageData ( std::u16string_view rId );
- void SwitchPage( const OString& rId );
+ void SwitchPage( const OUString& rId );
DECL_LINK( ResetHdl, weld::Button&, void) ;
DECL_LINK (ClickOkHdl_Impl, weld::Button&, void );
DECL_LINK (ClickApplyHdl_Impl, weld::Button&, void );
- IconChoicePage* GetTabPage( std::string_view rPageId )
+ IconChoicePage* GetTabPage( std::u16string_view rPageId )
{ return GetPageData(rPageId)->xPage.get(); }
void ActivatePageImpl ();
@@ -113,11 +113,11 @@ public:
virtual ~SvxHpLinkDlg () override;
// interface
- void AddTabPage(const OString &rId, CreatePage pCreateFunc /* != NULL */);
+ void AddTabPage(const OUString &rId, CreatePage pCreateFunc /* != NULL */);
- void SetCurPageId( const OString& rId ) { msCurrentPageId =
rId; SwitchPage(rId ); }
- const OString & GetCurPageId() const { return msCurrentPageId; }
- void ShowPage( const OString& rId );
+ void SetCurPageId( const OUString& rId ) { msCurrentPageId
= rId; SwitchPage(rId ); }
+ const OUString& GetCurPageId() const { return msCurrentPageId; }
+ void ShowPage( const OUString& rId );
/// gives via map converted local slots if applicable
WhichRangesContainer GetInputRanges( const SfxItemPool& );
diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index 1d2c5cb0a534..836470ab2286 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -108,7 +108,7 @@ class SvxAreaTabDialog final : public SfxTabDialogController
ChangeType mnGradientListState;
ChangeType mnHatchingListState;
- virtual void PageCreated(const OString& rId, SfxTabPage &rPage)
override;
+ virtual void PageCreated(const OUString& rId, SfxTabPage &rPage)
override;
virtual short Ok() override;
DECL_LINK(CancelHdlImpl, weld::Button&, void);
diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx
index 7e4d7798f563..1122a2017f00 100644
--- a/cui/source/inc/cuitabline.hxx
+++ b/cui/source/inc/cuitabline.hxx
@@ -54,7 +54,7 @@ class SvxLineTabDialog final : public SfxTabDialogController
sal_Int32 nPosDashLb;
sal_Int32 nPosLineEndLb;
- virtual void PageCreated(const OString& rId, SfxTabPage &rPage)
override;
+ virtual void PageCreated(const OUString& rId, SfxTabPage &rPage)
override;
virtual short Ok() override;
DECL_LINK(CancelHdlImpl, weld::Button&, void);
@@ -170,7 +170,7 @@ private:
std::unique_ptr<weld::CheckButton> m_xSymbolRatioCB;
// handler for gallery popup menu button + size
- DECL_LINK(GraphicHdl_Impl, const OString&, void);
+ DECL_LINK(GraphicHdl_Impl, const OUString&, void);
DECL_LINK(SizeHdl_Impl, weld::MetricSpinButton&, void);
DECL_LINK(MenuCreateHdl_Impl, weld::Toggleable&, void);
DECL_LINK(RatioHdl_Impl, weld::Toggleable&, void);
diff --git a/cui/source/inc/dlgname.hxx b/cui/source/inc/dlgname.hxx
index 0baa56b61948..414540222c7d 100644
--- a/cui/source/inc/dlgname.hxx
+++ b/cui/source/inc/dlgname.hxx
@@ -66,7 +66,7 @@ public:
m_xBtnOK->set_tooltip_text(rLink.Call(*this));
}
- void SetEditHelpId(const OString& aHelpId) {
m_xEdtName->set_help_id(aHelpId); }
+ void SetEditHelpId(const OUString& aHelpId) {
m_xEdtName->set_help_id(aHelpId); }
};
/** #i68101#
diff --git a/cui/source/inc/helpids.h b/cui/source/inc/helpids.h
index f82e0a1c8166..b17932ffa558 100644
--- a/cui/source/inc/helpids.h
+++ b/cui/source/inc/helpids.h
@@ -18,35 +18,36 @@
*/
#pragma once
-#include <rtl/string.hxx>
+#include <rtl/ustring.hxx>
-inline constexpr OStringLiteral HID_OPTIONS_COLORCONFIG_SAVE_SCHEME
- = "CUI_HID_OPTIONS_COLORCONFIG_SAVE_SCHEME";
-inline constexpr OStringLiteral HID_OFA_FONT_SUBST_CLB =
"CUI_HID_OFA_FONT_SUBST_CLB";
-inline constexpr OStringLiteral HID_DBPATH_CTL_PATH =
"CUI_HID_DBPATH_CTL_PATH";
+inline constexpr OUStringLiteral HID_OPTIONS_COLORCONFIG_SAVE_SCHEME
+ = u"CUI_HID_OPTIONS_COLORCONFIG_SAVE_SCHEME";
+inline constexpr OUStringLiteral HID_OFA_FONT_SUBST_CLB =
u"CUI_HID_OFA_FONT_SUBST_CLB";
+inline constexpr OUStringLiteral HID_DBPATH_CTL_PATH =
u"CUI_HID_DBPATH_CTL_PATH";
#define HID_DBPATH_HEADERBAR "CUI_HID_DBPATH_HEADERBAR"
-inline constexpr OStringLiteral HID_OFADLG_TREELISTBOX =
"CUI_HID_OFADLG_TREELISTBOX";
-inline constexpr OStringLiteral HID_SVX_CONFIG_TOOLBAR =
"CUI_HID_SVX_CONFIG_TOOLBAR";
-inline constexpr OStringLiteral HID_SVX_CONFIG_TOOLBAR_CONTENTS
- = "CUI_HID_SVX_CONFIG_TOOLBAR_CONTENTS";
-inline constexpr OStringLiteral HID_SVX_CONFIG_NOTEBOOKBAR_CONTENTS
- = "CUI_HID_SVX_CONFIG_NOTEBOOKBAR_CONTENTS";
-inline constexpr OStringLiteral HID_HANGULDLG_SUGGESTIONS_GRID
- = "CUI_HID_HANGULDLG_SUGGESTIONS_GRID";
-inline constexpr OStringLiteral HID_HANGULDLG_SUGGESTIONS_LIST
- = "CUI_HID_HANGULDLG_SUGGESTIONS_LIST";
-inline constexpr OStringLiteral HID_SVX_CONFIG_NAME_SUBMENU =
"CUI_HID_SVX_CONFIG_NAME_SUBMENU";
-inline constexpr OStringLiteral HID_SVX_CONFIG_RENAME_MENU =
"CUI_HID_SVX_CONFIG_RENAME_MENU";
-inline constexpr OStringLiteral HID_SVX_CONFIG_RENAME_MENU_ITEM
- = "CUI_HID_SVX_CONFIG_RENAME_MENU_ITEM";
-inline constexpr OStringLiteral HID_SVX_CONFIG_RENAME_TOOLBAR =
"CUI_HID_SVX_CONFIG_RENAME_TOOLBAR";
-inline constexpr OStringLiteral HID_SVX_CONFIG_RENAME_TOOLBAR_ITEM
- = "CUI_HID_SVX_CONFIG_RENAME_TOOLBAR_ITEM";
-inline constexpr OStringLiteral HID_SVX_UP_TOOLBAR_ITEM =
"CUI_HID_SVX_UP_TOOLBAR_ITEM";
-inline constexpr OStringLiteral HID_SVX_DOWN_TOOLBAR_ITEM =
"CUI_HID_SVX_DOWN_TOOLBAR_ITEM";
-inline constexpr OStringLiteral HID_SVX_SAVE_IN = "CUI_HID_SVX_SAVE_IN";
-inline constexpr OStringLiteral HID_SVX_TOPLEVELLISTBOX =
"CUI_HID_SVX_TOPLEVELLISTBOX";
-inline constexpr OStringLiteral HID_SVX_DESCFIELD = "CUI_HID_SVX_DESCFIELD";
-inline constexpr OStringLiteral HID_MACRO_HEADERTABLISTBOX =
"CUI_HID_MACRO_HEADERTABLISTBOX";
+inline constexpr OUStringLiteral HID_OFADLG_TREELISTBOX =
u"CUI_HID_OFADLG_TREELISTBOX";
+inline constexpr OUStringLiteral HID_SVX_CONFIG_TOOLBAR =
u"CUI_HID_SVX_CONFIG_TOOLBAR";
+inline constexpr OUStringLiteral HID_SVX_CONFIG_TOOLBAR_CONTENTS
+ = u"CUI_HID_SVX_CONFIG_TOOLBAR_CONTENTS";
+inline constexpr OUStringLiteral HID_SVX_CONFIG_NOTEBOOKBAR_CONTENTS
+ = u"CUI_HID_SVX_CONFIG_NOTEBOOKBAR_CONTENTS";
+inline constexpr OUStringLiteral HID_HANGULDLG_SUGGESTIONS_GRID
+ = u"CUI_HID_HANGULDLG_SUGGESTIONS_GRID";
+inline constexpr OUStringLiteral HID_HANGULDLG_SUGGESTIONS_LIST
+ = u"CUI_HID_HANGULDLG_SUGGESTIONS_LIST";
+inline constexpr OUStringLiteral HID_SVX_CONFIG_NAME_SUBMENU =
u"CUI_HID_SVX_CONFIG_NAME_SUBMENU";
+inline constexpr OUStringLiteral HID_SVX_CONFIG_RENAME_MENU =
u"CUI_HID_SVX_CONFIG_RENAME_MENU";
+inline constexpr OUStringLiteral HID_SVX_CONFIG_RENAME_MENU_ITEM
+ = u"CUI_HID_SVX_CONFIG_RENAME_MENU_ITEM";
+inline constexpr OUStringLiteral HID_SVX_CONFIG_RENAME_TOOLBAR
+ = u"CUI_HID_SVX_CONFIG_RENAME_TOOLBAR";
+inline constexpr OUStringLiteral HID_SVX_CONFIG_RENAME_TOOLBAR_ITEM
+ = u"CUI_HID_SVX_CONFIG_RENAME_TOOLBAR_ITEM";
+inline constexpr OUStringLiteral HID_SVX_UP_TOOLBAR_ITEM =
u"CUI_HID_SVX_UP_TOOLBAR_ITEM";
+inline constexpr OUStringLiteral HID_SVX_DOWN_TOOLBAR_ITEM =
u"CUI_HID_SVX_DOWN_TOOLBAR_ITEM";
+inline constexpr OUStringLiteral HID_SVX_SAVE_IN = u"CUI_HID_SVX_SAVE_IN";
+inline constexpr OUStringLiteral HID_SVX_TOPLEVELLISTBOX =
u"CUI_HID_SVX_TOPLEVELLISTBOX";
+inline constexpr OUStringLiteral HID_SVX_DESCFIELD = u"CUI_HID_SVX_DESCFIELD";
+inline constexpr OUStringLiteral HID_MACRO_HEADERTABLISTBOX =
u"CUI_HID_MACRO_HEADERTABLISTBOX";
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/inc/hltpbase.hxx b/cui/source/inc/hltpbase.hxx
index e3c399bd48b5..f0f7ef751997 100644
--- a/cui/source/inc/hltpbase.hxx
+++ b/cui/source/inc/hltpbase.hxx
@@ -94,7 +94,7 @@ public:
weld::Container* pParent,
SvxHpLinkDlg* pDlg,
const OUString& rUIXMLDescription,
- const OString& rID,
+ const OUString& rID,
const SfxItemSet* pItemSet
);
virtual ~SvxHyperlinkTabPageBase () override;
diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx
index 6367016fe8b5..e31aaa74e0db 100644
--- a/cui/source/inc/iconcdlg.hxx
+++ b/cui/source/inc/iconcdlg.hxx
@@ -44,12 +44,12 @@ private:
protected:
- IconChoicePage(weld::Container* pParent, const OUString&
rUIXMLDescription, const OString& rID, const SfxItemSet* pItemSet);
+ IconChoicePage(weld::Container* pParent, const OUString&
rUIXMLDescription, const OUString& rID, const SfxItemSet* pItemSet);
public:
virtual ~IconChoicePage();
- OString GetHelpId() const { return xContainer->get_help_id(); }
+ OUString GetHelpId() const { return xContainer->get_help_id(); }
const SfxItemSet& GetItemSet() const { return *pSet; }
@@ -67,12 +67,12 @@ public:
/// Data-structure for pages in dialog
struct IconChoicePageData
{
- OString sId;
+ OUString sId;
std::unique_ptr<IconChoicePage> xPage; ///< the TabPage itself
bool bRefresh; ///< Flag: page has to be newly initialized
// constructor
- IconChoicePageData(OString aId, std::unique_ptr<IconChoicePage> xInPage)
+ IconChoicePageData(OUString aId, std::unique_ptr<IconChoicePage> xInPage)
: sId(std::move(aId))
, xPage(std::move(xInPage))
, bRefresh(false)
diff --git a/cui/source/inc/insdlg.hxx b/cui/source/inc/insdlg.hxx
index 4938314a3cd3..61c707507087 100644
--- a/cui/source/inc/insdlg.hxx
+++ b/cui/source/inc/insdlg.hxx
@@ -36,12 +36,12 @@ protected:
comphelper::EmbeddedObjectContainer aCnt;
InsertObjectDialog_Impl(weld::Window * pParent,
- const OUString& rUIXMLDescription, const OString& rID,
+ const OUString& rUIXMLDescription, const OUString& rID,
css::uno::Reference < css::embed::XStorage > xStorage);
public:
const css::uno::Reference<css::embed::XEmbeddedObject>& GetObject() const
{ return m_xObj; }
virtual css::uno::Reference<css::io::XInputStream>
GetIconIfIconified(OUString* pGraphicMediaType);
- void SetHelpId(const OString& rHelpId) { m_xDialog->set_help_id(rHelpId); }
+ void SetHelpId(const OUString& rHelpId) { m_xDialog->set_help_id(rHelpId);
}
virtual bool IsCreateNew() const;
};
diff --git a/cui/source/inc/insrc.hxx b/cui/source/inc/insrc.hxx
index e003795383dc..597ef172c3e9 100644
--- a/cui/source/inc/insrc.hxx
+++ b/cui/source/inc/insrc.hxx
@@ -30,7 +30,7 @@ private:
std::unique_ptr<weld::RadioButton> m_xAfterBtn;
public:
- SvxInsRowColDlg(weld::Window* pParent, bool bCol, const OString& rHelpId);
+ SvxInsRowColDlg(weld::Window* pParent, bool bCol, const OUString& rHelpId);
virtual short Execute() override;
diff --git a/cui/source/inc/labdlg.hxx b/cui/source/inc/labdlg.hxx
index 8146ec388f53..5d7f778d5c38 100644
--- a/cui/source/inc/labdlg.hxx
+++ b/cui/source/inc/labdlg.hxx
@@ -102,7 +102,7 @@ private:
Link<SvxSwFrameValidation&,void> aValidateLink;
- virtual void PageCreated(const OString& rId, SfxTabPage &rPage) override;
+ virtual void PageCreated(const OUString& rId, SfxTabPage &rPage) override;
public:
SvxCaptionTabDialog(weld::Window* pParent, const SdrView* pView,
diff --git a/cui/source/inc/macropg.hxx b/cui/source/inc/macropg.hxx
index cecdf3b55224..2f2471bb09eb 100644
--- a/cui/source/inc/macropg.hxx
+++ b/cui/source/inc/macropg.hxx
@@ -71,7 +71,7 @@ protected:
bool bDocModified, bAppEvents, bInitialized;
std::vector< EventDisplayName > aDisplayNames;
- SvxMacroTabPage_(weld::Container* pPage, weld::DialogController*
pController, const OUString& rUIXMLDescription, const OString& rID, const
SfxItemSet& rItemSet);
+ SvxMacroTabPage_(weld::Container* pPage, weld::DialogController*
pController, const OUString& rUIXMLDescription, const OUString& rID, const
SfxItemSet& rItemSet);
void EnableButtons();
static css::uno::Any GetPropsByName( const OUString& eventName,
EventsHash& eventsHash );
diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx
index 8f554722fa67..dd1dfbaf31c6 100644
--- a/cui/source/inc/numpages.hxx
+++ b/cui/source/inc/numpages.hxx
@@ -265,7 +265,7 @@ class SvxNumOptionsTabPage : public SfxTabPage
DECL_LINK(LevelHdl_Impl, weld::TreeView&, void);
DECL_LINK(LevelHdl, void *, void);
DECL_LINK(PopupActivateHdl_Impl, weld::Toggleable&, void);
- DECL_LINK(GraphicHdl_Impl, const OString&, void);
+ DECL_LINK(GraphicHdl_Impl, const OUString&, void);
DECL_LINK(BulletHdl_Impl, weld::Button&, void);
DECL_LINK(SizeHdl_Impl, weld::MetricSpinButton&, void);
DECL_LINK(RatioHdl_Impl, weld::Toggleable&, void);
diff --git a/cui/source/inc/sdrcelldlg.hxx b/cui/source/inc/sdrcelldlg.hxx
index c8fcbf704095..aac8d982b454 100644
--- a/cui/source/inc/sdrcelldlg.hxx
+++ b/cui/source/inc/sdrcelldlg.hxx
@@ -40,7 +40,7 @@ private:
public:
SvxFormatCellsDialog(weld::Window* pParent, const SfxItemSet* pAttr, const
SdrModel& rModel, bool bStyle);
- virtual void PageCreated(const OString& rId, SfxTabPage &rPage) override;
+ virtual void PageCreated(const OUString& rId, SfxTabPage &rPage) override;
};
diff --git a/cui/source/inc/srchxtra.hxx b/cui/source/inc/srchxtra.hxx
index e95fccd413fd..712abc8b55bc 100644
--- a/cui/source/inc/srchxtra.hxx
+++ b/cui/source/inc/srchxtra.hxx
@@ -30,7 +30,7 @@ public:
virtual ~SvxSearchFormatDialog() override;
protected:
- virtual void PageCreated(const OString& rId, SfxTabPage &rPage) override;
+ virtual void PageCreated(const OUString& rId, SfxTabPage &rPage) override;
private:
std::unique_ptr<FontList> m_pFontList;
diff --git a/cui/source/inc/textanim.hxx b/cui/source/inc/textanim.hxx
index 8f4767e22fe8..010d3954716c 100644
--- a/cui/source/inc/textanim.hxx
+++ b/cui/source/inc/textanim.hxx
@@ -96,7 +96,7 @@ class SvxTextTabDialog : public SfxTabDialogController
private:
const SdrView* pView;
- virtual void PageCreated(const OString& rId, SfxTabPage &rPage)
override;
+ virtual void PageCreated(const OUString& rId, SfxTabPage &rPage)
override;
public:
SvxTextTabDialog(weld::Window* pParent, const SfxItemSet* pAttr, const
SdrView* pView);
diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx
index 30b789dc73c4..0a30b720fc81 100644
--- a/cui/source/inc/transfrm.hxx
+++ b/cui/source/inc/transfrm.hxx
@@ -41,7 +41,7 @@ private:
SvxAnchorIds nAnchorCtrls;
Link<SvxSwFrameValidation&,void> aValidateLink;
- virtual void PageCreated(const OString& rId, SfxTabPage &rPage)
override;
+ virtual void PageCreated(const OUString& rId, SfxTabPage &rPage)
override;
public:
SvxTransformTabDialog(weld::Window* pParent, const SfxItemSet* pAttr,
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index 15d3dadcf244..335c517622b5 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -62,7 +62,7 @@ struct
// group
Group eGroup;
// .ui group name
- const char *pGroup;
+ OUString pGroup;
}
const vGroupInfo[] =
{
@@ -82,9 +82,9 @@ struct
// group
Group eGroup;
//checkbox (or simple text)
- const char *pText;
+ OUString pText;
//color listbox
- const char *pColor;
+ OUString pColor;
// has checkbox?
bool bCheckBox;
}
@@ -235,7 +235,7 @@ private:
// text
std::unique_ptr<weld::Label> m_xText;
public:
- Chapter(weld::Builder& rBuilder, const char* pLabelWidget, bool bShow);
+ Chapter(weld::Builder& rBuilder, const OUString& pLabelWidget, bool
bShow);
void SetText(const OUString& rLabel) { m_xText->set_label(rLabel); }
};
@@ -243,7 +243,7 @@ private:
// text (checkbox) + color list box
struct Entry
{
- Entry(weld::Window* pTopLevel, weld::Builder& rBuilder, const char*
pTextWidget, const char* pColorWidget,
+ Entry(weld::Window* pTopLevel, weld::Builder& rBuilder, const
OUString& pTextWidget, const OUString& pColorWidget,
const Color& rColor, int nCheckBoxLabelOffset, const
ColorListBox* pCache, bool bCheckBox, bool bShow);
void SetText(const OUString& rLabel) {
dynamic_cast<weld::Label&>(*m_xText).set_label(rLabel); }
int get_height_request() const
@@ -305,7 +305,7 @@ private:
// ctor for default groups
// rParent: parent window (ColorConfigWindow_Impl)
// eGroup: which group is this?
-ColorConfigWindow_Impl::Chapter::Chapter(weld::Builder& rBuilder, const char*
pLabelWidget, bool bShow)
+ColorConfigWindow_Impl::Chapter::Chapter(weld::Builder& rBuilder, const
OUString& pLabelWidget, bool bShow)
: m_xText(rBuilder.weld_label(pLabelWidget))
{
if (!bShow)
@@ -314,7 +314,7 @@ ColorConfigWindow_Impl::Chapter::Chapter(weld::Builder&
rBuilder, const char* pL
// ColorConfigWindow_Impl::Entry
ColorConfigWindow_Impl::Entry::Entry(weld::Window* pTopLevel, weld::Builder&
rBuilder,
- const char* pTextWidget, const char*
pColorWidget,
+ const OUString& pTextWidget, const
OUString& pColorWidget,
const Color& rColor, int
nCheckBoxLabelOffset,
const ColorListBox* pCache, bool
bCheckBox, bool bShow)
: m_xColorList(new ColorListBox(rBuilder.weld_menu_button(pColorWidget),
diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx
index 0940894216bb..b3fb5cb02baf 100644
--- a/cui/source/options/optgenrl.cxx
+++ b/cui/source/options/optgenrl.cxx
@@ -80,7 +80,7 @@ namespace Lang
struct
{
// id of the text
- const char *pTextId;
+ OUString pTextId;
// language flags (see Lang above):
// which language is this row for?
unsigned nLangFlags;
@@ -110,7 +110,7 @@ struct
// in which row?
RowType eRow;
// id of the edit box
- const char *pEditId;
+ OUString pEditId;
// id for SvtUserOptions in unotools/useroptions.hxx
UserOptToken nUserOptionsId;
// id for settings the focus (defined in svx/optgenrl.hxx)
diff --git a/cui/source/options/personalization.cxx
b/cui/source/options/personalization.cxx
index 3cc3aab9a9ef..c1ee526574e6 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -37,7 +37,7 @@
SvxPersonalizationTabPage::SvxPersonalizationTabPage(weld::Container* pPage,
{
for (sal_uInt32 i = 0; i < MAX_DEFAULT_PERSONAS; ++i)
{
- OString sDefaultId("default" + OString::number(i));
+ OUString sDefaultId("default" + OUString::number(i));
m_vDefaultPersonaImages[i] =
m_xBuilder->weld_toggle_button(sDefaultId);
m_vDefaultPersonaImages[i]->connect_clicked(
LINK(this, SvxPersonalizationTabPage, DefaultPersona));
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 93f4432d16ee..be7bcda79227 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -653,8 +653,8 @@ IMPL_LINK_NOARG(OfaTreeOptionsDialog, HelpHdl_Impl,
weld::Widget&, bool)
OptionsPageInfo* pPageInfo =
weld::fromId<OptionsPageInfo*>(xTreeLB->get_id(*xCurrentPageEntry));
if (pPageInfo->m_xPage)
{
- OString sHelpId(pPageInfo->m_xPage->GetHelpId());
- pHelp->Start(OStringToOUString(sHelpId, RTL_TEXTENCODING_UTF8),
m_xDialog.get());
+ OUString sHelpId(pPageInfo->m_xPage->GetHelpId());
+ pHelp->Start(sHelpId, m_xDialog.get());
return false;
}
}
@@ -985,7 +985,7 @@ void OfaTreeOptionsDialog::SelectHdl_Impl()
pNewPage = pPageInfo->m_xPage.get();
// fdo#58170 use current page's layout child HelpId, unless there isn't a
current page
- OString sHelpId(pNewPage ? pNewPage->GetHelpId() : OString());
+ OUString sHelpId(pNewPage ? pNewPage->GetHelpId() : OUString());
if (sHelpId.isEmpty())
sHelpId = HID_OFADLG_TREELISTBOX;
xTreeLB->set_help_id(sHelpId);
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 446775c6abad..aea3f7d9727e 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -167,7 +167,7 @@ IMPL_LINK_NOARG(OfaAutoCorrDlg, SelectLanguageHdl,
weld::ComboBox&, void)
if(eNewLang == eLastDialogLanguage)
return;
- OString sPageId = GetCurPageId();
+ OUString sPageId = GetCurPageId();
if (sPageId == "replace")
{
OfaAutocorrReplacePage* pPage =
static_cast<OfaAutocorrReplacePage*>(GetTabPage(sPageId));
diff --git a/cui/source/tabpages/bbdlg.cxx b/cui/source/tabpages/bbdlg.cxx
index 488fc5283a6b..9fc59604476e 100644
--- a/cui/source/tabpages/bbdlg.cxx
+++ b/cui/source/tabpages/bbdlg.cxx
@@ -33,8 +33,8 @@ SvxBorderBackgroundDlg::SvxBorderBackgroundDlg(weld::Window
*pParent,
? OUString("cui/ui/borderareatransparencydialog.ui")
: OUString("cui/ui/borderbackgrounddialog.ui"),
bEnableDrawingLayerFillStyles
- ? OString("BorderAreaTransparencyDialog")
- : OString("BorderBackgroundDialog"),
+ ? OUString("BorderAreaTransparencyDialog")
+ : OUString("BorderBackgroundDialog"),
&rCoreSet)
, mbEnableBackgroundSelector(bEnableSelector)
{
@@ -51,7 +51,7 @@ SvxBorderBackgroundDlg::SvxBorderBackgroundDlg(weld::Window
*pParent,
}
}
-void SvxBorderBackgroundDlg::PageCreated(const OString& rPageId, SfxTabPage&
rTabPage)
+void SvxBorderBackgroundDlg::PageCreated(const OUString& rPageId, SfxTabPage&
rTabPage)
{
if (rPageId == "background")
{
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 7f418a762047..0c600f83ab24 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -132,7 +132,7 @@ inline SvxFont& SvxCharBasePage::GetPreviewCTLFont()
return m_aPreviewWin.GetCTLFont();
}
-SvxCharBasePage::SvxCharBasePage(weld::Container* pPage,
weld::DialogController* pController, const OUString& rUIXMLDescription, const
OString& rID, const SfxItemSet& rItemset)
+SvxCharBasePage::SvxCharBasePage(weld::Container* pPage,
weld::DialogController* pController, const OUString& rUIXMLDescription, const
OUString& rID, const SfxItemSet& rItemset)
: SfxTabPage(pPage, pController, rUIXMLDescription, rID, &rItemset)
, m_bPreviewBackgroundToCharacter( false )
{
diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx
index cb048426c73a..c5661586472c 100644
--- a/cui/source/tabpages/labdlg.cxx
+++ b/cui/source/tabpages/labdlg.cxx
@@ -474,7 +474,7 @@ SvxCaptionTabDialog::SvxCaptionTabDialog(weld::Window*
pParent, const SdrView* p
SvxCaptionTabPage::GetRanges );
}
-void SvxCaptionTabDialog::PageCreated(const OString& rId, SfxTabPage &rPage)
+void SvxCaptionTabDialog::PageCreated(const OUString& rId, SfxTabPage &rPage)
{
if (rId == "RID_SVXPAGE_POSITION_SIZE")
{
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 348d96e339e8..2179ad2cf107 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -1796,14 +1796,14 @@ IMPL_LINK(SvxNumOptionsTabPage, BulRelSizeHdl_Impl,
weld::MetricSpinButton&, rFi
SetModified();
}
-IMPL_LINK(SvxNumOptionsTabPage, GraphicHdl_Impl, const OString&, rIdent, void)
+IMPL_LINK(SvxNumOptionsTabPage, GraphicHdl_Impl, const OUString&, rIdent, void)
{
OUString aGrfName;
Size aSize;
bool bSucc(false);
SvxOpenGraphicDialog aGrfDlg(CuiResId(RID_CUISTR_EDIT_GRAPHIC),
GetFrameWeld());
- OString sNumber;
+ OUString sNumber;
if (rIdent.startsWith("gallery", &sNumber))
{
auto idx = sNumber.toUInt32();
diff --git a/cui/source/tabpages/tabarea.cxx b/cui/source/tabpages/tabarea.cxx
index d03199c7b982..9b082680fcee 100644
--- a/cui/source/tabpages/tabarea.cxx
+++ b/cui/source/tabpages/tabarea.cxx
@@ -222,7 +222,7 @@ IMPL_LINK_NOARG(SvxAreaTabDialog, CancelHdlImpl,
weld::Button&, void)
m_xDialog->response(RET_CANCEL);
}
-void SvxAreaTabDialog::PageCreated(const OString& rId, SfxTabPage &rPage)
+void SvxAreaTabDialog::PageCreated(const OUString& rId, SfxTabPage &rPage)
{
if (rId == "RID_SVXPAGE_AREA")
{
diff --git a/cui/source/tabpages/tabline.cxx b/cui/source/tabpages/tabline.cxx
index 1cf54885047d..ac6cadd51109 100644
--- a/cui/source/tabpages/tabline.cxx
+++ b/cui/source/tabpages/tabline.cxx
@@ -160,7 +160,7 @@ IMPL_LINK_NOARG(SvxLineTabDialog, CancelHdlImpl,
weld::Button&, void)
m_xDialog->response(RET_CANCEL);
}
-void SvxLineTabDialog::PageCreated(const OString& rId, SfxTabPage &rPage)
+void SvxLineTabDialog::PageCreated(const OUString& rId, SfxTabPage &rPage)
{
if (rId == "RID_SVXPAGE_LINE")
{
diff --git a/cui/source/tabpages/textanim.cxx b/cui/source/tabpages/textanim.cxx
index e086969bbbd1..b5ba3d90ce62 100644
--- a/cui/source/tabpages/textanim.cxx
+++ b/cui/source/tabpages/textanim.cxx
@@ -53,7 +53,7 @@ SvxTextTabDialog::SvxTextTabDialog(weld::Window* pParent,
const SfxItemSet* pAtt
|*
\************************************************************************/
-void SvxTextTabDialog::PageCreated(const OString& rId, SfxTabPage &rPage)
+void SvxTextTabDialog::PageCreated(const OUString& rId, SfxTabPage &rPage)
{
if (rId != "RID_SVXPAGE_TEXTATTR")
return;
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index 85efe01a1c2f..06e95d3fdcaf 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -1517,7 +1517,7 @@ IMPL_LINK_NOARG(SvxLineTabPage, MenuCreateHdl_Impl,
weld::Toggleable&, void)
// #58425# Symbols on a list (e.g. StarChart)
// Handler for menu button
-IMPL_LINK(SvxLineTabPage, GraphicHdl_Impl, const OString&, rIdent, void)
+IMPL_LINK(SvxLineTabPage, GraphicHdl_Impl, const OUString&, rIdent, void)
{
const Graphic* pGraphic = nullptr;
Graphic aGraphic;
@@ -1525,7 +1525,7 @@ IMPL_LINK(SvxLineTabPage, GraphicHdl_Impl, const
OString&, rIdent, void)
bool bEnable = true;
tools::Long nPreviousSymbolType = m_nSymbolType;
- OString sNumber;
+ OUString sNumber;
if (rIdent.startsWith("gallery", &sNumber))
{
SvxBmpItemInfo* pInfo = m_aGalleryBrushItems[sNumber.toUInt32()].get();
diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx
index 40f54d302a3f..05fd9e56704f 100644
--- a/cui/source/tabpages/transfrm.cxx
+++ b/cui/source/tabpages/transfrm.cxx
@@ -93,7 +93,7 @@ SvxTransformTabDialog::SvxTransformTabDialog(weld::Window*
pParent, const SfxIte
}
-void SvxTransformTabDialog::PageCreated(const OString& rId, SfxTabPage &rPage)
+void SvxTransformTabDialog::PageCreated(const OUString& rId, SfxTabPage &rPage)
{
if (rId == "RID_SVXPAGE_POSITION_SIZE")
{
@@ -386,11 +386,11 @@ SvxSlantTabPage::SvxSlantTabPage(weld::Container* pPage,
weld::DialogController*
{
for (int i = 0; i < 2; ++i)
{
- m_aControlGroups[i] = m_xBuilder->weld_widget("controlgroups" +
OString::number(i+1));
- m_aControlGroupX[i] = m_xBuilder->weld_widget("controlgroupx" +
OString::number(i+1));
- m_aControlX[i] = m_xBuilder->weld_metric_spin_button("controlx" +
OString::number(i+1), FieldUnit::CM);
- m_aControlGroupY[i] = m_xBuilder->weld_widget("controlgroupy" +
OString::number(i+1));
- m_aControlY[i] = m_xBuilder->weld_metric_spin_button("controly" +
OString::number(i+1), FieldUnit::CM);
+ m_aControlGroups[i] = m_xBuilder->weld_widget("controlgroups" +
OUString::number(i+1));
+ m_aControlGroupX[i] = m_xBuilder->weld_widget("controlgroupx" +
OUString::number(i+1));
+ m_aControlX[i] = m_xBuilder->weld_metric_spin_button("controlx" +
OUString::number(i+1), FieldUnit::CM);
+ m_aControlGroupY[i] = m_xBuilder->weld_widget("controlgroupy" +
OUString::number(i+1));
+ m_aControlY[i] = m_xBuilder->weld_metric_spin_button("controly" +
OUString::number(i+1), FieldUnit::CM);
}
// this page needs ExchangeSupport
diff --git a/dbaccess/inc/helpids.h b/dbaccess/inc/helpids.h
index 2c013c173397..4757d5d4b3f1 100644
--- a/dbaccess/inc/helpids.h
+++ b/dbaccess/inc/helpids.h
@@ -20,93 +20,93 @@
#ifndef INCLUDED_DBACCESS_INC_HELPIDS_H
#define INCLUDED_DBACCESS_INC_HELPIDS_H
-#include <rtl/string.hxx>
-
-inline constexpr OStringLiteral HID_DATABROWSE_HEADER =
"DBACCESS_HID_DATABROWSE_HEADER";
-inline constexpr OStringLiteral HID_CTL_TABBROWSER =
"DBACCESS_HID_CTL_TABBROWSER";
-inline constexpr OStringLiteral HID_CTL_TREEVIEW = "DBACCESS_HID_CTL_TREEVIEW";
-
-inline constexpr OStringLiteral HID_DSADMIN_BROWSECONN =
"DBACCESS_HID_DSADMIN_BROWSECONN";
-
-inline constexpr OStringLiteral HID_CTL_QRYSQLEDIT =
"DBACCESS_HID_CTL_QRYSQLEDIT";
-
-inline constexpr OStringLiteral HID_CTL_QRYDGNTAB =
"DBACCESS_HID_CTL_QRYDGNTAB";
-inline constexpr OStringLiteral HID_CTL_QRYDGNCRIT =
"DBACCESS_HID_CTL_QRYDGNCRIT";
-inline constexpr OStringLiteral HID_QRYDGN_ROW_VISIBLE =
"DBACCESS_HID_QRYDGN_ROW_VISIBLE";
-inline constexpr OStringLiteral HID_QRYDGN_ROW_TABLE =
"DBACCESS_HID_QRYDGN_ROW_TABLE";
-inline constexpr OStringLiteral HID_QRYDGN_ROW_FIELD =
"DBACCESS_HID_QRYDGN_ROW_FIELD";
-inline constexpr OStringLiteral HID_QRYDGN_ROW_ORDER =
"DBACCESS_HID_QRYDGN_ROW_ORDER";
-inline constexpr OStringLiteral HID_QRYDGN_ROW_FUNCTION =
"DBACCESS_HID_QRYDGN_ROW_FUNCTION";
-inline constexpr OStringLiteral HID_QRYDGN_ROW_ALIAS =
"DBACCESS_HID_QRYDGN_ROW_ALIAS";
-inline constexpr OStringLiteral HID_QRYDGN_ROW_CRIT =
"DBACCESS_HID_QRYDGN_ROW_CRIT";
-
-inline constexpr OStringLiteral HID_TAB_DESIGN_FIELDCONTROL =
"DBACCESS_HID_TAB_DESIGN_FIELDCONTROL";
-inline constexpr OStringLiteral HID_TAB_DESIGN_DESCWIN =
"DBACCESS_HID_TAB_DESIGN_DESCWIN";
-inline constexpr OStringLiteral HID_TABDESIGN_BACKGROUND =
"DBACCESS_HID_TABDESIGN_BACKGROUND";
-inline constexpr OStringLiteral HID_CTL_TABLEEDIT =
"DBACCESS_HID_CTL_TABLEEDIT";
-inline constexpr OStringLiteral HID_TABDESIGN_NAMECELL =
"DBACCESS_HID_TABDESIGN_NAMECELL";
-inline constexpr OStringLiteral HID_TABDESIGN_TYPECELL =
"DBACCESS_HID_TABDESIGN_TYPECELL";
-inline constexpr OStringLiteral HID_TABDESIGN_COMMENTCELL =
"DBACCESS_HID_TABDESIGN_COMMENTCELL";
-inline constexpr OStringLiteral HID_TAB_DESIGN_HELP_TEXT_FRAME =
"DBACCESS_HID_TAB_DESIGN_HELP_TEXT_FRAME";
-inline constexpr OStringLiteral HID_TAB_ENT_DEFAULT =
"DBACCESS_HID_TAB_ENT_DEFAULT";
-inline constexpr OStringLiteral HID_TAB_ENT_FORMAT_SAMPLE =
"DBACCESS_HID_TAB_ENT_FORMAT_SAMPLE";
-inline constexpr OStringLiteral HID_TAB_ENT_FORMAT =
"DBACCESS_HID_TAB_ENT_FORMAT";
-inline constexpr OStringLiteral HID_TAB_ENT_BOOL_DEFAULT =
"DBACCESS_HID_TAB_ENT_BOOL_DEFAULT";
-inline constexpr OStringLiteral HID_TAB_ENT_REQUIRED =
"DBACCESS_HID_TAB_ENT_REQUIRED";
-inline constexpr OStringLiteral HID_TAB_ENT_AUTOINCREMENT =
"DBACCESS_HID_TAB_ENT_AUTOINCREMENT";
-inline constexpr OStringLiteral HID_TAB_ENT_TEXT_LEN =
"DBACCESS_HID_TAB_ENT_TEXT_LEN";
-inline constexpr OStringLiteral HID_TAB_ENT_TYPE = "DBACCESS_HID_TAB_ENT_TYPE";
-inline constexpr OStringLiteral HID_TAB_ENT_COLUMNNAME =
"DBACCESS_HID_TAB_ENT_COLUMNNAME";
-inline constexpr OStringLiteral HID_TAB_ENT_NUMTYP =
"DBACCESS_HID_TAB_ENT_NUMTYP";
-inline constexpr OStringLiteral HID_TAB_ENT_LEN = "DBACCESS_HID_TAB_ENT_LEN";
-inline constexpr OStringLiteral HID_TAB_ENT_SCALE =
"DBACCESS_HID_TAB_ENT_SCALE";
-inline constexpr OStringLiteral HID_CTL_RELATIONTAB =
"DBACCESS_HID_CTL_RELATIONTAB";
-inline constexpr OStringLiteral HID_RELATIONDIALOG_LEFTFIELDCELL =
"DBACCESS_HID_RELATIONDIALOG_LEFTFIELDCELL";
-inline constexpr OStringLiteral HID_RELATIONDIALOG_RIGHTFIELDCELL =
"DBACCESS_HID_RELATIONDIALOG_RIGHTFIELDCELL";
-inline constexpr OStringLiteral HID_CONFIRM_DROP_BUTTON_ALL =
"DBACCESS_HID_CONFIRM_DROP_BUTTON_ALL";
-inline constexpr OStringLiteral HID_DSADMIN_LDAP_HOSTNAME =
"DBACCESS_HID_DSADMIN_LDAP_HOSTNAME";
-inline constexpr OStringLiteral HID_DSADMIN_MOZILLA_PROFILE_NAME =
"DBACCESS_HID_DSADMIN_MOZILLA_PROFILE_NAME";
-inline constexpr OStringLiteral HID_DSADMIN_THUNDERBIRD_PROFILE_NAME =
"DBACCESS_HID_DSADMIN_THUNDERBIRD_PROFILE_NAME";
-
-inline constexpr OStringLiteral HID_DLGINDEX_INDEXDETAILS_FIELD =
"DBACCESS_HID_DLGINDEX_INDEXDETAILS_FIELD";
-inline constexpr OStringLiteral HID_DLGINDEX_INDEXDETAILS_SORTORDER =
"DBACCESS_HID_DLGINDEX_INDEXDETAILS_SORTORDER";
-
-inline constexpr OStringLiteral HID_TAB_AUTOINCREMENTVALUE =
"DBACCESS_HID_TAB_AUTOINCREMENTVALUE";
-
-inline constexpr OStringLiteral HID_DSADMIN_DBASE_PATH =
"DBACCESS_HID_DSADMIN_DBASE_PATH";
-inline constexpr OStringLiteral HID_DSADMIN_MYSQL_DATABASE =
"DBACCESS_HID_DSADMIN_MYSQL_DATABASE";
-inline constexpr OStringLiteral HID_DSADMIN_MYSQL_ODBC_DATASOURCE =
"DBACCESS_HID_DSADMIN_MYSQL_ODBC_DATASOURCE";
-inline constexpr OStringLiteral HID_DSADMIN_ODBC_DATASOURCE =
"DBACCESS_HID_DSADMIN_ODBC_DATASOURCE";
-inline constexpr OStringLiteral HID_DSADMIN_MSACCESS_MDB_FILE =
"DBACCESS_HID_DSADMIN_MSACCESS_MDB_FILE";
-inline constexpr OStringLiteral HID_DSADMIN_FLAT_PATH =
"DBACCESS_HID_DSADMIN_FLAT_PATH";
-inline constexpr OStringLiteral HID_DSADMIN_CALC_PATH =
"DBACCESS_HID_DSADMIN_CALC_PATH";
-inline constexpr OStringLiteral HID_DSADMIN_WRITER_PATH =
"DBACCESS_HID_DSADMIN_WRITER_PATH";
-inline constexpr OStringLiteral HID_DSADMIN_ORACLE_DATABASE =
"DBACCESS_HID_DSADMIN_ORACLE_DATABASE";
-
-inline constexpr OStringLiteral HID_APP_TABLE_TREE =
"DBACCESS_HID_APP_TABLE_TREE";
-inline constexpr OStringLiteral HID_APP_FORM_TREE =
"DBACCESS_HID_APP_FORM_TREE";
-inline constexpr OStringLiteral HID_APP_QUERY_TREE =
"DBACCESS_HID_APP_QUERY_TREE";
-inline constexpr OStringLiteral HID_APP_REPORT_TREE =
"DBACCESS_HID_APP_REPORT_TREE";
... etc. - the rest is truncated
