UnoControls/source/inc/progressmonitor.hxx | 4 accessibility/inc/strings.hxx | 14 accessibility/source/standard/vclxaccessiblescrollbar.cxx | 8 avmedia/inc/bitmaps.hlst | 4 avmedia/inc/helpids.h | 22 avmedia/source/gstreamer/gstwindow.cxx | 2 basctl/inc/bitmaps.hlst | 28 basctl/inc/helpids.h | 24 basctl/inc/strings.hxx | 50 basctl/source/basicide/baside2b.cxx | 2 basctl/source/basicide/bastype2.cxx | 4 basctl/source/basicide/bastype3.cxx | 2 basctl/source/basicide/moduldl2.cxx | 2 basctl/source/inc/dlgeddef.hxx | 24 basic/source/inc/namecont.hxx | 2 chart2/inc/bitmaps.hlst | 238 - chart2/inc/unonames.hxx | 46 chart2/source/controller/inc/helpids.h | 8 chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx | 4 chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx | 4 chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx | 4 chart2/source/inc/servicenames.hxx | 44 chart2/source/inc/servicenames_charttypes.hxx | 40 chart2/source/inc/servicenames_coosystems.hxx | 4 chart2/source/model/filter/XMLFilter.cxx | 2 chart2/source/tools/StatisticsHelper.cxx | 4 chart2/source/view/main/VDataSeries.cxx | 4 compilerplugins/clang/ostr.cxx | 8 connectivity/inc/strings.hxx | 112 connectivity/source/drivers/evoab2/NDriver.hxx | 2 connectivity/source/inc/dbase/DIndex.hxx | 2 cui/inc/bitmaps.hlst | 122 cui/source/customize/macropg.cxx | 2 cui/source/dialogs/scriptdlg.cxx | 2 cui/source/inc/cfg.hxx | 28 cui/source/inc/helpids.h | 55 dbaccess/inc/bitmaps.hlst | 36 dbaccess/inc/helpids.h | 170 dbaccess/inc/strings.hxx | 469 +- dbaccess/source/core/api/RowSet.cxx | 4 dbaccess/source/core/api/SingleSelectQueryComposer.cxx | 2 dbaccess/source/core/api/columnsettings.cxx | 16 dbaccess/source/core/api/definitioncolumn.cxx | 10 dbaccess/source/core/dataaccess/databasedocument.cxx | 2 dbaccess/source/core/dataaccess/documentcontainer.cxx | 2 dbaccess/source/filter/xml/xmlExport.cxx | 22 dbaccess/source/ui/app/AppController.cxx | 2 dbaccess/source/ui/browser/unodatbr.cxx | 8 dbaccess/source/ui/dlg/ConnectionPage.cxx | 2 dbaccess/source/ui/misc/UITools.cxx | 2 dbaccess/source/ui/misc/WCopyTable.cxx | 2 dbaccess/source/ui/misc/databaseobjectview.cxx | 8 dbaccess/source/ui/uno/copytablewizard.cxx | 2 desktop/inc/bitmaps.hlst | 8 desktop/inc/strings.hxx | 2 desktop/source/deployment/registry/inc/dp_backend.h | 2 desktop/source/deployment/registry/package/dp_package.cxx | 2 desktop/source/inc/helpids.h | 4 desktop/source/lib/init.cxx | 4 extensions/inc/bitmaps.hlst | 66 extensions/inc/helpids.h | 566 +-- extensions/inc/propctrlr.h | 114 extensions/source/bibliography/toolbar.cxx | 6 extensions/source/propctrlr/cellbindinghelper.cxx | 4 extensions/source/propctrlr/formcomponenthandler.cxx | 22 extensions/source/propctrlr/formgeometryhandler.cxx | 2 extensions/source/propctrlr/formstrings.hxx | 526 +- extensions/source/propctrlr/pcrstrings.hxx | 2 extensions/source/propctrlr/selectlabeldialog.cxx | 4 extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx | 82 filter/inc/strings.hxx | 18 filter/source/config/cache/constant.hxx | 132 filter/source/svg/svgfilter.hxx | 4 filter/source/svg/svgwriter.hxx | 2 filter/source/xsltdialog/xmlfilterjar.cxx | 4 forms/source/component/Edit.cxx | 2 forms/source/component/Grid.cxx | 2 forms/source/inc/frm_strings.hxx | 456 +- forms/source/inc/services.hxx | 310 - forms/source/richtext/richtextmodel.cxx | 2 formula/inc/bitmaps.hlst | 12 fpicker/inc/bitmaps.hlst | 6 fpicker/source/office/fpdialogbase.hxx | 2 framework/inc/acceleratorconst.h | 4 framework/inc/bitmaps.hlst | 46 framework/inc/classes/actiontriggercontainer.hxx | 4 framework/inc/classes/actiontriggerpropertyset.hxx | 4 framework/inc/classes/actiontriggerseparatorpropertyset.hxx | 4 framework/inc/classes/protocolhandlercache.hxx | 2 framework/inc/classes/rootactiontriggercontainer.hxx | 2 framework/inc/jobs/jobconst.hxx | 6 framework/inc/properties.h | 44 framework/inc/services.h | 14 framework/inc/targets.h | 12 framework/inc/taskcreatordefs.hxx | 20 framework/inc/uiconfiguration/windowstateproperties.hxx | 32 framework/inc/xml/toolboxconfigurationdefines.hxx | 36 framework/source/inc/accelerators/acceleratorconfiguration.hxx | 6 framework/source/layoutmanager/helpers.hxx | 4 hwpfilter/source/hwpreader.cxx | 2 hwpfilter/source/hwpreader.hxx | 2 i18nlangtag/qa/cppunit/test_languagetag.cxx | 4 include/comphelper/documentconstants.hxx | 70 include/comphelper/mediamimetype.hxx | 2 include/comphelper/storagehelper.hxx | 16 include/editeng/itemtype.hxx | 2 include/editeng/unonames.hxx | 40 include/editeng/unoprnms.hxx | 666 +-- include/filter/msfilter/msdffimp.hxx | 2 include/framework/addonsoptions.hxx | 16 include/i18nlangtag/languagetag.hxx | 2 include/linguistic/lngprops.hxx | 2 include/linguistic/misc.hxx | 8 include/oox/dump/dumperbase.hxx | 10 include/sfx2/evntconf.hxx | 8 include/sfx2/filedlghelper.hxx | 2 include/svl/inettype.hxx | 218 - include/svl/macitem.hxx | 6 include/svtools/genericunodialog.hxx | 4 include/svtools/helpids.h | 42 include/svtools/javainteractionhandler.hxx | 2 include/svx/galleryitem.hxx | 12 include/tools/urlobj.hxx | 12 include/ucbhelper/resultset.hxx | 2 include/ucbhelper/resultsethelper.hxx | 2 include/unotools/compatibility.hxx | 4 include/unotools/linguprops.hxx | 72 include/unotools/mediadescriptor.hxx | 92 include/vcl/IconThemeInfo.hxx | 4 include/vcl/filter/PDFiumLibrary.hxx | 10 include/vcl/graphicfilter.hxx | 26 include/xmloff/ProgressBarHelper.hxx | 8 include/xmloff/XMLFilterServiceNames.h | 24 include/xmloff/families.hxx | 38 include/xmloff/maptype.hxx | 5 include/xmloff/odffields.hxx | 38 include/xmloff/txtparae.hxx | 40 include/xmloff/xmlimp.hxx | 2 include/xmloff/xmlnumfe.hxx | 2 include/xmloff/xmlnumfi.hxx | 2 include/xmlscript/xmlns.h | 12 linguistic/source/convdic.hxx | 4 lotuswordpro/source/filter/lwpfootnote.hxx | 12 package/inc/PackageConstants.hxx | 10 package/source/manifest/ManifestDefines.hxx | 120 package/source/manifest/ManifestExport.cxx | 34 package/source/zippackage/ZipPackageStream.cxx | 6 registry/source/regimpl.hxx | 2 reportdesign/inc/bitmaps.hlst | 34 reportdesign/inc/helpids.h | 106 reportdesign/inc/strings.hxx | 478 +- reportdesign/source/core/api/FixedLine.cxx | 160 reportdesign/source/core/api/FixedText.cxx | 2 reportdesign/source/core/api/FormattedField.cxx | 2 reportdesign/source/core/api/ImageControl.cxx | 134 reportdesign/source/core/api/ReportDefinition.cxx | 4 reportdesign/source/core/api/Section.cxx | 22 reportdesign/source/core/api/Shape.cxx | 6 reportdesign/source/filter/xml/xmlColumn.cxx | 6 reportdesign/source/filter/xml/xmlHelper.cxx | 40 reportdesign/source/ui/dlg/Navigator.cxx | 6 reportdesign/source/ui/inspection/GeometryHandler.cxx | 66 reportdesign/source/ui/misc/RptUndo.cxx | 4 reportdesign/source/ui/misc/UITools.cxx | 6 reportdesign/source/ui/report/ReportController.cxx | 38 sc/inc/ViewSettingsSequenceDefines.hxx | 40 sc/inc/address.hxx | 8 sc/inc/bitmaps.hlst | 210 - sc/inc/global.hxx | 6 sc/inc/globalnames.hxx | 6 sc/inc/helpids.h | 1088 +++--- sc/inc/sheetlimits.hxx | 4 sc/inc/strings.hxx | 26 sc/inc/stylehelper.hxx | 26 sc/inc/targuno.hxx | 2 sc/inc/unonames.hxx | 1194 +++--- sc/source/core/tool/stylehelper.cxx | 28 sc/source/filter/excel/xichart.cxx | 2 sc/source/filter/inc/excdefs.hxx | 4 sc/source/filter/inc/xlchart.hxx | 208 - sc/source/filter/inc/xlconst.hxx | 8 sc/source/filter/inc/xlcontent.hxx | 2 sc/source/filter/inc/xlpivot.hxx | 2 sc/source/filter/inc/xlroot.hxx | 2 sc/source/filter/xml/XMLTableHeaderFooterContext.cxx | 12 sc/source/filter/xml/xmlwrap.cxx | 4 sc/source/ui/Accessibility/AccessiblePageHeader.cxx | 2 sc/source/ui/namedlg/namedefdlg.cxx | 4 sc/source/ui/namedlg/namedlg.cxx | 2 sc/source/ui/namedlg/namemgrtable.cxx | 2 sc/source/ui/pagedlg/tptable.cxx | 2 sc/source/ui/vba/vbaworkbook.cxx | 2 sc/source/ui/vba/vbaworkbooks.cxx | 2 sc/source/ui/view/olinewin.cxx | 4 sd/inc/bitmaps.hlst | 388 +- sd/inc/glob.hxx | 2 sd/inc/helpids.h | 46 sd/inc/sdcommands.h | 4 sd/inc/strings.hxx | 12 sd/source/console/PresenterConfigurationAccess.hxx | 4 sd/source/console/PresenterPaneFactory.hxx | 16 sd/source/console/PresenterViewFactory.hxx | 18 sd/source/ui/inc/ToolBarManager.hxx | 30 sd/source/ui/inc/framework/FrameworkHelper.hxx | 24 sd/source/ui/inc/unokywds.hxx | 150 sd/source/ui/sidebar/LayoutMenu.cxx | 2 sfx2/inc/bitmaps.hlst | 118 sfx2/inc/strings.hxx | 74 sfx2/source/appl/shutdownicon.hxx | 16 sfx2/source/config/evntconf.cxx | 2 sfx2/source/doc/objstor.cxx | 8 sfx2/source/inc/helpids.h | 54 starmath/inc/document.hxx | 2 starmath/inc/format.hxx | 6 starmath/inc/helpids.h | 56 starmath/inc/strings.hxx | 2 starmath/inc/types.hxx | 2 starmath/inc/unomodel.hxx | 10 svgio/inc/svgtools.hxx | 8 svl/source/numbers/zforscan.hxx | 2 svtools/inc/bitmaps.hlst | 228 - svtools/inc/strings.hxx | 2 svx/inc/bitmaps.hlst | 320 - svx/inc/helpids.h | 72 svx/inc/strings.hxx | 730 ++-- svx/source/dialog/langbox.cxx | 2 svx/source/fmcomp/gridcell.cxx | 2 svx/source/form/datanavi.cxx | 2 svx/source/form/fmundo.cxx | 3 svx/source/form/formcontrolling.cxx | 38 svx/source/inc/datanavi.hxx | 12 svx/source/inc/docrecovery.hxx | 38 svx/source/inc/fmprop.hxx | 224 - svx/source/inc/fmservs.hxx | 98 svx/source/inc/fmurl.hxx | 54 svx/source/sidebar/text/TextCharacterSpacingControl.hxx | 2 sw/inc/bitmaps.hlst | 190 - sw/inc/helpids.h | 140 sw/inc/hintids.hxx | 4 sw/inc/iodetect.hxx | 26 sw/inc/tox.hxx | 2 sw/inc/unoprnms.hxx | 1801 ++++------ sw/qa/extras/globalfilter/globalfilter.cxx | 10 sw/qa/extras/ooxmlexport/ooxmlexport19.cxx | 4 sw/qa/extras/ooxmlexport/ooxmlexport8.cxx | 2 sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx | 8 sw/qa/extras/uiwriter/uiwriter5.cxx | 20 sw/qa/uibase/shells/shells.cxx | 28 sw/qa/uibase/uno/uno.cxx | 6 sw/source/core/access/acccontext.hxx | 2 sw/source/core/crsr/bookmark.cxx | 6 sw/source/core/text/itrform2.cxx | 2 sw/source/core/text/porrst.hxx | 2 sw/source/filter/ww8/wrtww8.cxx | 4 sw/source/filter/ww8/ww8glsy.cxx | 2 sw/source/filter/ww8/ww8par.cxx | 4 sw/source/filter/ww8/ww8scan.hxx | 16 sw/source/filter/ww8/ww8struc.hxx | 8 sw/source/ui/dbui/mmoutputtypepage.cxx | 2 sw/source/ui/dialog/uiregionsw.cxx | 4 sw/source/uibase/inc/bookmark.hxx | 2 sw/source/uibase/misc/redlndlg.cxx | 20 ucb/source/core/ucbcmds.hxx | 6 ucb/source/sorter/sortresult.hxx | 2 ucb/source/ucp/cmis/cmis_content.hxx | 4 ucb/source/ucp/cmis/cmis_repo_content.hxx | 2 ucb/source/ucp/cmis/cmis_strings.hxx | 10 ucb/source/ucp/file/bc.cxx | 4 ucb/source/ucp/file/filtask.hxx | 8 ucb/source/ucp/ftp/ftpcontentprovider.hxx | 4 ucb/source/ucp/gio/gio_content.cxx | 4 ucb/source/ucp/gio/gio_content.hxx | 4 ucb/source/ucp/hierarchy/hierarchycontent.cxx | 4 ucb/source/ucp/hierarchy/hierarchycontent.hxx | 8 ucb/source/ucp/hierarchy/hierarchyprovider.hxx | 8 ucb/source/ucp/tdoc/tdoc_content.hxx | 8 ucb/source/ucp/tdoc/tdoc_provider.hxx | 16 ucb/source/ucp/webdav-curl/ContentProperties.cxx | 4 ucb/source/ucp/webdav-curl/DAVProperties.hxx | 22 ucb/source/ucp/webdav-curl/webdavcontent.cxx | 2 ucb/source/ucp/webdav-curl/webdavcontent.hxx | 2 ucb/source/ucp/webdav-curl/webdavprovider.hxx | 6 unotools/source/misc/ZipPackageHelper.cxx | 2 vbahelper/source/vbahelper/vbacommandbarhelper.hxx | 24 vcl/inc/IconThemeSelector.hxx | 4 vcl/inc/bitmaps.hlst | 332 - vcl/inc/graphic/UnoGraphicDescriptor.hxx | 52 vcl/qa/cppunit/app/test_IconThemeSelector.cxx | 2 vcl/source/app/IconThemeSelector.cxx | 4 vcl/source/graphic/UnoGraphicDescriptor.cxx | 2 vcl/source/window/printdlg.cxx | 2 vcl/unx/generic/dtrans/X11_clipboard.hxx | 2 xmlhelp/source/cxxhelp/provider/databases.cxx | 4 xmlhelp/source/cxxhelp/provider/provider.hxx | 2 xmloff/inc/xmlprop.hxx | 1313 +++---- xmloff/source/chart/ColorPropertySet.hxx | 2 xmloff/source/chart/SchXMLExport.cxx | 8 xmloff/source/draw/sdxmlexp.cxx | 14 xmloff/source/draw/sdxmlimp_impl.hxx | 4 xmloff/source/draw/shapeexport.cxx | 4 xmloff/source/forms/formcellbinding.cxx | 4 xmloff/source/forms/layerexport.cxx | 2 xmloff/source/forms/strings.hxx | 292 - xmloff/source/table/XMLTableExport.cxx | 14 xmloff/source/text/XMLIndexMarkExport.hxx | 24 xmloff/source/text/txtimp.cxx | 2 xmloff/source/text/txtstyle.cxx | 2 xmlsecurity/inc/bitmaps.hlst | 8 xmlsecurity/inc/xsecctl.hxx | 34 xmlsecurity/source/xmlsec/nss/nssinitializer.hxx | 2 310 files changed, 8737 insertions(+), 8781 deletions(-)
New commits: commit bd6fb0cd3eee3c7d414e55a7678c0097aadc7646 Author: Stephan Bergmann <[email protected]> AuthorDate: Thu Oct 19 16:39:09 2023 +0200 Commit: Stephan Bergmann <[email protected]> CommitDate: Mon Oct 23 11:04:42 2023 +0200 Extended loplugin:ostr: Rewrite some O[U]StringLiteral -> O[U]String ...in include files. This is a mix of automatic rewriting in include files and manual fixups (mostly addressing loplugin:redundantfcast) in source files that include those. Change-Id: I1f3cc1e67b9cabd2e9d61a4d9e9a01e587ea35cc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158337 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <[email protected]> diff --git a/UnoControls/source/inc/progressmonitor.hxx b/UnoControls/source/inc/progressmonitor.hxx index eaaa1bc80b3f..46a4dc735484 100644 --- a/UnoControls/source/inc/progressmonitor.hxx +++ b/UnoControls/source/inc/progressmonitor.hxx @@ -36,8 +36,8 @@ namespace unocontrols { class ProgressBar; #define PROGRESSMONITOR_FREEBORDER 10 // border around and between the controls -inline constexpr OUStringLiteral PROGRESSMONITOR_DEFAULT_TOPIC = u""; -inline constexpr OUStringLiteral PROGRESSMONITOR_DEFAULT_TEXT = u""; +inline constexpr OUString PROGRESSMONITOR_DEFAULT_TOPIC = u""_ustr; +inline constexpr OUString PROGRESSMONITOR_DEFAULT_TEXT = u""_ustr; #define PROGRESSMONITOR_LINECOLOR_BRIGHT sal_Int32(Color( 0xFF, 0xFF, 0xFF )) // white #define PROGRESSMONITOR_LINECOLOR_SHADOW sal_Int32(Color( 0x00, 0x00, 0x00 )) // black #define PROGRESSMONITOR_DEFAULT_WIDTH 350 diff --git a/accessibility/inc/strings.hxx b/accessibility/inc/strings.hxx index 85dcf7eb9279..6fd402a9ba06 100644 --- a/accessibility/inc/strings.hxx +++ b/accessibility/inc/strings.hxx @@ -11,13 +11,13 @@ #include <rtl/ustring.hxx> -inline constexpr OUStringLiteral RID_STR_ACC_ACTION_CLICK = u"press"; -inline constexpr OUStringLiteral RID_STR_ACC_ACTION_TOGGLEPOPUP = u"togglePopup"; -inline constexpr OUStringLiteral RID_STR_ACC_ACTION_SELECT = u"select"; -inline constexpr OUStringLiteral RID_STR_ACC_ACTION_INCLINE = u"incrementLine"; -inline constexpr OUStringLiteral RID_STR_ACC_ACTION_DECLINE = u"decrementLine"; -inline constexpr OUStringLiteral RID_STR_ACC_ACTION_INCBLOCK = u"incrementBlock"; -inline constexpr OUStringLiteral RID_STR_ACC_ACTION_DECBLOCK = u"decrementBlock"; +inline constexpr OUString RID_STR_ACC_ACTION_CLICK = u"press"_ustr; +inline constexpr OUString RID_STR_ACC_ACTION_TOGGLEPOPUP = u"togglePopup"_ustr; +inline constexpr OUString RID_STR_ACC_ACTION_SELECT = u"select"_ustr; +inline constexpr OUString RID_STR_ACC_ACTION_INCLINE = u"incrementLine"_ustr; +inline constexpr OUString RID_STR_ACC_ACTION_DECLINE = u"decrementLine"_ustr; +inline constexpr OUString RID_STR_ACC_ACTION_INCBLOCK = u"incrementBlock"_ustr; +inline constexpr OUString RID_STR_ACC_ACTION_DECBLOCK = u"decrementBlock"_ustr; /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/accessibility/source/standard/vclxaccessiblescrollbar.cxx b/accessibility/source/standard/vclxaccessiblescrollbar.cxx index 4ea6f788bb3c..d608ec22e8f4 100644 --- a/accessibility/source/standard/vclxaccessiblescrollbar.cxx +++ b/accessibility/source/standard/vclxaccessiblescrollbar.cxx @@ -142,10 +142,10 @@ OUString VCLXAccessibleScrollBar::getAccessibleActionDescription ( sal_Int32 nIn switch ( nIndex ) { - case 0: sDescription = OUString(RID_STR_ACC_ACTION_DECLINE); break; - case 1: sDescription = OUString(RID_STR_ACC_ACTION_INCLINE); break; - case 2: sDescription = OUString(RID_STR_ACC_ACTION_DECBLOCK); break; - case 3: sDescription = OUString(RID_STR_ACC_ACTION_INCBLOCK); break; + case 0: sDescription = RID_STR_ACC_ACTION_DECLINE; break; + case 1: sDescription = RID_STR_ACC_ACTION_INCLINE; break; + case 2: sDescription = RID_STR_ACC_ACTION_DECBLOCK; break; + case 3: sDescription = RID_STR_ACC_ACTION_INCBLOCK; break; default: break; } diff --git a/avmedia/inc/bitmaps.hlst b/avmedia/inc/bitmaps.hlst index 758471fbdb3a..2730761ecb64 100644 --- a/avmedia/inc/bitmaps.hlst +++ b/avmedia/inc/bitmaps.hlst @@ -9,7 +9,7 @@ #pragma once -inline constexpr OUStringLiteral AVMEDIA_BMP_AUDIOLOGO = u"avmedia/res/avaudiologo.png"; -inline constexpr OUStringLiteral AVMEDIA_BMP_EMPTYLOGO = u"avmedia/res/avemptylogo.png"; +inline constexpr OUString AVMEDIA_BMP_AUDIOLOGO = u"avmedia/res/avaudiologo.png"_ustr; +inline constexpr OUString AVMEDIA_BMP_EMPTYLOGO = u"avmedia/res/avemptylogo.png"_ustr; /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/avmedia/inc/helpids.h b/avmedia/inc/helpids.h index f49f12fb3e00..a20267998a00 100644 --- a/avmedia/inc/helpids.h +++ b/avmedia/inc/helpids.h @@ -21,16 +21,16 @@ #include <rtl/ustring.hxx> -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"; +inline constexpr OUString HID_AVMEDIA_TOOLBOXITEM_PLAY = u"AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_PLAY"_ustr; +inline constexpr OUString HID_AVMEDIA_TOOLBOXITEM_PAUSE = u"AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_PAUSE"_ustr; +inline constexpr OUString HID_AVMEDIA_TOOLBOXITEM_STOP = u"AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_STOP"_ustr; +inline constexpr OUString HID_AVMEDIA_TOOLBOXITEM_MUTE = u"AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_MUTE"_ustr; +inline constexpr OUString HID_AVMEDIA_TOOLBOXITEM_LOOP = u"AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_LOOP"_ustr; +inline constexpr OUString HID_AVMEDIA_TOOLBOXITEM_OPEN = u"AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_OPEN"_ustr; +inline constexpr OUString HID_AVMEDIA_TOOLBOXITEM_INSERT = u"AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_INSERT"_ustr; +inline constexpr OUString HID_AVMEDIA_ZOOMLISTBOX = u"AVMEDIA_HID_AVMEDIA_ZOOMLISTBOX"_ustr; +inline constexpr OUString HID_AVMEDIA_TIMEEDIT = u"AVMEDIA_HID_AVMEDIA_TIMEEDIT"_ustr; +inline constexpr OUString HID_AVMEDIA_VOLUMESLIDER = u"AVMEDIA_HID_AVMEDIA_VOLUMESLIDER"_ustr; +inline constexpr OUString HID_AVMEDIA_PLAYERWINDOW = u"AVMEDIA_HID_AVMEDIA_PLAYERWINDOW"_ustr; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/avmedia/source/gstreamer/gstwindow.cxx b/avmedia/source/gstreamer/gstwindow.cxx index 5f1a9e4acf13..2d9aec0418b3 100644 --- a/avmedia/source/gstreamer/gstwindow.cxx +++ b/avmedia/source/gstreamer/gstwindow.cxx @@ -23,7 +23,7 @@ #include "gstwindow.hxx" -constexpr OUStringLiteral AVMEDIA_GST_WINDOW_IMPLEMENTATIONNAME = u"com.sun.star.comp.avmedia.Window_GStreamer"; +constexpr OUString AVMEDIA_GST_WINDOW_IMPLEMENTATIONNAME = u"com.sun.star.comp.avmedia.Window_GStreamer"_ustr; constexpr OUString AVMEDIA_GST_WINDOW_SERVICENAME = u"com.sun.star.media.Window_GStreamer"_ustr; using namespace ::com::sun::star; diff --git a/basctl/inc/bitmaps.hlst b/basctl/inc/bitmaps.hlst index b316a2450a39..0dc8e8d2c8c1 100644 --- a/basctl/inc/bitmaps.hlst +++ b/basctl/inc/bitmaps.hlst @@ -9,19 +9,19 @@ #pragma once -inline constexpr OUStringLiteral RID_BMP_BRKENABLED = u"res/im30838.png"; -inline constexpr OUStringLiteral RID_BMP_BRKDISABLED = u"res/im30839.png"; -inline constexpr OUStringLiteral RID_BMP_STEPMARKER = u"res/im30840.png"; -inline constexpr OUStringLiteral RID_BMP_ERRORMARKER = u"res/im30841.png"; -inline constexpr OUStringLiteral RID_BMP_LOCKED = u"res/lock.png"; -inline constexpr OUStringLiteral RID_BMP_INSTALLATION = u"res/harddisk_16.png"; -inline constexpr OUStringLiteral RID_BMP_DOCUMENT = u"res/im30826.png"; -inline constexpr OUStringLiteral RID_BMP_MODLIB = u"res/im30820.png"; -inline constexpr OUStringLiteral RID_BMP_MODLIBNOTLOADED = u"res/im30827.png"; -inline constexpr OUStringLiteral RID_BMP_MODULE = u"res/im30821.png"; -inline constexpr OUStringLiteral RID_BMP_MACRO = u"res/im30822.png"; -inline constexpr OUStringLiteral RID_BMP_DLGLIB = u"res/dialogfolder_16.png"; -inline constexpr OUStringLiteral RID_BMP_DLGLIBNOTLOADED = u"res/dialogfoldernot_16.png"; -inline constexpr OUStringLiteral RID_BMP_DIALOG = u"res/im30823.png"; +inline constexpr OUString RID_BMP_BRKENABLED = u"res/im30838.png"_ustr; +inline constexpr OUString RID_BMP_BRKDISABLED = u"res/im30839.png"_ustr; +inline constexpr OUString RID_BMP_STEPMARKER = u"res/im30840.png"_ustr; +inline constexpr OUString RID_BMP_ERRORMARKER = u"res/im30841.png"_ustr; +inline constexpr OUString RID_BMP_LOCKED = u"res/lock.png"_ustr; +inline constexpr OUString RID_BMP_INSTALLATION = u"res/harddisk_16.png"_ustr; +inline constexpr OUString RID_BMP_DOCUMENT = u"res/im30826.png"_ustr; +inline constexpr OUString RID_BMP_MODLIB = u"res/im30820.png"_ustr; +inline constexpr OUString RID_BMP_MODLIBNOTLOADED = u"res/im30827.png"_ustr; +inline constexpr OUString RID_BMP_MODULE = u"res/im30821.png"_ustr; +inline constexpr OUString RID_BMP_MACRO = u"res/im30822.png"_ustr; +inline constexpr OUString RID_BMP_DLGLIB = u"res/dialogfolder_16.png"_ustr; +inline constexpr OUString RID_BMP_DLGLIBNOTLOADED = u"res/dialogfoldernot_16.png"_ustr; +inline constexpr OUString RID_BMP_DIALOG = u"res/im30823.png"_ustr; /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/basctl/inc/helpids.h b/basctl/inc/helpids.h index e34d054ed899..2d656b96bf48 100644 --- a/basctl/inc/helpids.h +++ b/basctl/inc/helpids.h @@ -20,20 +20,20 @@ #include <rtl/ustring.hxx> -inline constexpr OUStringLiteral HID_BASICIDE_OBJECTCAT = u"BASCTL_HID_BASICIDE_OBJECTCAT"; +inline constexpr OUString HID_BASICIDE_OBJECTCAT = u"BASCTL_HID_BASICIDE_OBJECTCAT"_ustr; -inline constexpr OUStringLiteral HID_BASICIDE_REMOVEWATCH = u"BASCTL_HID_BASICIDE_REMOVEWATCH"; +inline constexpr OUString HID_BASICIDE_REMOVEWATCH = u"BASCTL_HID_BASICIDE_REMOVEWATCH"_ustr; -inline constexpr OUStringLiteral HID_BASICIDE_MODULWINDOW = u"BASCTL_HID_BASICIDE_MODULWINDOW"; -inline constexpr OUStringLiteral HID_BASICIDE_DIALOGWINDOW = u"BASCTL_HID_BASICIDE_DIALOGWINDOW"; +inline constexpr OUString HID_BASICIDE_MODULWINDOW = u"BASCTL_HID_BASICIDE_MODULWINDOW"_ustr; +inline constexpr OUString HID_BASICIDE_DIALOGWINDOW = u"BASCTL_HID_BASICIDE_DIALOGWINDOW"_ustr; -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"; +inline constexpr OUString HID_BASICIDE_EDITORWINDOW = u"BASCTL_HID_BASICIDE_EDITORWINDOW"_ustr; +inline constexpr OUString HID_BASICIDE_BREAKPOINTWINDOW = u"BASCTL_HID_BASICIDE_BREAKPOINTWINDOW"_ustr; +inline constexpr OUString HID_BASICIDE_WATCHWINDOW = u"BASCTL_HID_BASICIDE_WATCHWINDOW"_ustr; +inline constexpr OUString HID_BASICIDE_STACKWINDOW = u"BASCTL_HID_BASICIDE_STACKWINDOW"_ustr; +inline constexpr OUString HID_BASICIDE_TABBAR = u"BASCTL_HID_BASICIDE_TABBAR"_ustr; +inline constexpr OUString HID_BASICIDE_WATCHWINDOW_EDIT = u"BASCTL_HID_BASICIDE_WATCHWINDOW_EDIT"_ustr; +inline constexpr OUString HID_BASICIDE_WATCHWINDOW_LIST = u"BASCTL_HID_BASICIDE_WATCHWINDOW_LIST"_ustr; +inline constexpr OUString HID_BASICIDE_STACKWINDOW_LIST = u"BASCTL_HID_BASICIDE_STACKWINDOW_LIST"_ustr; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basctl/inc/strings.hxx b/basctl/inc/strings.hxx index 597092e8c3e2..5481d62de326 100644 --- a/basctl/inc/strings.hxx +++ b/basctl/inc/strings.hxx @@ -13,30 +13,30 @@ // Dialog Controls --------------------------------------------------------------- -inline constexpr OUStringLiteral RID_STR_CLASS_CONTROL = u"Control"; -inline constexpr OUStringLiteral RID_STR_CLASS_DIALOG = u"Dialog"; -inline constexpr OUStringLiteral RID_STR_CLASS_BUTTON = u"CommandButton"; -inline constexpr OUStringLiteral RID_STR_CLASS_RADIOBUTTON = u"OptionButton"; -inline constexpr OUStringLiteral RID_STR_CLASS_CHECKBOX = u"CheckBox"; -inline constexpr OUStringLiteral RID_STR_CLASS_LISTBOX = u"ListBox"; -inline constexpr OUStringLiteral RID_STR_CLASS_COMBOBOX = u"ComboBox"; -inline constexpr OUStringLiteral RID_STR_CLASS_GROUPBOX = u"FrameControl"; -inline constexpr OUStringLiteral RID_STR_CLASS_EDIT = u"TextField"; -inline constexpr OUStringLiteral RID_STR_CLASS_FIXEDTEXT = u"Label"; -inline constexpr OUStringLiteral RID_STR_CLASS_IMAGECONTROL = u"ImageControl"; -inline constexpr OUStringLiteral RID_STR_CLASS_PROGRESSBAR = u"ProgressBar"; -inline constexpr OUStringLiteral RID_STR_CLASS_SCROLLBAR = u"ScrollBar"; -inline constexpr OUStringLiteral RID_STR_CLASS_FIXEDLINE = u"FixedLine"; -inline constexpr OUStringLiteral RID_STR_CLASS_DATEFIELD = u"DateField"; -inline constexpr OUStringLiteral RID_STR_CLASS_TIMEFIELD = u"TimeField"; -inline constexpr OUStringLiteral RID_STR_CLASS_NUMERICFIELD = u"NumericField"; -inline constexpr OUStringLiteral RID_STR_CLASS_CURRENCYFIELD = u"CurrencyField"; -inline constexpr OUStringLiteral RID_STR_CLASS_FORMATTEDFIELD = u"FormattedField"; -inline constexpr OUStringLiteral RID_STR_CLASS_PATTERNFIELD = u"PatternField"; -inline constexpr OUStringLiteral RID_STR_CLASS_FILECONTROL = u"FileControl"; -inline constexpr OUStringLiteral RID_STR_CLASS_TREECONTROL = u"TreeControl"; -inline constexpr OUStringLiteral RID_STR_CLASS_GRIDCONTROL = u"GridControl"; -inline constexpr OUStringLiteral RID_STR_CLASS_SPINCONTROL = u"SpinButton"; -inline constexpr OUStringLiteral RID_STR_CLASS_HYPERLINKCONTROL = u"HyperlinkControl"; +inline constexpr OUString RID_STR_CLASS_CONTROL = u"Control"_ustr; +inline constexpr OUString RID_STR_CLASS_DIALOG = u"Dialog"_ustr; +inline constexpr OUString RID_STR_CLASS_BUTTON = u"CommandButton"_ustr; +inline constexpr OUString RID_STR_CLASS_RADIOBUTTON = u"OptionButton"_ustr; +inline constexpr OUString RID_STR_CLASS_CHECKBOX = u"CheckBox"_ustr; +inline constexpr OUString RID_STR_CLASS_LISTBOX = u"ListBox"_ustr; +inline constexpr OUString RID_STR_CLASS_COMBOBOX = u"ComboBox"_ustr; +inline constexpr OUString RID_STR_CLASS_GROUPBOX = u"FrameControl"_ustr; +inline constexpr OUString RID_STR_CLASS_EDIT = u"TextField"_ustr; +inline constexpr OUString RID_STR_CLASS_FIXEDTEXT = u"Label"_ustr; +inline constexpr OUString RID_STR_CLASS_IMAGECONTROL = u"ImageControl"_ustr; +inline constexpr OUString RID_STR_CLASS_PROGRESSBAR = u"ProgressBar"_ustr; +inline constexpr OUString RID_STR_CLASS_SCROLLBAR = u"ScrollBar"_ustr; +inline constexpr OUString RID_STR_CLASS_FIXEDLINE = u"FixedLine"_ustr; +inline constexpr OUString RID_STR_CLASS_DATEFIELD = u"DateField"_ustr; +inline constexpr OUString RID_STR_CLASS_TIMEFIELD = u"TimeField"_ustr; +inline constexpr OUString RID_STR_CLASS_NUMERICFIELD = u"NumericField"_ustr; +inline constexpr OUString RID_STR_CLASS_CURRENCYFIELD = u"CurrencyField"_ustr; +inline constexpr OUString RID_STR_CLASS_FORMATTEDFIELD = u"FormattedField"_ustr; +inline constexpr OUString RID_STR_CLASS_PATTERNFIELD = u"PatternField"_ustr; +inline constexpr OUString RID_STR_CLASS_FILECONTROL = u"FileControl"_ustr; +inline constexpr OUString RID_STR_CLASS_TREECONTROL = u"TreeControl"_ustr; +inline constexpr OUString RID_STR_CLASS_GRIDCONTROL = u"GridControl"_ustr; +inline constexpr OUString RID_STR_CLASS_SPINCONTROL = u"SpinButton"_ustr; +inline constexpr OUString RID_STR_CLASS_HYPERLINKCONTROL = u"HyperlinkControl"_ustr; /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index f1c1a7303878..e62ba50683fb 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -1466,7 +1466,7 @@ void BreakPointWindow::ShowMarker(vcl::RenderContext& rRenderContext) Size const aOutSz = GetOutDev()->GetOutputSize(); tools::Long const nLineHeight = GetTextHeight(); - Image aMarker = GetImage(bErrorMarker ? OUString(RID_BMP_ERRORMARKER) : OUString(RID_BMP_STEPMARKER)); + Image aMarker = GetImage(bErrorMarker ? RID_BMP_ERRORMARKER : RID_BMP_STEPMARKER); Size aMarkerSz(aMarker.GetSizePixel()); aMarkerSz = rRenderContext.PixelToLogic(aMarkerSz); diff --git a/basctl/source/basicide/bastype2.cxx b/basctl/source/basicide/bastype2.cxx index fec1303d8474..8040c25f32c1 100644 --- a/basctl/source/basicide/bastype2.cxx +++ b/basctl/source/basicide/bastype2.cxx @@ -244,9 +244,9 @@ void SbTreeListBox::ImpCreateLibEntries(const weld::TreeIter& rIter, const Scrip // create tree list box entry OUString sId; if ( ( nMode & BrowseMode::Dialogs ) && !( nMode & BrowseMode::Modules ) ) - sId = bLoaded ? OUString(RID_BMP_DLGLIB) : OUString(RID_BMP_DLGLIBNOTLOADED); + sId = bLoaded ? RID_BMP_DLGLIB : RID_BMP_DLGLIBNOTLOADED; else - sId = bLoaded ? OUString(RID_BMP_MODLIB) : OUString(RID_BMP_MODLIBNOTLOADED); + sId = bLoaded ? RID_BMP_MODLIB : RID_BMP_MODLIBNOTLOADED; std::unique_ptr<weld::TreeIter> xLibRootEntry(m_xControl->make_iterator(&rIter)); bool bLibRootEntry = FindEntry(aLibName, OBJ_TYPE_LIBRARY, *xLibRootEntry); if (bLibRootEntry) diff --git a/basctl/source/basicide/bastype3.cxx b/basctl/source/basicide/bastype3.cxx index 43f1b970209e..d26ae83252f6 100644 --- a/basctl/source/basicide/bastype3.cxx +++ b/basctl/source/basicide/bastype3.cxx @@ -101,7 +101,7 @@ IMPL_LINK(SbTreeListBox, RequestingChildrenHdl, const weld::TreeIter&, rEntry, b // exchange image const bool bDlgMode = (nMode & BrowseMode::Dialogs) && !(nMode & BrowseMode::Modules); - auto const aImage(bDlgMode ? OUString(RID_BMP_DLGLIB) : OUString(RID_BMP_MODLIB)); + auto const aImage(bDlgMode ? RID_BMP_DLGLIB : RID_BMP_MODLIB); SetEntryBitmaps(rEntry, aImage); } else diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx index f66f8cfd0e23..1221b0094218 100644 --- a/basctl/source/basicide/moduldl2.cxx +++ b/basctl/source/basicide/moduldl2.cxx @@ -1354,7 +1354,7 @@ void createLibImpl(weld::Window* pWin, const ScriptDocument& rDocument, BrowseMode nMode = pBasicBox->GetMode(); bool bDlgMode = ( nMode & BrowseMode::Dialogs ) && !( nMode & BrowseMode::Modules ); - const auto sId = bDlgMode ? OUString(RID_BMP_DLGLIB) : OUString(RID_BMP_MODLIB); + const auto sId = bDlgMode ? RID_BMP_DLGLIB : RID_BMP_MODLIB; pBasicBox->AddEntry(aLibName, sId, xRootEntry.get(), false, std::make_unique<Entry>(OBJ_TYPE_LIBRARY)); pBasicBox->AddEntry(aModName, RID_BMP_MODULE, xRootEntry.get(), false, std::make_unique<Entry>(OBJ_TYPE_MODULE)); pBasicBox->set_cursor(*xRootEntry); diff --git a/basctl/source/inc/dlgeddef.hxx b/basctl/source/inc/dlgeddef.hxx index ffb726b21bfc..c10ef16cd8d3 100644 --- a/basctl/source/inc/dlgeddef.hxx +++ b/basctl/source/inc/dlgeddef.hxx @@ -26,20 +26,20 @@ namespace basctl // control properties #define DLGED_PROP_BACKGROUNDCOLOR "BackgroundColor" -inline constexpr OUStringLiteral DLGED_PROP_DROPDOWN = u"Dropdown"; -inline constexpr OUStringLiteral DLGED_PROP_FORMATSSUPPLIER = u"FormatsSupplier"; -inline constexpr OUStringLiteral DLGED_PROP_HEIGHT = u"Height"; -inline constexpr OUStringLiteral DLGED_PROP_LABEL = u"Label"; -inline constexpr OUStringLiteral DLGED_PROP_NAME = u"Name"; -inline constexpr OUStringLiteral DLGED_PROP_ORIENTATION = u"Orientation"; -inline constexpr OUStringLiteral DLGED_PROP_POSITIONX = u"PositionX"; -inline constexpr OUStringLiteral DLGED_PROP_POSITIONY = u"PositionY"; -inline constexpr OUStringLiteral DLGED_PROP_STEP = u"Step"; -inline constexpr OUStringLiteral DLGED_PROP_TABINDEX = u"TabIndex"; +inline constexpr OUString DLGED_PROP_DROPDOWN = u"Dropdown"_ustr; +inline constexpr OUString DLGED_PROP_FORMATSSUPPLIER = u"FormatsSupplier"_ustr; +inline constexpr OUString DLGED_PROP_HEIGHT = u"Height"_ustr; +inline constexpr OUString DLGED_PROP_LABEL = u"Label"_ustr; +inline constexpr OUString DLGED_PROP_NAME = u"Name"_ustr; +inline constexpr OUString DLGED_PROP_ORIENTATION = u"Orientation"_ustr; +inline constexpr OUString DLGED_PROP_POSITIONX = u"PositionX"_ustr; +inline constexpr OUString DLGED_PROP_POSITIONY = u"PositionY"_ustr; +inline constexpr OUString DLGED_PROP_STEP = u"Step"_ustr; +inline constexpr OUString DLGED_PROP_TABINDEX = u"TabIndex"_ustr; #define DLGED_PROP_TEXTCOLOR "TextColor" #define DLGED_PROP_TEXTLINECOLOR "TextLineColor" -inline constexpr OUStringLiteral DLGED_PROP_WIDTH = u"Width"; -inline constexpr OUStringLiteral DLGED_PROP_DECORATION = u"Decoration"; +inline constexpr OUString DLGED_PROP_WIDTH = u"Width"_ustr; +inline constexpr OUString DLGED_PROP_DECORATION = u"Decoration"_ustr; } // namespace basctl diff --git a/basic/source/inc/namecont.hxx b/basic/source/inc/namecont.hxx index 6a26b0c9ead2..9973ab94e815 100644 --- a/basic/source/inc/namecont.hxx +++ b/basic/source/inc/namecont.hxx @@ -331,7 +331,7 @@ private: void init_Impl( const OUString& rInitialDocumentURL, const css::uno::Reference< css::embed::XStorage >& _rxInitialStorage ); void implScanExtensions(); - static constexpr OUStringLiteral sVBATextEncodingPropName = u"VBATextEncoding"; + static constexpr OUString sVBATextEncodingPropName = u"VBATextEncoding"_ustr; public: SfxLibraryContainer(); diff --git a/chart2/inc/bitmaps.hlst b/chart2/inc/bitmaps.hlst index 0f4512e8bc2c..5ef14f869fd8 100644 --- a/chart2/inc/bitmaps.hlst +++ b/chart2/inc/bitmaps.hlst @@ -9,124 +9,124 @@ #pragma once -inline constexpr OUStringLiteral BMP_TYPE_COLUMN = u"chart2/res/typecolumn_16.png"; -inline constexpr OUStringLiteral BMP_TYPE_BAR = u"chart2/res/typebar_16.png"; -inline constexpr OUStringLiteral BMP_TYPE_PIE = u"chart2/res/typepie_16.png"; -inline constexpr OUStringLiteral BMP_TYPE_LINE = u"chart2/res/typepointline_16.png"; -inline constexpr OUStringLiteral BMP_TYPE_XY = u"chart2/res/typexy_16.png"; -inline constexpr OUStringLiteral BMP_TYPE_AREA = u"chart2/res/typearea_16.png"; -inline constexpr OUStringLiteral BMP_TYPE_NET = u"chart2/res/typenet_16.png"; -inline constexpr OUStringLiteral BMP_TYPE_STOCK = u"chart2/res/typestock_16.png"; -inline constexpr OUStringLiteral BMP_TYPE_COLUMN_LINE = u"chart2/res/typecolumnline_16.png"; -inline constexpr OUStringLiteral BMP_TYPE_BUBBLE = u"chart2/res/typebubble_16.png"; -inline constexpr OUStringLiteral BMP_BUBBLE_1 = u"chart2/res/bubble_52x60.png"; -inline constexpr OUStringLiteral BMP_AREAS_2D = u"chart2/res/areas_52x60.png"; -inline constexpr OUStringLiteral BMP_AREAS_2D_1 = u"chart2/res/areaspiled_52x60.png"; -inline constexpr OUStringLiteral BMP_AREAS_2D_3 = u"chart2/res/areasfull_52x60.png"; -inline constexpr OUStringLiteral BMP_AREAS_3D = u"chart2/res/areaspiled3d_52x60.png"; -inline constexpr OUStringLiteral BMP_AREAS_3D_1 = u"chart2/res/areas3d_52x60.png"; -inline constexpr OUStringLiteral BMP_AREAS_3D_2 = u"chart2/res/areasfull3d_52x60.png"; -inline constexpr OUStringLiteral BMP_BARS_2D_1 = u"chart2/res/bar_52x60.png"; -inline constexpr OUStringLiteral BMP_BARS_2D_2 = u"chart2/res/barstack_52x60.png"; -inline constexpr OUStringLiteral BMP_BARS_2D_3 = u"chart2/res/barpercent_52x60.png"; -inline constexpr OUStringLiteral BMP_BARS_3D = u"chart2/res/bar3ddeep_52x60.png"; -inline constexpr OUStringLiteral BMP_BARS_3D_1 = u"chart2/res/bar3d_52x60.png"; -inline constexpr OUStringLiteral BMP_BARS_3D_2 = u"chart2/res/barstack3d_52x60.png"; -inline constexpr OUStringLiteral BMP_BARS_3D_3 = u"chart2/res/barpercent3d_52x60.png"; -inline constexpr OUStringLiteral BMP_CIRCLES_2D = u"chart2/res/pie_52x60.png"; -inline constexpr OUStringLiteral BMP_CIRCLES_2D_EXPLODED = u"chart2/res/pieexploded_52x60.png"; -inline constexpr OUStringLiteral BMP_CIRCLES_3D = u"chart2/res/pie3d_52x60.png"; -inline constexpr OUStringLiteral BMP_CIRCLES_3D_EXPLODED = u"chart2/res/pie3dexploded_52x60.png"; -inline constexpr OUStringLiteral BMP_DONUT_2D = u"chart2/res/donut_52x60.png"; -inline constexpr OUStringLiteral BMP_DONUT_2D_EXPLODED = u"chart2/res/donutexploded_52x60.png"; -inline constexpr OUStringLiteral BMP_DONUT_3D = u"chart2/res/donut3d_52x60.png"; -inline constexpr OUStringLiteral BMP_DONUT_3D_EXPLODED = u"chart2/res/donut3dexploded_52x60.png"; -inline constexpr OUStringLiteral BMP_COLUMNS_2D_1 = u"chart2/res/columns_52x60.png"; -inline constexpr OUStringLiteral BMP_COLUMNS_2D_2 = u"chart2/res/columnstack_52x60.png"; -inline constexpr OUStringLiteral BMP_COLUMNS_2D_3 = u"chart2/res/columnpercent_52x60.png"; -inline constexpr OUStringLiteral BMP_COLUMN_LINE = u"chart2/res/columnline_52x60.png"; -inline constexpr OUStringLiteral BMP_COLUMN_LINE_STACKED = u"chart2/res/columnstackline_52x60.png"; -inline constexpr OUStringLiteral BMP_COLUMNS_3D = u"chart2/res/columns3ddeep_52x60.png"; -inline constexpr OUStringLiteral BMP_COLUMNS_3D_1 = u"chart2/res/columns3d_52x60.png"; -inline constexpr OUStringLiteral BMP_COLUMNS_3D_2 = u"chart2/res/columnstack3d_52x60.png"; -inline constexpr OUStringLiteral BMP_COLUMNS_3D_3 = u"chart2/res/columnpercent3d_52x60.png"; -inline constexpr OUStringLiteral BMP_KEGELQ_3D_1 = u"chart2/res/conehori_52x60.png"; -inline constexpr OUStringLiteral BMP_KEGELQ_3D_2 = u"chart2/res/conehoristack_52x60.png"; -inline constexpr OUStringLiteral BMP_KEGELQ_3D_3 = u"chart2/res/conehoripercent_52x60.png"; -inline constexpr OUStringLiteral BMP_KEGELQ_3D_4 = u"chart2/res/conehorideep_52x60.png"; -inline constexpr OUStringLiteral BMP_KEGEL_3D_1 = u"chart2/res/cone_52x60.png"; -inline constexpr OUStringLiteral BMP_KEGEL_3D_2 = u"chart2/res/conestack_52x60.png"; -inline constexpr OUStringLiteral BMP_KEGEL_3D_3 = u"chart2/res/conepercent_52x60.png"; -inline constexpr OUStringLiteral BMP_KEGEL_3D_4 = u"chart2/res/conedeep_52x60.png"; -inline constexpr OUStringLiteral BMP_POINTS_XVALUES = u"chart2/res/valueaxisdirectpoints_52x60.png"; -inline constexpr OUStringLiteral BMP_POINTS_XCATEGORY = u"chart2/res/nostackdirectpoints_52x60.png"; -inline constexpr OUStringLiteral BMP_POINTS_STACKED = u"chart2/res/stackdirectpoints_52x60.png"; -inline constexpr OUStringLiteral BMP_LINE_P_XVALUES = u"chart2/res/valueaxisdirectboth_52x60.png"; -inline constexpr OUStringLiteral BMP_LINE_O_XVALUES = u"chart2/res/valueaxisdirectlines_52x60.png"; -inline constexpr OUStringLiteral BMP_LINE3D_XVALUES = u"chart2/res/valueaxisdirect3d_52x60.png"; -inline constexpr OUStringLiteral BMP_LINE_P_XCATEGORY = u"chart2/res/nostackdirectboth_52x60.png"; -inline constexpr OUStringLiteral BMP_LINE_O_XCATEGORY = u"chart2/res/nostackdirectlines_52x60.png"; -inline constexpr OUStringLiteral BMP_LINE3D_XCATEGORY = u"chart2/res/nostackdirect3d_52x60.png"; -inline constexpr OUStringLiteral BMP_LINE_P_STACKED = u"chart2/res/stackdirectboth_52x60.png"; -inline constexpr OUStringLiteral BMP_LINE_O_STACKED = u"chart2/res/stackdirectlines_52x60.png"; -inline constexpr OUStringLiteral BMP_LINE3D_STACKED = u"chart2/res/stackdirect3d_52x60.png"; -inline constexpr OUStringLiteral BMP_LINE_P_XVALUES_SMOOTH = u"chart2/res/valueaxissmoothboth_52x60.png"; -inline constexpr OUStringLiteral BMP_LINE_O_XVALUES_SMOOTH = u"chart2/res/valueaxissmoothlines_52x60.png"; -inline constexpr OUStringLiteral BMP_LINE3D_XVALUES_SMOOTH = u"chart2/res/valueaxissmooth3d_52x60.png"; -inline constexpr OUStringLiteral BMP_LINE_P_XCATEGORY_SMOOTH = u"chart2/res/nostacksmoothboth_52x60.png"; -inline constexpr OUStringLiteral BMP_LINE_O_XCATEGORY_SMOOTH = u"chart2/res/nostacksmoothlines_52x60.png"; -inline constexpr OUStringLiteral BMP_LINE3D_XCATEGORY_SMOOTH = u"chart2/res/nostacksmooth3d_52x60.png"; -inline constexpr OUStringLiteral BMP_LINE_P_STACKED_SMOOTH = u"chart2/res/stacksmoothboth_52x60.png"; -inline constexpr OUStringLiteral BMP_LINE_O_STACKED_SMOOTH = u"chart2/res/stacksmoothlines_52x60.png"; -inline constexpr OUStringLiteral BMP_LINE3D_STACKED_SMOOTH = u"chart2/res/stacksmooth3d_52x60.png"; -inline constexpr OUStringLiteral BMP_LINE_P_XVALUES_STEPPED = u"chart2/res/valueaxissteppedboth_52x60.png"; -inline constexpr OUStringLiteral BMP_LINE_O_XVALUES_STEPPED = u"chart2/res/valueaxissteppedlines_52x60.png"; -inline constexpr OUStringLiteral BMP_LINE3D_XVALUES_STEPPED = u"chart2/res/valueaxisstepped3d_52x60.png"; -inline constexpr OUStringLiteral BMP_LINE_P_XCATEGORY_STEPPED = u"chart2/res/nostacksteppedboth_52x60.png"; -inline constexpr OUStringLiteral BMP_LINE_O_XCATEGORY_STEPPED = u"chart2/res/nostacksteppedlines_52x60.png"; -inline constexpr OUStringLiteral BMP_LINE3D_XCATEGORY_STEPPED = u"chart2/res/nostackstepped3d_52x60.png"; -inline constexpr OUStringLiteral BMP_LINE_P_STACKED_STEPPED = u"chart2/res/stacksteppedboth_52x60.png"; -inline constexpr OUStringLiteral BMP_LINE_O_STACKED_STEPPED = u"chart2/res/stacksteppedlines_52x60.png"; -inline constexpr OUStringLiteral BMP_LINE3D_STACKED_STEPPED = u"chart2/res/stackstepped3d_52x60.png"; -inline constexpr OUStringLiteral BMP_NET = u"chart2/res/net_52x60.png"; -inline constexpr OUStringLiteral BMP_NET_STACK = u"chart2/res/netstack_52x60.png"; -inline constexpr OUStringLiteral BMP_NET_SYMB = u"chart2/res/netpoint_52x60.png"; -inline constexpr OUStringLiteral BMP_NET_SYMB_STACK = u"chart2/res/netpointstack_52x60.png"; -inline constexpr OUStringLiteral BMP_NET_LINESYMB = u"chart2/res/netlinepoint_52x60.png"; -inline constexpr OUStringLiteral BMP_NET_LINESYMB_STACK = u"chart2/res/netlinepointstack_52x60.png"; -inline constexpr OUStringLiteral BMP_NET_FILL = u"chart2/res/netfill_52x60.png"; -inline constexpr OUStringLiteral BMP_NET_FILL_STACK = u"chart2/res/netstackfill_52x60.png"; -inline constexpr OUStringLiteral BMP_PYRAMIDQ_3D_1 = u"chart2/res/pyramindhori_52x60.png"; -inline constexpr OUStringLiteral BMP_PYRAMIDQ_3D_2 = u"chart2/res/pyramindhoristack_52x60.png"; -inline constexpr OUStringLiteral BMP_PYRAMIDQ_3D_3 = u"chart2/res/pyramindhoripercent_52x60.png"; -inline constexpr OUStringLiteral BMP_PYRAMIDQ_3D_4 = u"chart2/res/pyramindhorideep_52x60.png"; -inline constexpr OUStringLiteral BMP_PYRAMID_3D_1 = u"chart2/res/pyramind_52x60.png"; -inline constexpr OUStringLiteral BMP_PYRAMID_3D_2 = u"chart2/res/pyramindstack_52x60.png"; -inline constexpr OUStringLiteral BMP_PYRAMID_3D_3 = u"chart2/res/pyramindpercent_52x60.png"; -inline constexpr OUStringLiteral BMP_PYRAMID_3D_4 = u"chart2/res/pyraminddeep_52x60.png"; -inline constexpr OUStringLiteral BMP_ROEHRE_3D_1 = u"chart2/res/cylinderhori_52x60.png"; -inline constexpr OUStringLiteral BMP_ROEHRE_3D_2 = u"chart2/res/cylinderhoristack_52x60.png"; -inline constexpr OUStringLiteral BMP_ROEHRE_3D_3 = u"chart2/res/cylinderhoriprocent_52x60.png"; -inline constexpr OUStringLiteral BMP_ROEHRE_3D_4 = u"chart2/res/cylinderhorideep_52x60.png"; -inline constexpr OUStringLiteral BMP_SAEULE_3D_1 = u"chart2/res/cylinder_52x60.png"; -inline constexpr OUStringLiteral BMP_SAEULE_3D_2 = u"chart2/res/cylinderstack_52x60.png"; -inline constexpr OUStringLiteral BMP_SAEULE_3D_3 = u"chart2/res/cylinderpercent_52x60.png"; -inline constexpr OUStringLiteral BMP_SAEULE_3D_4 = u"chart2/res/cylinderdeep_52x60.png"; -inline constexpr OUStringLiteral BMP_STOCK_1 = u"chart2/res/stock_52x60.png"; -inline constexpr OUStringLiteral BMP_STOCK_2 = u"chart2/res/stockblock_52x60.png"; -inline constexpr OUStringLiteral BMP_STOCK_3 = u"chart2/res/stockcolumns_52x60.png"; -inline constexpr OUStringLiteral BMP_STOCK_4 = u"chart2/res/stockcolumnsattach_52x60.png"; -inline constexpr OUStringLiteral BMP_INDICATE_BOTH_VERTI = u"chart2/res/errorbothverti_30.png"; -inline constexpr OUStringLiteral BMP_INDICATE_DOWN = u"chart2/res/errordown_30.png"; -inline constexpr OUStringLiteral BMP_INDICATE_UP = u"chart2/res/errorup_30.png"; -inline constexpr OUStringLiteral BMP_INDICATE_BOTH_HORI = u"chart2/res/errorbothhori_30.png"; -inline constexpr OUStringLiteral BMP_INDICATE_RIGHT = u"chart2/res/errorright_30.png"; -inline constexpr OUStringLiteral BMP_INDICATE_LEFT = u"chart2/res/errorleft_30.png"; -inline constexpr OUStringLiteral BMP_REGRESSION_LINEAR = u"chart2/res/reglin.png"; -inline constexpr OUStringLiteral BMP_REGRESSION_LOG = u"chart2/res/reglog.png"; -inline constexpr OUStringLiteral BMP_REGRESSION_EXP = u"chart2/res/regexp.png"; -inline constexpr OUStringLiteral BMP_REGRESSION_POWER = u"chart2/res/regpow.png"; -inline constexpr OUStringLiteral BMP_REGRESSION_POLYNOMIAL = u"chart2/res/regpoly.png"; -inline constexpr OUStringLiteral BMP_REGRESSION_MOVING_AVERAGE = u"chart2/res/regavg.png"; +inline constexpr OUString BMP_TYPE_COLUMN = u"chart2/res/typecolumn_16.png"_ustr; +inline constexpr OUString BMP_TYPE_BAR = u"chart2/res/typebar_16.png"_ustr; +inline constexpr OUString BMP_TYPE_PIE = u"chart2/res/typepie_16.png"_ustr; +inline constexpr OUString BMP_TYPE_LINE = u"chart2/res/typepointline_16.png"_ustr; +inline constexpr OUString BMP_TYPE_XY = u"chart2/res/typexy_16.png"_ustr; +inline constexpr OUString BMP_TYPE_AREA = u"chart2/res/typearea_16.png"_ustr; +inline constexpr OUString BMP_TYPE_NET = u"chart2/res/typenet_16.png"_ustr; +inline constexpr OUString BMP_TYPE_STOCK = u"chart2/res/typestock_16.png"_ustr; +inline constexpr OUString BMP_TYPE_COLUMN_LINE = u"chart2/res/typecolumnline_16.png"_ustr; +inline constexpr OUString BMP_TYPE_BUBBLE = u"chart2/res/typebubble_16.png"_ustr; +inline constexpr OUString BMP_BUBBLE_1 = u"chart2/res/bubble_52x60.png"_ustr; +inline constexpr OUString BMP_AREAS_2D = u"chart2/res/areas_52x60.png"_ustr; +inline constexpr OUString BMP_AREAS_2D_1 = u"chart2/res/areaspiled_52x60.png"_ustr; +inline constexpr OUString BMP_AREAS_2D_3 = u"chart2/res/areasfull_52x60.png"_ustr; +inline constexpr OUString BMP_AREAS_3D = u"chart2/res/areaspiled3d_52x60.png"_ustr; +inline constexpr OUString BMP_AREAS_3D_1 = u"chart2/res/areas3d_52x60.png"_ustr; +inline constexpr OUString BMP_AREAS_3D_2 = u"chart2/res/areasfull3d_52x60.png"_ustr; +inline constexpr OUString BMP_BARS_2D_1 = u"chart2/res/bar_52x60.png"_ustr; +inline constexpr OUString BMP_BARS_2D_2 = u"chart2/res/barstack_52x60.png"_ustr; +inline constexpr OUString BMP_BARS_2D_3 = u"chart2/res/barpercent_52x60.png"_ustr; +inline constexpr OUString BMP_BARS_3D = u"chart2/res/bar3ddeep_52x60.png"_ustr; +inline constexpr OUString BMP_BARS_3D_1 = u"chart2/res/bar3d_52x60.png"_ustr; +inline constexpr OUString BMP_BARS_3D_2 = u"chart2/res/barstack3d_52x60.png"_ustr; +inline constexpr OUString BMP_BARS_3D_3 = u"chart2/res/barpercent3d_52x60.png"_ustr; +inline constexpr OUString BMP_CIRCLES_2D = u"chart2/res/pie_52x60.png"_ustr; +inline constexpr OUString BMP_CIRCLES_2D_EXPLODED = u"chart2/res/pieexploded_52x60.png"_ustr; +inline constexpr OUString BMP_CIRCLES_3D = u"chart2/res/pie3d_52x60.png"_ustr; +inline constexpr OUString BMP_CIRCLES_3D_EXPLODED = u"chart2/res/pie3dexploded_52x60.png"_ustr; +inline constexpr OUString BMP_DONUT_2D = u"chart2/res/donut_52x60.png"_ustr; +inline constexpr OUString BMP_DONUT_2D_EXPLODED = u"chart2/res/donutexploded_52x60.png"_ustr; +inline constexpr OUString BMP_DONUT_3D = u"chart2/res/donut3d_52x60.png"_ustr; +inline constexpr OUString BMP_DONUT_3D_EXPLODED = u"chart2/res/donut3dexploded_52x60.png"_ustr; +inline constexpr OUString BMP_COLUMNS_2D_1 = u"chart2/res/columns_52x60.png"_ustr; +inline constexpr OUString BMP_COLUMNS_2D_2 = u"chart2/res/columnstack_52x60.png"_ustr; +inline constexpr OUString BMP_COLUMNS_2D_3 = u"chart2/res/columnpercent_52x60.png"_ustr; +inline constexpr OUString BMP_COLUMN_LINE = u"chart2/res/columnline_52x60.png"_ustr; +inline constexpr OUString BMP_COLUMN_LINE_STACKED = u"chart2/res/columnstackline_52x60.png"_ustr; +inline constexpr OUString BMP_COLUMNS_3D = u"chart2/res/columns3ddeep_52x60.png"_ustr; +inline constexpr OUString BMP_COLUMNS_3D_1 = u"chart2/res/columns3d_52x60.png"_ustr; +inline constexpr OUString BMP_COLUMNS_3D_2 = u"chart2/res/columnstack3d_52x60.png"_ustr; +inline constexpr OUString BMP_COLUMNS_3D_3 = u"chart2/res/columnpercent3d_52x60.png"_ustr; +inline constexpr OUString BMP_KEGELQ_3D_1 = u"chart2/res/conehori_52x60.png"_ustr; +inline constexpr OUString BMP_KEGELQ_3D_2 = u"chart2/res/conehoristack_52x60.png"_ustr; +inline constexpr OUString BMP_KEGELQ_3D_3 = u"chart2/res/conehoripercent_52x60.png"_ustr; +inline constexpr OUString BMP_KEGELQ_3D_4 = u"chart2/res/conehorideep_52x60.png"_ustr; +inline constexpr OUString BMP_KEGEL_3D_1 = u"chart2/res/cone_52x60.png"_ustr; +inline constexpr OUString BMP_KEGEL_3D_2 = u"chart2/res/conestack_52x60.png"_ustr; +inline constexpr OUString BMP_KEGEL_3D_3 = u"chart2/res/conepercent_52x60.png"_ustr; +inline constexpr OUString BMP_KEGEL_3D_4 = u"chart2/res/conedeep_52x60.png"_ustr; +inline constexpr OUString BMP_POINTS_XVALUES = u"chart2/res/valueaxisdirectpoints_52x60.png"_ustr; +inline constexpr OUString BMP_POINTS_XCATEGORY = u"chart2/res/nostackdirectpoints_52x60.png"_ustr; +inline constexpr OUString BMP_POINTS_STACKED = u"chart2/res/stackdirectpoints_52x60.png"_ustr; +inline constexpr OUString BMP_LINE_P_XVALUES = u"chart2/res/valueaxisdirectboth_52x60.png"_ustr; +inline constexpr OUString BMP_LINE_O_XVALUES = u"chart2/res/valueaxisdirectlines_52x60.png"_ustr; +inline constexpr OUString BMP_LINE3D_XVALUES = u"chart2/res/valueaxisdirect3d_52x60.png"_ustr; +inline constexpr OUString BMP_LINE_P_XCATEGORY = u"chart2/res/nostackdirectboth_52x60.png"_ustr; +inline constexpr OUString BMP_LINE_O_XCATEGORY = u"chart2/res/nostackdirectlines_52x60.png"_ustr; +inline constexpr OUString BMP_LINE3D_XCATEGORY = u"chart2/res/nostackdirect3d_52x60.png"_ustr; +inline constexpr OUString BMP_LINE_P_STACKED = u"chart2/res/stackdirectboth_52x60.png"_ustr; +inline constexpr OUString BMP_LINE_O_STACKED = u"chart2/res/stackdirectlines_52x60.png"_ustr; +inline constexpr OUString BMP_LINE3D_STACKED = u"chart2/res/stackdirect3d_52x60.png"_ustr; +inline constexpr OUString BMP_LINE_P_XVALUES_SMOOTH = u"chart2/res/valueaxissmoothboth_52x60.png"_ustr; +inline constexpr OUString BMP_LINE_O_XVALUES_SMOOTH = u"chart2/res/valueaxissmoothlines_52x60.png"_ustr; +inline constexpr OUString BMP_LINE3D_XVALUES_SMOOTH = u"chart2/res/valueaxissmooth3d_52x60.png"_ustr; +inline constexpr OUString BMP_LINE_P_XCATEGORY_SMOOTH = u"chart2/res/nostacksmoothboth_52x60.png"_ustr; +inline constexpr OUString BMP_LINE_O_XCATEGORY_SMOOTH = u"chart2/res/nostacksmoothlines_52x60.png"_ustr; +inline constexpr OUString BMP_LINE3D_XCATEGORY_SMOOTH = u"chart2/res/nostacksmooth3d_52x60.png"_ustr; +inline constexpr OUString BMP_LINE_P_STACKED_SMOOTH = u"chart2/res/stacksmoothboth_52x60.png"_ustr; +inline constexpr OUString BMP_LINE_O_STACKED_SMOOTH = u"chart2/res/stacksmoothlines_52x60.png"_ustr; +inline constexpr OUString BMP_LINE3D_STACKED_SMOOTH = u"chart2/res/stacksmooth3d_52x60.png"_ustr; +inline constexpr OUString BMP_LINE_P_XVALUES_STEPPED = u"chart2/res/valueaxissteppedboth_52x60.png"_ustr; +inline constexpr OUString BMP_LINE_O_XVALUES_STEPPED = u"chart2/res/valueaxissteppedlines_52x60.png"_ustr; +inline constexpr OUString BMP_LINE3D_XVALUES_STEPPED = u"chart2/res/valueaxisstepped3d_52x60.png"_ustr; +inline constexpr OUString BMP_LINE_P_XCATEGORY_STEPPED = u"chart2/res/nostacksteppedboth_52x60.png"_ustr; +inline constexpr OUString BMP_LINE_O_XCATEGORY_STEPPED = u"chart2/res/nostacksteppedlines_52x60.png"_ustr; +inline constexpr OUString BMP_LINE3D_XCATEGORY_STEPPED = u"chart2/res/nostackstepped3d_52x60.png"_ustr; +inline constexpr OUString BMP_LINE_P_STACKED_STEPPED = u"chart2/res/stacksteppedboth_52x60.png"_ustr; +inline constexpr OUString BMP_LINE_O_STACKED_STEPPED = u"chart2/res/stacksteppedlines_52x60.png"_ustr; +inline constexpr OUString BMP_LINE3D_STACKED_STEPPED = u"chart2/res/stackstepped3d_52x60.png"_ustr; +inline constexpr OUString BMP_NET = u"chart2/res/net_52x60.png"_ustr; +inline constexpr OUString BMP_NET_STACK = u"chart2/res/netstack_52x60.png"_ustr; +inline constexpr OUString BMP_NET_SYMB = u"chart2/res/netpoint_52x60.png"_ustr; +inline constexpr OUString BMP_NET_SYMB_STACK = u"chart2/res/netpointstack_52x60.png"_ustr; +inline constexpr OUString BMP_NET_LINESYMB = u"chart2/res/netlinepoint_52x60.png"_ustr; +inline constexpr OUString BMP_NET_LINESYMB_STACK = u"chart2/res/netlinepointstack_52x60.png"_ustr; +inline constexpr OUString BMP_NET_FILL = u"chart2/res/netfill_52x60.png"_ustr; +inline constexpr OUString BMP_NET_FILL_STACK = u"chart2/res/netstackfill_52x60.png"_ustr; +inline constexpr OUString BMP_PYRAMIDQ_3D_1 = u"chart2/res/pyramindhori_52x60.png"_ustr; +inline constexpr OUString BMP_PYRAMIDQ_3D_2 = u"chart2/res/pyramindhoristack_52x60.png"_ustr; +inline constexpr OUString BMP_PYRAMIDQ_3D_3 = u"chart2/res/pyramindhoripercent_52x60.png"_ustr; +inline constexpr OUString BMP_PYRAMIDQ_3D_4 = u"chart2/res/pyramindhorideep_52x60.png"_ustr; +inline constexpr OUString BMP_PYRAMID_3D_1 = u"chart2/res/pyramind_52x60.png"_ustr; +inline constexpr OUString BMP_PYRAMID_3D_2 = u"chart2/res/pyramindstack_52x60.png"_ustr; +inline constexpr OUString BMP_PYRAMID_3D_3 = u"chart2/res/pyramindpercent_52x60.png"_ustr; +inline constexpr OUString BMP_PYRAMID_3D_4 = u"chart2/res/pyraminddeep_52x60.png"_ustr; +inline constexpr OUString BMP_ROEHRE_3D_1 = u"chart2/res/cylinderhori_52x60.png"_ustr; +inline constexpr OUString BMP_ROEHRE_3D_2 = u"chart2/res/cylinderhoristack_52x60.png"_ustr; +inline constexpr OUString BMP_ROEHRE_3D_3 = u"chart2/res/cylinderhoriprocent_52x60.png"_ustr; +inline constexpr OUString BMP_ROEHRE_3D_4 = u"chart2/res/cylinderhorideep_52x60.png"_ustr; +inline constexpr OUString BMP_SAEULE_3D_1 = u"chart2/res/cylinder_52x60.png"_ustr; +inline constexpr OUString BMP_SAEULE_3D_2 = u"chart2/res/cylinderstack_52x60.png"_ustr; +inline constexpr OUString BMP_SAEULE_3D_3 = u"chart2/res/cylinderpercent_52x60.png"_ustr; +inline constexpr OUString BMP_SAEULE_3D_4 = u"chart2/res/cylinderdeep_52x60.png"_ustr; +inline constexpr OUString BMP_STOCK_1 = u"chart2/res/stock_52x60.png"_ustr; +inline constexpr OUString BMP_STOCK_2 = u"chart2/res/stockblock_52x60.png"_ustr; +inline constexpr OUString BMP_STOCK_3 = u"chart2/res/stockcolumns_52x60.png"_ustr; +inline constexpr OUString BMP_STOCK_4 = u"chart2/res/stockcolumnsattach_52x60.png"_ustr; +inline constexpr OUString BMP_INDICATE_BOTH_VERTI = u"chart2/res/errorbothverti_30.png"_ustr; +inline constexpr OUString BMP_INDICATE_DOWN = u"chart2/res/errordown_30.png"_ustr; +inline constexpr OUString BMP_INDICATE_UP = u"chart2/res/errorup_30.png"_ustr; +inline constexpr OUString BMP_INDICATE_BOTH_HORI = u"chart2/res/errorbothhori_30.png"_ustr; +inline constexpr OUString BMP_INDICATE_RIGHT = u"chart2/res/errorright_30.png"_ustr; +inline constexpr OUString BMP_INDICATE_LEFT = u"chart2/res/errorleft_30.png"_ustr; +inline constexpr OUString BMP_REGRESSION_LINEAR = u"chart2/res/reglin.png"_ustr; +inline constexpr OUString BMP_REGRESSION_LOG = u"chart2/res/reglog.png"_ustr; +inline constexpr OUString BMP_REGRESSION_EXP = u"chart2/res/regexp.png"_ustr; +inline constexpr OUString BMP_REGRESSION_POWER = u"chart2/res/regpow.png"_ustr; +inline constexpr OUString BMP_REGRESSION_POLYNOMIAL = u"chart2/res/regpoly.png"_ustr; +inline constexpr OUString BMP_REGRESSION_MOVING_AVERAGE = u"chart2/res/regavg.png"_ustr; /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/chart2/inc/unonames.hxx b/chart2/inc/unonames.hxx index 12b35914a6f5..abe190844962 100644 --- a/chart2/inc/unonames.hxx +++ b/chart2/inc/unonames.hxx @@ -11,28 +11,28 @@ #include <rtl/ustring.hxx> -inline constexpr OUStringLiteral CHART_UNONAME_SORT_BY_XVALUES = u"SortByXValues"; -inline constexpr OUStringLiteral CHART_UNONAME_SPLINE_TYPE = u"SplineType"; -inline constexpr OUStringLiteral CHART_UNONAME_SPLINE_ORDER = u"SplineOrder"; -inline constexpr OUStringLiteral CHART_UNONAME_SPLINE_RESOLUTION = u"SplineResolution"; -inline constexpr OUStringLiteral CHART_UNONAME_CURVE_STYLE = u"CurveStyle"; -inline constexpr OUStringLiteral CHART_UNONAME_CURVE_RESOLUTION = u"CurveResolution"; -inline constexpr OUStringLiteral CHART_UNONAME_NUMFMT = u"NumberFormat"; -inline constexpr OUStringLiteral CHART_UNONAME_LINK_TO_SRC_NUMFMT = u"LinkNumberFormatToSource"; -inline constexpr OUStringLiteral CHART_UNONAME_ERRORBAR_X = u"ErrorBarX"; -inline constexpr OUStringLiteral CHART_UNONAME_ERRORBAR_Y = u"ErrorBarY"; -inline constexpr OUStringLiteral CHART_UNONAME_LABEL = u"Label"; -inline constexpr OUStringLiteral CHART_UNONAME_LABEL_SEP = u"LabelSeparator"; -inline constexpr OUStringLiteral CHART_UNONAME_LABEL_BORDER_STYLE = u"LabelBorderStyle"; -inline constexpr OUStringLiteral CHART_UNONAME_LABEL_BORDER_WIDTH = u"LabelBorderWidth"; -inline constexpr OUStringLiteral CHART_UNONAME_LABEL_BORDER_COLOR = u"LabelBorderColor"; -inline constexpr OUStringLiteral CHART_UNONAME_LABEL_BORDER_DASH = u"LabelBorderDash"; -inline constexpr OUStringLiteral CHART_UNONAME_LABEL_BORDER_DASHNAME = u"LabelBorderDashName"; -inline constexpr OUStringLiteral CHART_UNONAME_LABEL_BORDER_TRANS = u"LabelBorderTransparency"; -inline constexpr OUStringLiteral CHART_UNONAME_LABEL_FILL_STYLE = u"LabelFillStyle"; -inline constexpr OUStringLiteral CHART_UNONAME_LABEL_FILL_BACKGROUND = u"LabelFillBackground"; -inline constexpr OUStringLiteral CHART_UNONAME_LABEL_FILL_HATCH_NAME = u"LabelFillHatchName"; -inline constexpr OUStringLiteral CHART_UNONAME_LABEL_FILL_COLOR = u"LabelFillColor"; -inline constexpr OUStringLiteral CHART_UNONAME_CUSTOM_LABEL_FIELDS = u"CustomLabelFields"; +inline constexpr OUString CHART_UNONAME_SORT_BY_XVALUES = u"SortByXValues"_ustr; +inline constexpr OUString CHART_UNONAME_SPLINE_TYPE = u"SplineType"_ustr; +inline constexpr OUString CHART_UNONAME_SPLINE_ORDER = u"SplineOrder"_ustr; +inline constexpr OUString CHART_UNONAME_SPLINE_RESOLUTION = u"SplineResolution"_ustr; +inline constexpr OUString CHART_UNONAME_CURVE_STYLE = u"CurveStyle"_ustr; +inline constexpr OUString CHART_UNONAME_CURVE_RESOLUTION = u"CurveResolution"_ustr; +inline constexpr OUString CHART_UNONAME_NUMFMT = u"NumberFormat"_ustr; +inline constexpr OUString CHART_UNONAME_LINK_TO_SRC_NUMFMT = u"LinkNumberFormatToSource"_ustr; +inline constexpr OUString CHART_UNONAME_ERRORBAR_X = u"ErrorBarX"_ustr; +inline constexpr OUString CHART_UNONAME_ERRORBAR_Y = u"ErrorBarY"_ustr; +inline constexpr OUString CHART_UNONAME_LABEL = u"Label"_ustr; +inline constexpr OUString CHART_UNONAME_LABEL_SEP = u"LabelSeparator"_ustr; +inline constexpr OUString CHART_UNONAME_LABEL_BORDER_STYLE = u"LabelBorderStyle"_ustr; +inline constexpr OUString CHART_UNONAME_LABEL_BORDER_WIDTH = u"LabelBorderWidth"_ustr; +inline constexpr OUString CHART_UNONAME_LABEL_BORDER_COLOR = u"LabelBorderColor"_ustr; +inline constexpr OUString CHART_UNONAME_LABEL_BORDER_DASH = u"LabelBorderDash"_ustr; +inline constexpr OUString CHART_UNONAME_LABEL_BORDER_DASHNAME = u"LabelBorderDashName"_ustr; +inline constexpr OUString CHART_UNONAME_LABEL_BORDER_TRANS = u"LabelBorderTransparency"_ustr; +inline constexpr OUString CHART_UNONAME_LABEL_FILL_STYLE = u"LabelFillStyle"_ustr; +inline constexpr OUString CHART_UNONAME_LABEL_FILL_BACKGROUND = u"LabelFillBackground"_ustr; +inline constexpr OUString CHART_UNONAME_LABEL_FILL_HATCH_NAME = u"LabelFillHatchName"_ustr; +inline constexpr OUString CHART_UNONAME_LABEL_FILL_COLOR = u"LabelFillColor"_ustr; +inline constexpr OUString CHART_UNONAME_CUSTOM_LABEL_FIELDS = u"CustomLabelFields"_ustr; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/inc/helpids.h b/chart2/source/controller/inc/helpids.h index 8e683334fdd3..775ec1489b42 100644 --- a/chart2/source/controller/inc/helpids.h +++ b/chart2/source/controller/inc/helpids.h @@ -21,12 +21,12 @@ #include <rtl/ustring.hxx> -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 OUString HID_SCH_WIN_DOCUMENT = u"CHART2_HID_SCH_WIN_DOCUMENT"_ustr; +inline constexpr OUString HID_SCH_ERROR_BARS_FROM_DATA = u"CHART2_SCH_ERROR_BARS_FROM_DATA"_ustr; -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"; +inline constexpr OUString HID_SCH_WIZARD_ROADMAP = u"CHART2_HID_SCH_WIZARD_ROADMAP"_ustr; +inline constexpr OUString HID_SCH_DATA_SERIES_LABEL = u"CHART2_HID_SCH_DATA_SERIES_LABEL"_ustr; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx index 458c35830db0..8ac9b33cdb08 100644 --- a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx @@ -109,7 +109,7 @@ bool lcl_NumberFormatFromItemToPropertySet( sal_uInt16 nWhichId, const SfxItemSe bool bChanged = false; if( !xPropertySet.is() ) return bChanged; - OUString aPropertyName = (nWhichId==SID_ATTR_NUMBERFORMAT_VALUE) ? OUString(CHART_UNONAME_NUMFMT) : OUString( "PercentageNumberFormat" ); + OUString aPropertyName = (nWhichId==SID_ATTR_NUMBERFORMAT_VALUE) ? CHART_UNONAME_NUMFMT : OUString( "PercentageNumberFormat" ); sal_uInt16 nSourceWhich = (nWhichId==SID_ATTR_NUMBERFORMAT_VALUE) ? SID_ATTR_NUMBERFORMAT_SOURCE : SCHATTR_PERCENT_NUMBERFORMAT_SOURCE; if( rItemSet.GetItemState( nSourceWhich ) != SfxItemState::SET ) @@ -156,7 +156,7 @@ bool lcl_UseSourceFormatFromItemToPropertySet( sal_uInt16 nWhichId, const SfxIte bool bChanged = false; if( !xPropertySet.is() ) return bChanged; - OUString aPropertyName = (nWhichId==SID_ATTR_NUMBERFORMAT_SOURCE) ? OUString(CHART_UNONAME_NUMFMT) : OUString( "PercentageNumberFormat" ); + OUString aPropertyName = (nWhichId==SID_ATTR_NUMBERFORMAT_SOURCE) ? CHART_UNONAME_NUMFMT : OUString( "PercentageNumberFormat" ); sal_uInt16 nFormatWhich = (nWhichId==SID_ATTR_NUMBERFORMAT_SOURCE) ? SID_ATTR_NUMBERFORMAT_VALUE : SCHATTR_PERCENT_NUMBERFORMAT_VALUE; if( rItemSet.GetItemState( nWhichId ) != SfxItemState::SET ) diff --git a/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx b/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx index 1d7dadd1fe5c..c725972c249b 100644 --- a/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx @@ -50,7 +50,7 @@ uno::Reference< beans::XPropertySet > lcl_GetErrorBar( if( xProp.is()) try { - ( xProp->getPropertyValue( bYError ? OUString(CHART_UNONAME_ERRORBAR_Y) : OUString(CHART_UNONAME_ERRORBAR_X) ) >>= xResult ); + ( xProp->getPropertyValue( bYError ? CHART_UNONAME_ERRORBAR_Y : CHART_UNONAME_ERRORBAR_X ) >>= xResult ); } catch( const uno::Exception & ) { @@ -308,7 +308,7 @@ bool StatisticsItemConverter::ApplySpecialItem( if( !xErrorBarProp.is() ) { xErrorBarProp = lcl_GetDefaultErrorBar(); - GetPropertySet()->setPropertyValue( bYError ? OUString(CHART_UNONAME_ERRORBAR_Y) : OUString(CHART_UNONAME_ERRORBAR_X), + GetPropertySet()->setPropertyValue( bYError ? CHART_UNONAME_ERRORBAR_Y : CHART_UNONAME_ERRORBAR_X, uno::Any( xErrorBarProp )); } diff --git a/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx b/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx index df7c46a6b342..4d2e6749f1fe 100644 --- a/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx @@ -102,7 +102,7 @@ bool numberFormatFromItemToPropertySet( if (!xPropertySet.is()) return bChanged; - OUString aPropertyName = (nWhichId == SID_ATTR_NUMBERFORMAT_VALUE) ? OUString(CHART_UNONAME_NUMFMT) : OUString("PercentageNumberFormat"); + OUString aPropertyName = (nWhichId == SID_ATTR_NUMBERFORMAT_VALUE) ? CHART_UNONAME_NUMFMT : OUString("PercentageNumberFormat"); sal_uInt16 nSourceWhich = (nWhichId == SID_ATTR_NUMBERFORMAT_VALUE) ? SID_ATTR_NUMBERFORMAT_SOURCE : SCHATTR_PERCENT_NUMBERFORMAT_SOURCE; if (rItemSet.GetItemState(nSourceWhich) != SfxItemState::SET) @@ -150,7 +150,7 @@ bool useSourceFormatFromItemToPropertySet( bool bChanged = false; if (!xPropertySet.is()) return bChanged; - OUString aPropertyName = (nWhichId == SID_ATTR_NUMBERFORMAT_SOURCE) ? OUString(CHART_UNONAME_NUMFMT) : OUString("PercentageNumberFormat"); + OUString aPropertyName = (nWhichId == SID_ATTR_NUMBERFORMAT_SOURCE) ? CHART_UNONAME_NUMFMT : OUString("PercentageNumberFormat"); sal_uInt16 nFormatWhich = (nWhichId == SID_ATTR_NUMBERFORMAT_SOURCE) ? SID_ATTR_NUMBERFORMAT_VALUE : SCHATTR_PERCENT_NUMBERFORMAT_VALUE; if (rItemSet.GetItemState(nWhichId) != SfxItemState::SET) diff --git a/chart2/source/inc/servicenames.hxx b/chart2/source/inc/servicenames.hxx index 48fbbffd370d..0f5cbe2b40f9 100644 --- a/chart2/source/inc/servicenames.hxx +++ b/chart2/source/inc/servicenames.hxx @@ -20,34 +20,34 @@ #include <rtl/ustring.hxx> -inline constexpr OUStringLiteral CHART_MODEL_SERVICE_IMPLEMENTATION_NAME - = u"com.sun.star.comp.chart2.ChartModel"; -inline constexpr OUStringLiteral CHART_MODEL_SERVICE_NAME = u"com.sun.star.chart2.ChartDocument"; +inline constexpr OUString CHART_MODEL_SERVICE_IMPLEMENTATION_NAME + = u"com.sun.star.comp.chart2.ChartModel"_ustr; +inline constexpr OUString CHART_MODEL_SERVICE_NAME = u"com.sun.star.chart2.ChartDocument"_ustr; //@todo create your own service containing the service com.sun.star.document.OfficeDocument -inline constexpr OUStringLiteral CHART_VIEW_SERVICE_IMPLEMENTATION_NAME - = u"com.sun.star.comp.chart2.ChartView"; -inline constexpr OUStringLiteral CHART_VIEW_SERVICE_NAME = u"com.sun.star.chart2.ChartView"; +inline constexpr OUString CHART_VIEW_SERVICE_IMPLEMENTATION_NAME + = u"com.sun.star.comp.chart2.ChartView"_ustr; +inline constexpr OUString CHART_VIEW_SERVICE_NAME = u"com.sun.star.chart2.ChartView"_ustr; -inline constexpr OUStringLiteral CHART_FRAMELOADER_SERVICE_IMPLEMENTATION_NAME - = u"com.sun.star.comp.chart2.ChartFrameLoader"; -inline constexpr OUStringLiteral CHART_FRAMELOADER_SERVICE_NAME - = u"com.sun.star.frame.SynchronousFrameLoader"; +inline constexpr OUString CHART_FRAMELOADER_SERVICE_IMPLEMENTATION_NAME + = u"com.sun.star.comp.chart2.ChartFrameLoader"_ustr; +inline constexpr OUString CHART_FRAMELOADER_SERVICE_NAME + = u"com.sun.star.frame.SynchronousFrameLoader"_ustr; -inline constexpr OUStringLiteral CHART_WIZARD_DIALOG_SERVICE_IMPLEMENTATION_NAME - = u"com.sun.star.comp.chart2.WizardDialog"; -inline constexpr OUStringLiteral CHART_WIZARD_DIALOG_SERVICE_NAME - = u"com.sun.star.chart2.WizardDialog"; +inline constexpr OUString CHART_WIZARD_DIALOG_SERVICE_IMPLEMENTATION_NAME + = u"com.sun.star.comp.chart2.WizardDialog"_ustr; +inline constexpr OUString CHART_WIZARD_DIALOG_SERVICE_NAME + = u"com.sun.star.chart2.WizardDialog"_ustr; -inline constexpr OUStringLiteral CHART_TYPE_DIALOG_SERVICE_IMPLEMENTATION_NAME - = u"com.sun.star.comp.chart2.ChartTypeDialog"; -inline constexpr OUStringLiteral CHART_TYPE_DIALOG_SERVICE_NAME - = u"com.sun.star.chart2.ChartTypeDialog"; +inline constexpr OUString CHART_TYPE_DIALOG_SERVICE_IMPLEMENTATION_NAME + = u"com.sun.star.comp.chart2.ChartTypeDialog"_ustr; +inline constexpr OUString CHART_TYPE_DIALOG_SERVICE_NAME + = u"com.sun.star.chart2.ChartTypeDialog"_ustr; // wrapper for old UNO API (com.sun.star.chart) -inline constexpr OUStringLiteral CHART_CHARTAPIWRAPPER_IMPLEMENTATION_NAME - = u"com.sun.star.comp.chart2.ChartDocumentWrapper"; -inline constexpr OUStringLiteral CHART_CHARTAPIWRAPPER_SERVICE_NAME - = u"com.sun.star.chart2.ChartDocumentWrapper"; +inline constexpr OUString CHART_CHARTAPIWRAPPER_IMPLEMENTATION_NAME + = u"com.sun.star.comp.chart2.ChartDocumentWrapper"_ustr; +inline constexpr OUString CHART_CHARTAPIWRAPPER_SERVICE_NAME + = u"com.sun.star.chart2.ChartDocumentWrapper"_ustr; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/inc/servicenames_charttypes.hxx b/chart2/source/inc/servicenames_charttypes.hxx index 0c06c2d3ea57..5ab2dcbf4929 100644 --- a/chart2/source/inc/servicenames_charttypes.hxx +++ b/chart2/source/inc/servicenames_charttypes.hxx @@ -20,25 +20,25 @@ #include <rtl/ustring.hxx> -inline constexpr OUStringLiteral CHART2_SERVICE_NAME_CHARTTYPE_AREA - = u"com.sun.star.chart2.AreaChartType"; -inline constexpr OUStringLiteral CHART2_SERVICE_NAME_CHARTTYPE_BAR - = u"com.sun.star.chart2.BarChartType"; -inline constexpr OUStringLiteral CHART2_SERVICE_NAME_CHARTTYPE_COLUMN - = u"com.sun.star.chart2.ColumnChartType"; -inline constexpr OUStringLiteral CHART2_SERVICE_NAME_CHARTTYPE_LINE - = u"com.sun.star.chart2.LineChartType"; -inline constexpr OUStringLiteral CHART2_SERVICE_NAME_CHARTTYPE_SCATTER - = u"com.sun.star.chart2.ScatterChartType"; -inline constexpr OUStringLiteral CHART2_SERVICE_NAME_CHARTTYPE_PIE - = u"com.sun.star.chart2.PieChartType"; -inline constexpr OUStringLiteral CHART2_SERVICE_NAME_CHARTTYPE_NET - = u"com.sun.star.chart2.NetChartType"; -inline constexpr OUStringLiteral CHART2_SERVICE_NAME_CHARTTYPE_FILLED_NET - = u"com.sun.star.chart2.FilledNetChartType"; -inline constexpr OUStringLiteral CHART2_SERVICE_NAME_CHARTTYPE_CANDLESTICK - = u"com.sun.star.chart2.CandleStickChartType"; -inline constexpr OUStringLiteral CHART2_SERVICE_NAME_CHARTTYPE_BUBBLE - = u"com.sun.star.chart2.BubbleChartType"; +inline constexpr OUString CHART2_SERVICE_NAME_CHARTTYPE_AREA + = u"com.sun.star.chart2.AreaChartType"_ustr; +inline constexpr OUString CHART2_SERVICE_NAME_CHARTTYPE_BAR + = u"com.sun.star.chart2.BarChartType"_ustr; +inline constexpr OUString CHART2_SERVICE_NAME_CHARTTYPE_COLUMN + = u"com.sun.star.chart2.ColumnChartType"_ustr; +inline constexpr OUString CHART2_SERVICE_NAME_CHARTTYPE_LINE + = u"com.sun.star.chart2.LineChartType"_ustr; +inline constexpr OUString CHART2_SERVICE_NAME_CHARTTYPE_SCATTER + = u"com.sun.star.chart2.ScatterChartType"_ustr; +inline constexpr OUString CHART2_SERVICE_NAME_CHARTTYPE_PIE + = u"com.sun.star.chart2.PieChartType"_ustr; +inline constexpr OUString CHART2_SERVICE_NAME_CHARTTYPE_NET + = u"com.sun.star.chart2.NetChartType"_ustr; +inline constexpr OUString CHART2_SERVICE_NAME_CHARTTYPE_FILLED_NET + = u"com.sun.star.chart2.FilledNetChartType"_ustr; +inline constexpr OUString CHART2_SERVICE_NAME_CHARTTYPE_CANDLESTICK + = u"com.sun.star.chart2.CandleStickChartType"_ustr; +inline constexpr OUString CHART2_SERVICE_NAME_CHARTTYPE_BUBBLE + = u"com.sun.star.chart2.BubbleChartType"_ustr; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/inc/servicenames_coosystems.hxx b/chart2/source/inc/servicenames_coosystems.hxx index f8472a3dfeec..065155a8bb37 100644 --- a/chart2/source/inc/servicenames_coosystems.hxx +++ b/chart2/source/inc/servicenames_coosystems.hxx @@ -20,7 +20,7 @@ #include <rtl/ustring.hxx> -inline constexpr OUStringLiteral CHART2_COOSYSTEM_CARTESIAN_VIEW_SERVICE_NAME = u"com.sun.star.chart2.CoordinateSystems.CartesianView"; -inline constexpr OUStringLiteral CHART2_COOSYSTEM_POLAR_VIEW_SERVICE_NAME = u"com.sun.star.chart2.CoordinateSystems.PolarView"; +inline constexpr OUString CHART2_COOSYSTEM_CARTESIAN_VIEW_SERVICE_NAME = u"com.sun.star.chart2.CoordinateSystems.CartesianView"_ustr; +inline constexpr OUString CHART2_COOSYSTEM_POLAR_VIEW_SERVICE_NAME = u"com.sun.star.chart2.CoordinateSystems.PolarView"_ustr; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx index 68eea85a0918..f1001f3333ea 100644 --- a/chart2/source/model/filter/XMLFilter.cxx +++ b/chart2/source/model/filter/XMLFilter.cxx @@ -708,7 +708,7 @@ void XMLFilter::isOasisFormat(const Sequence< beans::PropertyValue >& _rMediaDes } OUString XMLFilter::getMediaType(bool _bOasis) { - return _bOasis ? OUString(MIMETYPE_OASIS_OPENDOCUMENT_CHART_ASCII) : OUString(MIMETYPE_VND_SUN_XML_CHART_ASCII); + return _bOasis ? MIMETYPE_OASIS_OPENDOCUMENT_CHART_ASCII : MIMETYPE_VND_SUN_XML_CHART_ASCII; } OUString SAL_CALL XMLFilter::getImplementationName() diff --git a/chart2/source/tools/StatisticsHelper.cxx b/chart2/source/tools/StatisticsHelper.cxx index 64ce94f3b179..06eba5da4c44 100644 --- a/chart2/source/tools/StatisticsHelper.cxx +++ b/chart2/source/tools/StatisticsHelper.cxx @@ -290,7 +290,7 @@ Reference< beans::XPropertySet > StatisticsHelper::addErrorBars( return xErrorBar; const OUString aPropName( - bYError ? OUString(CHART_UNONAME_ERRORBAR_Y) : OUString(CHART_UNONAME_ERRORBAR_X)); + bYError ? CHART_UNONAME_ERRORBAR_Y : CHART_UNONAME_ERRORBAR_X); if( !( xDataSeries->getPropertyValue( aPropName ) >>= xErrorBar ) || !xErrorBar.is()) { @@ -314,7 +314,7 @@ Reference< beans::XPropertySet > StatisticsHelper::getErrorBars( { Reference< beans::XPropertySet > xErrorBar; const OUString aPropName( - bYError ? OUString(CHART_UNONAME_ERRORBAR_Y) : OUString(CHART_UNONAME_ERRORBAR_X)); + bYError ? CHART_UNONAME_ERRORBAR_Y : CHART_UNONAME_ERRORBAR_X); if ( xDataSeries.is()) xDataSeries->getPropertyValue( aPropName ) >>= xErrorBar; diff --git a/chart2/source/view/main/VDataSeries.cxx b/chart2/source/view/main/VDataSeries.cxx index 49b606ae0a6c..abfc7766d762 100644 --- a/chart2/source/view/main/VDataSeries.cxx +++ b/chart2/source/view/main/VDataSeries.cxx @@ -525,7 +525,7 @@ double VDataSeries::getBubble_Size( sal_Int32 index ) const bool VDataSeries::hasExplicitNumberFormat( sal_Int32 nPointIndex, bool bForPercentage ) const { - OUString aPropName = bForPercentage ? OUString("PercentageNumberFormat") : OUString(CHART_UNONAME_NUMFMT); + OUString aPropName = bForPercentage ? OUString("PercentageNumberFormat") : CHART_UNONAME_NUMFMT; bool bHasNumberFormat = false; bool bLinkToSource = true; uno::Reference< beans::XPropertySet > xPointProp( getPropertiesOfPoint( nPointIndex )); @@ -539,7 +539,7 @@ bool VDataSeries::hasExplicitNumberFormat( sal_Int32 nPointIndex, bool bForPerce } sal_Int32 VDataSeries::getExplicitNumberFormat( sal_Int32 nPointIndex, bool bForPercentage ) const { - OUString aPropName = bForPercentage ? OUString("PercentageNumberFormat") : OUString(CHART_UNONAME_NUMFMT); + OUString aPropName = bForPercentage ? OUString("PercentageNumberFormat") : CHART_UNONAME_NUMFMT; sal_Int32 nNumberFormat = -1; uno::Reference< beans::XPropertySet > xPointProp( getPropertiesOfPoint( nPointIndex )); if( xPointProp.is() ) diff --git a/compilerplugins/clang/ostr.cxx b/compilerplugins/clang/ostr.cxx index 9675913c8576..d0290aad1f90 100644 --- a/compilerplugins/clang/ostr.cxx +++ b/compilerplugins/clang/ostr.cxx @@ -46,14 +46,6 @@ public: = bool(loplugin::TypeCheck(i.first->getType()).Class("OUStringLiteral")); if (i.second.singleUse == nullptr) { - if (!(i.first->getDeclContext()->isFunctionOrMethod() - || compiler.getSourceManager().isInMainFile(i.first->getLocation()) - || compiler.getDiagnosticOpts().VerifyDiagnostics)) - { - //TODO, rewriting these in include files could trigger - // loplugin:redundantfcast in other translation units: - continue; - } if (rewriter != nullptr) { auto e = i.first->getInit()->IgnoreParenImpCasts(); diff --git a/connectivity/inc/strings.hxx b/connectivity/inc/strings.hxx index ef00d11de45f..b6bd8e5458de 100644 --- a/connectivity/inc/strings.hxx +++ b/connectivity/inc/strings.hxx @@ -14,63 +14,63 @@ // = log messages for the JDBC driver #define STR_LOG_DRIVER_CONNECTING_URL "jdbcBridge: connecting to URL '$1$'" -inline constexpr OUStringLiteral STR_LOG_DRIVER_SUCCESS = u"jdbcBridge: success"; -inline constexpr OUStringLiteral STR_LOG_CREATE_STATEMENT = u"c$1$: creating statement"; -inline constexpr OUStringLiteral STR_LOG_CREATED_STATEMENT_ID = u"c$1$: created statement, statement id: s$2$"; -inline constexpr OUStringLiteral STR_LOG_PREPARE_STATEMENT = u"c$1$: preparing statement: $2$"; -inline constexpr OUStringLiteral STR_LOG_PREPARED_STATEMENT_ID = u"c$1$: prepared statement, statement id: s$2$"; -inline constexpr OUStringLiteral STR_LOG_PREPARE_CALL = u"c$1$: preparing call: $2$"; -inline constexpr OUStringLiteral STR_LOG_PREPARED_CALL_ID = u"c$1$: prepared call, statement id: s$2$"; -inline constexpr OUStringLiteral STR_LOG_NATIVE_SQL = u"c$1$: native SQL: $2$ -> $3$"; -inline constexpr OUStringLiteral STR_LOG_LOADING_DRIVER = u"c$1$: attempting to load driver class $2$"; -inline constexpr OUStringLiteral STR_LOG_NO_DRIVER_CLASS = u"c$1$: no Java Driver Class was provided"; -inline constexpr OUStringLiteral STR_LOG_CONN_SUCCESS = u"c$1$: success"; -inline constexpr OUStringLiteral STR_LOG_NO_SYSTEM_CONNECTION = u"c$1$: JDBC driver did not provide a JDBC connection"; -inline constexpr OUStringLiteral STR_LOG_GOT_JDBC_CONNECTION = u"c$1$: obtained a JDBC connection for $2$"; -inline constexpr OUStringLiteral STR_LOG_SHUTDOWN_CONNECTION = u"c$1$: shutting down connection"; -inline constexpr OUStringLiteral STR_LOG_GENERATED_VALUES = u"s$1$: retrieving generated values"; -inline constexpr OUStringLiteral STR_LOG_GENERATED_VALUES_FALLBACK = u"s$1$: getGeneratedValues: falling back to statement: $2$"; -inline constexpr OUStringLiteral STR_LOG_EXECUTE_STATEMENT = u"s$1$: going to execute: $2$"; -inline constexpr OUStringLiteral STR_LOG_EXECUTE_QUERY = u"s$1$: going to execute query: $2$"; -inline constexpr OUStringLiteral STR_LOG_CLOSING_STATEMENT = u"s$1$: closing/disposing statement"; -inline constexpr OUStringLiteral STR_LOG_EXECUTE_UPDATE = u"s$1$: going to execute update: $2$"; -inline constexpr OUStringLiteral STR_LOG_UPDATE_COUNT = u"s$1$: update count: $2$"; -inline constexpr OUStringLiteral STR_LOG_RESULT_SET_CONCURRENCY = u"s$1$: going to set result set concurrency: $2$"; -inline constexpr OUStringLiteral STR_LOG_RESULT_SET_TYPE = u"s$1$: going to set result set type: $2$"; -inline constexpr OUStringLiteral STR_LOG_FETCH_DIRECTION = u"s$1$: fetch direction: $2$"; -inline constexpr OUStringLiteral STR_LOG_FETCH_SIZE = u"s$1$: fetch size: $2$"; -inline constexpr OUStringLiteral STR_LOG_SET_ESCAPE_PROCESSING = u"s$1$: going to set escape processing: $2$"; -inline constexpr OUStringLiteral STR_LOG_EXECUTING_PREPARED = u"s$1$: executing previously prepared statement"; -inline constexpr OUStringLiteral STR_LOG_EXECUTING_PREPARED_UPDATE = u"s$1$: executing previously prepared update statement"; -inline constexpr OUStringLiteral STR_LOG_EXECUTING_PREPARED_QUERY = u"s$1$: executing previously prepared query"; -inline constexpr OUStringLiteral STR_LOG_STRING_PARAMETER = u"s$1$: parameter no. $2$: type: string; value: $3$"; -inline constexpr OUStringLiteral STR_LOG_BOOLEAN_PARAMETER = u"s$1$: parameter no. $2$: type: boolean; value: $3$"; -inline constexpr OUStringLiteral STR_LOG_BYTE_PARAMETER = u"s$1$: parameter no. $2$: type: byte; value: $3$"; -inline constexpr OUStringLiteral STR_LOG_DATE_PARAMETER = u"s$1$: parameter no. $2$: type: date; value: $3$"; -inline constexpr OUStringLiteral STR_LOG_TIME_PARAMETER = u"s$1$: parameter no. $2$: type: time; value: $3$"; -inline constexpr OUStringLiteral STR_LOG_TIMESTAMP_PARAMETER = u"s$1$: parameter no. $2$: type: timestamp; value: $3$"; -inline constexpr OUStringLiteral STR_LOG_DOUBLE_PARAMETER = u"s$1$: parameter no. $2$: type: double; value: $3$"; -inline constexpr OUStringLiteral STR_LOG_FLOAT_PARAMETER = u"s$1$: parameter no. $2$: type: float; value: $3$"; -inline constexpr OUStringLiteral STR_LOG_INT_PARAMETER = u"s$1$: parameter no. $2$: type: int; value: $3$"; -inline constexpr OUStringLiteral STR_LOG_LONG_PARAMETER = u"s$1$: parameter no. $2$: type: long; value: $3$"; -inline constexpr OUStringLiteral STR_LOG_NULL_PARAMETER = u"s$1$: parameter no. $2$: sql-type: $3$; value: null"; -inline constexpr OUStringLiteral STR_LOG_OBJECT_NULL_PARAMETER = u"s$1$: parameter no. $2$: setting to null"; -inline constexpr OUStringLiteral STR_LOG_SHORT_PARAMETER = u"s$1$: parameter no. $2$: type: short; value: $3$"; -inline constexpr OUStringLiteral STR_LOG_BYTES_PARAMETER = u"s$1$: parameter no. $2$: type: byte[]"; -inline constexpr OUStringLiteral STR_LOG_CHARSTREAM_PARAMETER = u"s$1$: parameter no. $2$: type: character stream"; -inline constexpr OUStringLiteral STR_LOG_BINARYSTREAM_PARAMETER = u"s$1$: parameter no. $2$: type: binary stream"; -inline constexpr OUStringLiteral STR_LOG_CLEAR_PARAMETERS = u"s$1$: clearing all parameters"; -inline constexpr OUStringLiteral STR_LOG_META_DATA_METHOD = u"c$1$: entering XDatabaseMetaData::$2$"; -inline constexpr OUStringLiteral STR_LOG_META_DATA_METHOD_ARG1 = u"c$1$: entering XDatabaseMetaData::$2$( '$3$' )"; -inline constexpr OUStringLiteral STR_LOG_META_DATA_METHOD_ARG2 = u"c$1$: entering XDatabaseMetaData::$2$( '$3$', '$4$' )"; -inline constexpr OUStringLiteral STR_LOG_META_DATA_METHOD_ARG3 = u"c$1$: entering XDatabaseMetaData::$2$( '$3$', '$4$', '$5$' )"; -inline constexpr OUStringLiteral STR_LOG_META_DATA_METHOD_ARG4 = u"c$1$: entering XDatabaseMetaData::$2$( '$3$', '$4$', '$5$', '$6$' )"; -inline constexpr OUStringLiteral STR_LOG_META_DATA_RESULT = u"c$1$: leaving XDatabaseMetaData::$2$: success-with-result: $3$"; -inline constexpr OUStringLiteral STR_LOG_META_DATA_SUCCESS = u"c$1$: leaving XDatabaseMetaData::$2$: success"; +inline constexpr OUString STR_LOG_DRIVER_SUCCESS = u"jdbcBridge: success"_ustr; +inline constexpr OUString STR_LOG_CREATE_STATEMENT = u"c$1$: creating statement"_ustr; +inline constexpr OUString STR_LOG_CREATED_STATEMENT_ID = u"c$1$: created statement, statement id: s$2$"_ustr; +inline constexpr OUString STR_LOG_PREPARE_STATEMENT = u"c$1$: preparing statement: $2$"_ustr; +inline constexpr OUString STR_LOG_PREPARED_STATEMENT_ID = u"c$1$: prepared statement, statement id: s$2$"_ustr; +inline constexpr OUString STR_LOG_PREPARE_CALL = u"c$1$: preparing call: $2$"_ustr; +inline constexpr OUString STR_LOG_PREPARED_CALL_ID = u"c$1$: prepared call, statement id: s$2$"_ustr; +inline constexpr OUString STR_LOG_NATIVE_SQL = u"c$1$: native SQL: $2$ -> $3$"_ustr; +inline constexpr OUString STR_LOG_LOADING_DRIVER = u"c$1$: attempting to load driver class $2$"_ustr; +inline constexpr OUString STR_LOG_NO_DRIVER_CLASS = u"c$1$: no Java Driver Class was provided"_ustr; +inline constexpr OUString STR_LOG_CONN_SUCCESS = u"c$1$: success"_ustr; +inline constexpr OUString STR_LOG_NO_SYSTEM_CONNECTION = u"c$1$: JDBC driver did not provide a JDBC connection"_ustr; +inline constexpr OUString STR_LOG_GOT_JDBC_CONNECTION = u"c$1$: obtained a JDBC connection for $2$"_ustr; +inline constexpr OUString STR_LOG_SHUTDOWN_CONNECTION = u"c$1$: shutting down connection"_ustr; +inline constexpr OUString STR_LOG_GENERATED_VALUES = u"s$1$: retrieving generated values"_ustr; +inline constexpr OUString STR_LOG_GENERATED_VALUES_FALLBACK = u"s$1$: getGeneratedValues: falling back to statement: $2$"_ustr; +inline constexpr OUString STR_LOG_EXECUTE_STATEMENT = u"s$1$: going to execute: $2$"_ustr; +inline constexpr OUString STR_LOG_EXECUTE_QUERY = u"s$1$: going to execute query: $2$"_ustr; +inline constexpr OUString STR_LOG_CLOSING_STATEMENT = u"s$1$: closing/disposing statement"_ustr; +inline constexpr OUString STR_LOG_EXECUTE_UPDATE = u"s$1$: going to execute update: $2$"_ustr; +inline constexpr OUString STR_LOG_UPDATE_COUNT = u"s$1$: update count: $2$"_ustr; +inline constexpr OUString STR_LOG_RESULT_SET_CONCURRENCY = u"s$1$: going to set result set concurrency: $2$"_ustr; +inline constexpr OUString STR_LOG_RESULT_SET_TYPE = u"s$1$: going to set result set type: $2$"_ustr; +inline constexpr OUString STR_LOG_FETCH_DIRECTION = u"s$1$: fetch direction: $2$"_ustr; +inline constexpr OUString STR_LOG_FETCH_SIZE = u"s$1$: fetch size: $2$"_ustr; +inline constexpr OUString STR_LOG_SET_ESCAPE_PROCESSING = u"s$1$: going to set escape processing: $2$"_ustr; +inline constexpr OUString STR_LOG_EXECUTING_PREPARED = u"s$1$: executing previously prepared statement"_ustr; +inline constexpr OUString STR_LOG_EXECUTING_PREPARED_UPDATE = u"s$1$: executing previously prepared update statement"_ustr; +inline constexpr OUString STR_LOG_EXECUTING_PREPARED_QUERY = u"s$1$: executing previously prepared query"_ustr; +inline constexpr OUString STR_LOG_STRING_PARAMETER = u"s$1$: parameter no. $2$: type: string; value: $3$"_ustr; +inline constexpr OUString STR_LOG_BOOLEAN_PARAMETER = u"s$1$: parameter no. $2$: type: boolean; value: $3$"_ustr; +inline constexpr OUString STR_LOG_BYTE_PARAMETER = u"s$1$: parameter no. $2$: type: byte; value: $3$"_ustr; +inline constexpr OUString STR_LOG_DATE_PARAMETER = u"s$1$: parameter no. $2$: type: date; value: $3$"_ustr; +inline constexpr OUString STR_LOG_TIME_PARAMETER = u"s$1$: parameter no. $2$: type: time; value: $3$"_ustr; +inline constexpr OUString STR_LOG_TIMESTAMP_PARAMETER = u"s$1$: parameter no. $2$: type: timestamp; value: $3$"_ustr; +inline constexpr OUString STR_LOG_DOUBLE_PARAMETER = u"s$1$: parameter no. $2$: type: double; value: $3$"_ustr; +inline constexpr OUString STR_LOG_FLOAT_PARAMETER = u"s$1$: parameter no. $2$: type: float; value: $3$"_ustr; +inline constexpr OUString STR_LOG_INT_PARAMETER = u"s$1$: parameter no. $2$: type: int; value: $3$"_ustr; +inline constexpr OUString STR_LOG_LONG_PARAMETER = u"s$1$: parameter no. $2$: type: long; value: $3$"_ustr; +inline constexpr OUString STR_LOG_NULL_PARAMETER = u"s$1$: parameter no. $2$: sql-type: $3$; value: null"_ustr; +inline constexpr OUString STR_LOG_OBJECT_NULL_PARAMETER = u"s$1$: parameter no. $2$: setting to null"_ustr; +inline constexpr OUString STR_LOG_SHORT_PARAMETER = u"s$1$: parameter no. $2$: type: short; value: $3$"_ustr; +inline constexpr OUString STR_LOG_BYTES_PARAMETER = u"s$1$: parameter no. $2$: type: byte[]"_ustr; +inline constexpr OUString STR_LOG_CHARSTREAM_PARAMETER = u"s$1$: parameter no. $2$: type: character stream"_ustr; +inline constexpr OUString STR_LOG_BINARYSTREAM_PARAMETER = u"s$1$: parameter no. $2$: type: binary stream"_ustr; +inline constexpr OUString STR_LOG_CLEAR_PARAMETERS = u"s$1$: clearing all parameters"_ustr; +inline constexpr OUString STR_LOG_META_DATA_METHOD = u"c$1$: entering XDatabaseMetaData::$2$"_ustr; +inline constexpr OUString STR_LOG_META_DATA_METHOD_ARG1 = u"c$1$: entering XDatabaseMetaData::$2$( '$3$' )"_ustr; +inline constexpr OUString STR_LOG_META_DATA_METHOD_ARG2 = u"c$1$: entering XDatabaseMetaData::$2$( '$3$', '$4$' )"_ustr; +inline constexpr OUString STR_LOG_META_DATA_METHOD_ARG3 = u"c$1$: entering XDatabaseMetaData::$2$( '$3$', '$4$', '$5$' )"_ustr; +inline constexpr OUString STR_LOG_META_DATA_METHOD_ARG4 = u"c$1$: entering XDatabaseMetaData::$2$( '$3$', '$4$', '$5$', '$6$' )"_ustr; +inline constexpr OUString STR_LOG_META_DATA_RESULT = u"c$1$: leaving XDatabaseMetaData::$2$: success-with-result: $3$"_ustr; +inline constexpr OUString STR_LOG_META_DATA_SUCCESS = u"c$1$: leaving XDatabaseMetaData::$2$: success"_ustr; #define STR_LOG_THROWING_EXCEPTION "SQLException to be thrown: message: '$1$', SQLState: $2$, ErrorCode: $3$" -inline constexpr OUStringLiteral STR_LOG_SETTING_SYSTEM_PROPERTY = u"setting system property \"$1$\" to value \"$2$\""; +inline constexpr OUString STR_LOG_SETTING_SYSTEM_PROPERTY = u"setting system property \"$1$\" to value \"$2$\""_ustr; -inline constexpr OUStringLiteral STR_DB_NOT_CONNECTED_STATE = u"08003"; -inline constexpr OUStringLiteral STR_DATA_CANNOT_SELECT_UNFILTERED_STATE = u"IM001"; +inline constexpr OUString STR_DB_NOT_CONNECTED_STATE = u"08003"_ustr; +inline constexpr OUString STR_DATA_CANNOT_SELECT_UNFILTERED_STATE = u"IM001"_ustr; /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/connectivity/source/drivers/evoab2/NDriver.hxx b/connectivity/source/drivers/evoab2/NDriver.hxx index 9d3b57fa7988..b505bb9db5fd 100644 --- a/connectivity/source/drivers/evoab2/NDriver.hxx +++ b/connectivity/source/drivers/evoab2/NDriver.hxx @@ -28,7 +28,7 @@ #include <cppuhelper/compbase.hxx> #include <connectivity/CommonTools.hxx> -inline constexpr OUStringLiteral EVOAB_DRIVER_IMPL_NAME = u"com.sun.star.comp.sdbc.evoab.OEvoabDriver"; +inline constexpr OUString EVOAB_DRIVER_IMPL_NAME = u"com.sun.star.comp.sdbc.evoab.OEvoabDriver"_ustr; namespace connectivity::evoab { diff --git a/connectivity/source/inc/dbase/DIndex.hxx b/connectivity/source/inc/dbase/DIndex.hxx index 5446844cf808..3cc7da9ad1d3 100644 --- a/connectivity/source/inc/dbase/DIndex.hxx +++ b/connectivity/source/inc/dbase/DIndex.hxx @@ -23,7 +23,7 @@ #include <dbase/DTable.hxx> #include <dbase/dindexnode.hxx> -inline constexpr OStringLiteral dBASE_III_GROUP = "dBase III"; +inline constexpr OString dBASE_III_GROUP = "dBase III"_ostr; namespace connectivity::dbase { diff --git a/cui/inc/bitmaps.hlst b/cui/inc/bitmaps.hlst index db0a6ae98d11..6e0a1877588e 100644 --- a/cui/inc/bitmaps.hlst +++ b/cui/inc/bitmaps.hlst @@ -9,76 +9,76 @@ #pragma once -inline constexpr OUStringLiteral RID_SVXBMP_CELL_NONE = u"svx/res/pr01.png"; -inline constexpr OUStringLiteral RID_SVXBMP_CELL_NONE_32 = u"svx/res/border_cell_none_32.png"; -inline constexpr OUStringLiteral RID_SVXBMP_CELL_ALL = u"svx/res/pr02.png"; -inline constexpr OUStringLiteral RID_SVXBMP_CELL_ALL_32 = u"svx/res/border_cell_all_32.png"; -inline constexpr OUStringLiteral RID_SVXBMP_CELL_LR = u"svx/res/pr03.png"; -inline constexpr OUStringLiteral RID_SVXBMP_CELL_LR_32 = u"svx/res/border_cell_lr_32.png"; -inline constexpr OUStringLiteral RID_SVXBMP_CELL_TB = u"svx/res/pr04.png"; -inline constexpr OUStringLiteral RID_SVXBMP_CELL_TB_32 = u"svx/res/border_cell_tb_32.png"; -inline constexpr OUStringLiteral RID_SVXBMP_CELL_L = u"svx/res/pr05.png"; -inline constexpr OUStringLiteral RID_SVXBMP_CELL_L_32 = u"svx/res/border_cell_l_32.png"; -inline constexpr OUStringLiteral RID_SVXBMP_CELL_DIAG = u"svx/res/pr06.png"; -inline constexpr OUStringLiteral RID_SVXBMP_CELL_DIAG_32 = u"svx/res/border_cell_diag_32.png"; -inline constexpr OUStringLiteral RID_SVXBMP_HOR_NONE = u"svx/res/pr07.png"; -inline constexpr OUStringLiteral RID_SVXBMP_HOR_OUTER = u"svx/res/pr08.png"; -inline constexpr OUStringLiteral RID_SVXBMP_HOR_HOR = u"svx/res/pr09.png"; -inline constexpr OUStringLiteral RID_SVXBMP_HOR_ALL = u"svx/res/pr010.png"; -inline constexpr OUStringLiteral RID_SVXBMP_HOR_OUTER2 = u"svx/res/pr011.png"; -inline constexpr OUStringLiteral RID_SVXBMP_VER_NONE = u"svx/res/pr012.png"; -inline constexpr OUStringLiteral RID_SVXBMP_VER_OUTER = u"svx/res/pr013.png"; -inline constexpr OUStringLiteral RID_SVXBMP_VER_VER = u"svx/res/pr014.png"; -inline constexpr OUStringLiteral RID_SVXBMP_VER_ALL = u"svx/res/pr015.png"; -inline constexpr OUStringLiteral RID_SVXBMP_VER_OUTER2 = u"svx/res/pr016.png"; -inline constexpr OUStringLiteral RID_SVXBMP_TABLE_NONE = u"svx/res/pr017.png"; -inline constexpr OUStringLiteral RID_SVXBMP_TABLE_OUTER = u"svx/res/pr018.png"; -inline constexpr OUStringLiteral RID_SVXBMP_TABLE_OUTERH = u"svx/res/pr019.png"; -inline constexpr OUStringLiteral RID_SVXBMP_TABLE_ALL = u"svx/res/pr020.png"; -inline constexpr OUStringLiteral RID_SVXBMP_TABLE_OUTER2 = u"svx/res/pr021.png"; +inline constexpr OUString RID_SVXBMP_CELL_NONE = u"svx/res/pr01.png"_ustr; +inline constexpr OUString RID_SVXBMP_CELL_NONE_32 = u"svx/res/border_cell_none_32.png"_ustr; +inline constexpr OUString RID_SVXBMP_CELL_ALL = u"svx/res/pr02.png"_ustr; +inline constexpr OUString RID_SVXBMP_CELL_ALL_32 = u"svx/res/border_cell_all_32.png"_ustr; +inline constexpr OUString RID_SVXBMP_CELL_LR = u"svx/res/pr03.png"_ustr; +inline constexpr OUString RID_SVXBMP_CELL_LR_32 = u"svx/res/border_cell_lr_32.png"_ustr; +inline constexpr OUString RID_SVXBMP_CELL_TB = u"svx/res/pr04.png"_ustr; +inline constexpr OUString RID_SVXBMP_CELL_TB_32 = u"svx/res/border_cell_tb_32.png"_ustr; +inline constexpr OUString RID_SVXBMP_CELL_L = u"svx/res/pr05.png"_ustr; +inline constexpr OUString RID_SVXBMP_CELL_L_32 = u"svx/res/border_cell_l_32.png"_ustr; +inline constexpr OUString RID_SVXBMP_CELL_DIAG = u"svx/res/pr06.png"_ustr; +inline constexpr OUString RID_SVXBMP_CELL_DIAG_32 = u"svx/res/border_cell_diag_32.png"_ustr; +inline constexpr OUString RID_SVXBMP_HOR_NONE = u"svx/res/pr07.png"_ustr; +inline constexpr OUString RID_SVXBMP_HOR_OUTER = u"svx/res/pr08.png"_ustr; +inline constexpr OUString RID_SVXBMP_HOR_HOR = u"svx/res/pr09.png"_ustr; +inline constexpr OUString RID_SVXBMP_HOR_ALL = u"svx/res/pr010.png"_ustr; +inline constexpr OUString RID_SVXBMP_HOR_OUTER2 = u"svx/res/pr011.png"_ustr; +inline constexpr OUString RID_SVXBMP_VER_NONE = u"svx/res/pr012.png"_ustr; +inline constexpr OUString RID_SVXBMP_VER_OUTER = u"svx/res/pr013.png"_ustr; +inline constexpr OUString RID_SVXBMP_VER_VER = u"svx/res/pr014.png"_ustr; +inline constexpr OUString RID_SVXBMP_VER_ALL = u"svx/res/pr015.png"_ustr; +inline constexpr OUString RID_SVXBMP_VER_OUTER2 = u"svx/res/pr016.png"_ustr; +inline constexpr OUString RID_SVXBMP_TABLE_NONE = u"svx/res/pr017.png"_ustr; +inline constexpr OUString RID_SVXBMP_TABLE_OUTER = u"svx/res/pr018.png"_ustr; +inline constexpr OUString RID_SVXBMP_TABLE_OUTERH = u"svx/res/pr019.png"_ustr; +inline constexpr OUString RID_SVXBMP_TABLE_ALL = u"svx/res/pr020.png"_ustr; +inline constexpr OUString RID_SVXBMP_TABLE_OUTER2 = u"svx/res/pr021.png"_ustr; -inline constexpr OUStringLiteral RID_SVXBMP_SHADOWNONE = u"svx/res/sh01.png"; -inline constexpr OUStringLiteral RID_SVXBMP_SHADOWNONE_32 = u"svx/res/shadow_none_32.png"; -inline constexpr OUStringLiteral RID_SVXBMP_SHADOW_BOT_RIGHT = u"svx/res/sh02.png"; -inline constexpr OUStringLiteral RID_SVXBMP_SHADOW_BOT_RIGHT_32 = u"svx/res/shadow_bottom_right_32.png"; -inline constexpr OUStringLiteral RID_SVXBMP_SHADOW_BOT_LEFT = u"svx/res/sh03.png"; -inline constexpr OUStringLiteral RID_SVXBMP_SHADOW_BOT_LEFT_32 = u"svx/res/shadow_bottom_left_32.png"; -inline constexpr OUStringLiteral RID_SVXBMP_SHADOW_TOP_RIGHT = u"svx/res/sh04.png"; -inline constexpr OUStringLiteral RID_SVXBMP_SHADOW_TOP_RIGHT_32 = u"svx/res/shadow_top_right_32.png"; -inline constexpr OUStringLiteral RID_SVXBMP_SHADOW_TOP_LEFT = u"svx/res/sh05.png"; -inline constexpr OUStringLiteral RID_SVXBMP_SHADOW_TOP_LEFT_32 = u"svx/res/shadow_top_left_32.png"; +inline constexpr OUString RID_SVXBMP_SHADOWNONE = u"svx/res/sh01.png"_ustr; +inline constexpr OUString RID_SVXBMP_SHADOWNONE_32 = u"svx/res/shadow_none_32.png"_ustr; +inline constexpr OUString RID_SVXBMP_SHADOW_BOT_RIGHT = u"svx/res/sh02.png"_ustr; +inline constexpr OUString RID_SVXBMP_SHADOW_BOT_RIGHT_32 = u"svx/res/shadow_bottom_right_32.png"_ustr; +inline constexpr OUString RID_SVXBMP_SHADOW_BOT_LEFT = u"svx/res/sh03.png"_ustr; +inline constexpr OUString RID_SVXBMP_SHADOW_BOT_LEFT_32 = u"svx/res/shadow_bottom_left_32.png"_ustr; +inline constexpr OUString RID_SVXBMP_SHADOW_TOP_RIGHT = u"svx/res/sh04.png"_ustr; +inline constexpr OUString RID_SVXBMP_SHADOW_TOP_RIGHT_32 = u"svx/res/shadow_top_right_32.png"_ustr; +inline constexpr OUString RID_SVXBMP_SHADOW_TOP_LEFT = u"svx/res/sh05.png"_ustr; +inline constexpr OUString RID_SVXBMP_SHADOW_TOP_LEFT_32 = u"svx/res/shadow_top_left_32.png"_ustr; -inline constexpr OUStringLiteral RID_SVXBMP_BOTTOMLOCK = u"svx/res/lo01.png"; -inline constexpr OUStringLiteral RID_SVXBMP_TOPLOCK = u"svx/res/lo02.png"; -inline constexpr OUStringLiteral RID_SVXBMP_CELLLOCK = u"svx/res/lo03.png"; +inline constexpr OUString RID_SVXBMP_BOTTOMLOCK = u"svx/res/lo01.png"_ustr; +inline constexpr OUString RID_SVXBMP_TOPLOCK = u"svx/res/lo02.png"_ustr; +inline constexpr OUString RID_SVXBMP_CELLLOCK = u"svx/res/lo03.png"_ustr; -inline constexpr OUStringLiteral RID_SVXBMP_LOCK = u"res/lock.png"; +inline constexpr OUString RID_SVXBMP_LOCK = u"res/lock.png"_ustr; -inline constexpr OUStringLiteral RID_SVXBMP_THEME_NORMAL_BIG = u"svx/res/galnorl.png"; -inline constexpr OUStringLiteral RID_SVXBMP_THEME_READONLY_BIG = u"svx/res/galrdol.png"; -inline constexpr OUStringLiteral RID_SVXBMP_THEME_DEFAULT_BIG = u"svx/res/galdefl.png"; +inline constexpr OUString RID_SVXBMP_THEME_NORMAL_BIG = u"svx/res/galnorl.png"_ustr; +inline constexpr OUString RID_SVXBMP_THEME_READONLY_BIG = u"svx/res/galrdol.png"_ustr; +inline constexpr OUString RID_SVXBMP_THEME_DEFAULT_BIG = u"svx/res/galdefl.png"_ustr; -inline constexpr OUStringLiteral RID_CUIBMP_HARDDISK = u"res/harddisk_16.png"; -inline constexpr OUStringLiteral RID_CUIBMP_LIB = u"res/im30820.png"; -inline constexpr OUStringLiteral RID_CUIBMP_MACRO = u"res/im30821.png"; -inline constexpr OUStringLiteral RID_CUIBMP_DOC = u"res/im30826.png"; +inline constexpr OUString RID_CUIBMP_HARDDISK = u"res/harddisk_16.png"_ustr; +inline constexpr OUString RID_CUIBMP_LIB = u"res/im30820.png"_ustr; +inline constexpr OUString RID_CUIBMP_MACRO = u"res/im30821.png"_ustr; +inline constexpr OUString RID_CUIBMP_DOC = u"res/im30826.png"_ustr; -inline constexpr OUStringLiteral RID_SVXBMP_SCRIPT = u"res/script.png"; +inline constexpr OUString RID_SVXBMP_SCRIPT = u"res/script.png"_ustr; -inline constexpr OUStringLiteral RID_SVXBMP_LEGTYP1 = u"svx/res/legtyp1.png"; -inline constexpr OUStringLiteral RID_SVXBMP_LEGTYP2 = u"svx/res/legtyp2.png"; -inline constexpr OUStringLiteral RID_SVXBMP_LEGTYP3 = u"svx/res/legtyp3.png"; +inline constexpr OUString RID_SVXBMP_LEGTYP1 = u"svx/res/legtyp1.png"_ustr; +inline constexpr OUString RID_SVXBMP_LEGTYP2 = u"svx/res/legtyp2.png"_ustr; +inline constexpr OUString RID_SVXBMP_LEGTYP3 = u"svx/res/legtyp3.png"_ustr; -inline constexpr OUStringLiteral RID_SVXBMP_COMPONENT = u"res/component_16.png"; -inline constexpr OUStringLiteral RID_SVXBMP_MACRO = u"svx/res/id018.png"; -inline constexpr OUStringLiteral RID_SVXBMP_COPY = u"cmd/sc_copy.png"; +inline constexpr OUString RID_SVXBMP_COMPONENT = u"res/component_16.png"_ustr; +inline constexpr OUString RID_SVXBMP_MACRO = u"svx/res/id018.png"_ustr; +inline constexpr OUString RID_SVXBMP_COPY = u"cmd/sc_copy.png"_ustr; -inline constexpr OUStringLiteral RID_SVXBMP_STARS_FULL = u"cmd/sc_stars-full.png"; +inline constexpr OUString RID_SVXBMP_STARS_FULL = u"cmd/sc_stars-full.png"_ustr; -inline constexpr OUStringLiteral RID_SVXBMP_TOTD_WRITER = u"res/tipoftheday_w.png"; -inline constexpr OUStringLiteral RID_SVXBMP_TOTD_CALC = u"res/tipoftheday_c.png"; -inline constexpr OUStringLiteral RID_SVXBMP_TOTD_DRAW = u"res/tipoftheday_d.png"; -inline constexpr OUStringLiteral RID_SVXBMP_TOTD_IMPRESS = u"res/tipoftheday_i.png"; -inline constexpr OUStringLiteral RID_SVXBMP_TOTD_SOFFICE = u"res/tipoftheday.png"; +inline constexpr OUString RID_SVXBMP_TOTD_WRITER = u"res/tipoftheday_w.png"_ustr; +inline constexpr OUString RID_SVXBMP_TOTD_CALC = u"res/tipoftheday_c.png"_ustr; +inline constexpr OUString RID_SVXBMP_TOTD_DRAW = u"res/tipoftheday_d.png"_ustr; +inline constexpr OUString RID_SVXBMP_TOTD_IMPRESS = u"res/tipoftheday_i.png"_ustr; +inline constexpr OUString RID_SVXBMP_TOTD_SOFFICE = u"res/tipoftheday.png"_ustr; /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx index b1a1094733ea..79b54eb941ef 100644 --- a/cui/source/customize/macropg.cxx +++ b/cui/source/customize/macropg.cxx @@ -296,7 +296,7 @@ namespace return OUString(); size_t nIndex = rURL.find(aVndSunStarUNO); bool bUNO = nIndex == 0; - return bUNO ? OUString(RID_SVXBMP_COMPONENT) : OUString(RID_SVXBMP_MACRO); + return bUNO ? RID_SVXBMP_COMPONENT : RID_SVXBMP_MACRO; } } diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx index 4113f7334a1c..2c2e40a8e708 100644 --- a/cui/source/dialogs/scriptdlg.cxx +++ b/cui/source/dialogs/scriptdlg.cxx @@ -192,7 +192,7 @@ void SvxScriptOrgDialog::Init( std::u16string_view language ) Reference< browse::XBrowseNode > langEntries = getLangNodeFromRootNode( childNode, language ); - insertEntry( uiName, app ? OUString(RID_CUIBMP_HARDDISK) : OUString(RID_CUIBMP_DOC), + insertEntry( uiName, app ? RID_CUIBMP_HARDDISK : RID_CUIBMP_DOC, nullptr, true, std::make_unique< SFEntry >( langEntries, xDocumentModel ), factoryURL, false ); } diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx index aaf15b5a870c..1ae5b23a2999 100644 --- a/cui/source/inc/cfg.hxx +++ b/cui/source/inc/cfg.hxx @@ -40,24 +40,24 @@ #include "cfgutil.hxx" #include "CommandCategoryListBox.hxx" -inline constexpr OUStringLiteral notebookbarTabScope = u"notebookbarTabScope"; +inline constexpr OUString notebookbarTabScope = u"notebookbarTabScope"_ustr; -inline constexpr OUStringLiteral ITEM_DESCRIPTOR_COMMANDURL = u"CommandURL"; -inline constexpr OUStringLiteral ITEM_DESCRIPTOR_CONTAINER = u"ItemDescriptorContainer"; -inline constexpr OUStringLiteral ITEM_DESCRIPTOR_LABEL = u"Label"; -inline constexpr OUStringLiteral ITEM_DESCRIPTOR_TYPE = u"Type"; -inline constexpr OUStringLiteral ITEM_DESCRIPTOR_STYLE = u"Style"; -inline constexpr OUStringLiteral ITEM_DESCRIPTOR_ISVISIBLE = u"IsVisible"; -inline constexpr OUStringLiteral ITEM_DESCRIPTOR_RESOURCEURL = u"ResourceURL"; -inline constexpr OUStringLiteral ITEM_DESCRIPTOR_UINAME = u"UIName"; +inline constexpr OUString ITEM_DESCRIPTOR_COMMANDURL = u"CommandURL"_ustr; +inline constexpr OUString ITEM_DESCRIPTOR_CONTAINER = u"ItemDescriptorContainer"_ustr; +inline constexpr OUString ITEM_DESCRIPTOR_LABEL = u"Label"_ustr; +inline constexpr OUString ITEM_DESCRIPTOR_TYPE = u"Type"_ustr; +inline constexpr OUString ITEM_DESCRIPTOR_STYLE = u"Style"_ustr; +inline constexpr OUString ITEM_DESCRIPTOR_ISVISIBLE = u"IsVisible"_ustr; +inline constexpr OUString ITEM_DESCRIPTOR_RESOURCEURL = u"ResourceURL"_ustr; +inline constexpr OUString ITEM_DESCRIPTOR_UINAME = u"UIName"_ustr; -inline constexpr OUStringLiteral ITEM_MENUBAR_URL = u"private:resource/menubar/menubar"; -inline constexpr OUStringLiteral ITEM_TOOLBAR_URL = u"private:resource/toolbar/"; -inline constexpr OUStringLiteral ITEM_EVENT_URL = u"private:resource/event/"; +inline constexpr OUString ITEM_MENUBAR_URL = u"private:resource/menubar/menubar"_ustr; +inline constexpr OUString ITEM_TOOLBAR_URL = u"private:resource/toolbar/"_ustr; +inline constexpr OUString ITEM_EVENT_URL = u"private:resource/event/"_ustr; -inline constexpr OUStringLiteral CUSTOM_TOOLBAR_STR = u"custom_toolbar_"; +inline constexpr OUString CUSTOM_TOOLBAR_STR = u"custom_toolbar_"_ustr; -inline constexpr OUStringLiteral aMenuSeparatorStr = u" | "; +inline constexpr OUString aMenuSeparatorStr = u" | "_ustr; class SvxConfigEntry; class SvxConfigPage; diff --git a/cui/source/inc/helpids.h b/cui/source/inc/helpids.h index b17932ffa558..8f9af7fd9570 100644 --- a/cui/source/inc/helpids.h +++ b/cui/source/inc/helpids.h @@ -20,34 +20,33 @@ #include <rtl/ustring.hxx> -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"; +inline constexpr OUString HID_OPTIONS_COLORCONFIG_SAVE_SCHEME + = u"CUI_HID_OPTIONS_COLORCONFIG_SAVE_SCHEME"_ustr; +inline constexpr OUString HID_OFA_FONT_SUBST_CLB = u"CUI_HID_OFA_FONT_SUBST_CLB"_ustr; +inline constexpr OUString HID_DBPATH_CTL_PATH = u"CUI_HID_DBPATH_CTL_PATH"_ustr; #define HID_DBPATH_HEADERBAR "CUI_HID_DBPATH_HEADERBAR" -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"; +inline constexpr OUString HID_OFADLG_TREELISTBOX = u"CUI_HID_OFADLG_TREELISTBOX"_ustr; +inline constexpr OUString HID_SVX_CONFIG_TOOLBAR = u"CUI_HID_SVX_CONFIG_TOOLBAR"_ustr; +inline constexpr OUString HID_SVX_CONFIG_TOOLBAR_CONTENTS + = u"CUI_HID_SVX_CONFIG_TOOLBAR_CONTENTS"_ustr; +inline constexpr OUString HID_SVX_CONFIG_NOTEBOOKBAR_CONTENTS + = u"CUI_HID_SVX_CONFIG_NOTEBOOKBAR_CONTENTS"_ustr; +inline constexpr OUString HID_HANGULDLG_SUGGESTIONS_GRID + = u"CUI_HID_HANGULDLG_SUGGESTIONS_GRID"_ustr; +inline constexpr OUString HID_HANGULDLG_SUGGESTIONS_LIST + = u"CUI_HID_HANGULDLG_SUGGESTIONS_LIST"_ustr; +inline constexpr OUString HID_SVX_CONFIG_NAME_SUBMENU = u"CUI_HID_SVX_CONFIG_NAME_SUBMENU"_ustr; +inline constexpr OUString HID_SVX_CONFIG_RENAME_MENU = u"CUI_HID_SVX_CONFIG_RENAME_MENU"_ustr; +inline constexpr OUString HID_SVX_CONFIG_RENAME_MENU_ITEM + = u"CUI_HID_SVX_CONFIG_RENAME_MENU_ITEM"_ustr; +inline constexpr OUString HID_SVX_CONFIG_RENAME_TOOLBAR = u"CUI_HID_SVX_CONFIG_RENAME_TOOLBAR"_ustr; +inline constexpr OUString HID_SVX_CONFIG_RENAME_TOOLBAR_ITEM + = u"CUI_HID_SVX_CONFIG_RENAME_TOOLBAR_ITEM"_ustr; +inline constexpr OUString HID_SVX_UP_TOOLBAR_ITEM = u"CUI_HID_SVX_UP_TOOLBAR_ITEM"_ustr; +inline constexpr OUString HID_SVX_DOWN_TOOLBAR_ITEM = u"CUI_HID_SVX_DOWN_TOOLBAR_ITEM"_ustr; +inline constexpr OUString HID_SVX_SAVE_IN = u"CUI_HID_SVX_SAVE_IN"_ustr; +inline constexpr OUString HID_SVX_TOPLEVELLISTBOX = u"CUI_HID_SVX_TOPLEVELLISTBOX"_ustr; +inline constexpr OUString HID_SVX_DESCFIELD = u"CUI_HID_SVX_DESCFIELD"_ustr; +inline constexpr OUString HID_MACRO_HEADERTABLISTBOX = u"CUI_HID_MACRO_HEADERTABLISTBOX"_ustr; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/inc/bitmaps.hlst b/dbaccess/inc/bitmaps.hlst index 15352b63b524..1f93e59f505c 100644 --- a/dbaccess/inc/bitmaps.hlst +++ b/dbaccess/inc/bitmaps.hlst @@ -10,24 +10,24 @@ #ifndef INCLUDED_DBACCESS_INC_BITMAPS_HRC #define INCLUDED_DBACCESS_INC_BITMAPS_HRC -inline constexpr OUStringLiteral BMP_FORMFOLDER_TREE_L = u"dbaccess/res/forms_32.png"; -inline constexpr OUStringLiteral BMP_REPORTFOLDER_TREE_L = u"dbaccess/res/reports_32.png"; -inline constexpr OUStringLiteral BMP_QUERYFOLDER_TREE_L = u"dbaccess/res/queries_32.png"; -inline constexpr OUStringLiteral BMP_TABLEFOLDER_TREE_L = u"dbaccess/res/tables_32.png"; -inline constexpr OUStringLiteral DATABASE_TREE_ICON = u"dbaccess/res/db.png"; -inline constexpr OUStringLiteral TABLE_TREE_ICON = u"res/sx03188.png"; -inline constexpr OUStringLiteral TABLEFOLDER_TREE_ICON = u"res/sx03187.png"; -inline constexpr OUStringLiteral VIEW_TREE_ICON = u"res/sx16670.png"; -inline constexpr OUStringLiteral QUERY_TREE_ICON = u"res/sx03202.png"; -inline constexpr OUStringLiteral QUERYFOLDER_TREE_ICON = u"res/sx03201.png"; -inline constexpr OUStringLiteral FORM_TREE_ICON = u"dbaccess/res/form_16.png"; -inline constexpr OUStringLiteral FORMFOLDER_TREE_ICON = u"dbaccess/res/forms_16.png"; -inline constexpr OUStringLiteral REPORT_TREE_ICON = u"dbaccess/res/report_16.png"; -inline constexpr OUStringLiteral REPORTFOLDER_TREE_ICON = u"dbaccess/res/reports_16.png"; -inline constexpr OUStringLiteral BMP_PRIMARY_KEY = u"dbaccess/res/jo01.png"; -inline constexpr OUStringLiteral BMP_PKEYICON = u"dbaccess/res/pkey.png"; -inline constexpr OUStringLiteral BMP_UP = u"dbaccess/res/sortup.png"; -inline constexpr OUStringLiteral BMP_DOWN = u"dbaccess/res/sortdown.png"; +inline constexpr OUString BMP_FORMFOLDER_TREE_L = u"dbaccess/res/forms_32.png"_ustr; +inline constexpr OUString BMP_REPORTFOLDER_TREE_L = u"dbaccess/res/reports_32.png"_ustr; +inline constexpr OUString BMP_QUERYFOLDER_TREE_L = u"dbaccess/res/queries_32.png"_ustr; +inline constexpr OUString BMP_TABLEFOLDER_TREE_L = u"dbaccess/res/tables_32.png"_ustr; +inline constexpr OUString DATABASE_TREE_ICON = u"dbaccess/res/db.png"_ustr; ... etc. - the rest is truncated
