diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2023-10-19 16:39:09 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2023-10-23 11:04:42 +0200 |
commit | bd6fb0cd3eee3c7d414e55a7678c0097aadc7646 (patch) | |
tree | 5f754d7e485ab31dd4e04782b8eccd50d854d91e /include/xmloff | |
parent | 3501c52176d1122d9de08462435f633cd21de370 (diff) |
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 <sbergman@redhat.com>
Diffstat (limited to 'include/xmloff')
-rw-r--r-- | include/xmloff/ProgressBarHelper.hxx | 8 | ||||
-rw-r--r-- | include/xmloff/XMLFilterServiceNames.h | 24 | ||||
-rw-r--r-- | include/xmloff/families.hxx | 38 | ||||
-rw-r--r-- | include/xmloff/maptype.hxx | 5 | ||||
-rw-r--r-- | include/xmloff/odffields.hxx | 38 | ||||
-rw-r--r-- | include/xmloff/txtparae.hxx | 40 | ||||
-rw-r--r-- | include/xmloff/xmlimp.hxx | 2 | ||||
-rw-r--r-- | include/xmloff/xmlnumfe.hxx | 2 | ||||
-rw-r--r-- | include/xmloff/xmlnumfi.hxx | 2 |
9 files changed, 79 insertions, 80 deletions
diff --git a/include/xmloff/ProgressBarHelper.hxx b/include/xmloff/ProgressBarHelper.hxx index 1fc42c96db60..9cd47a7b18d3 100644 --- a/include/xmloff/ProgressBarHelper.hxx +++ b/include/xmloff/ProgressBarHelper.hxx @@ -24,10 +24,10 @@ #include <xmloff/dllapi.h> #include <com/sun/star/task/XStatusIndicator.hpp> -inline constexpr OUStringLiteral XML_PROGRESSRANGE = u"ProgressRange"; -inline constexpr OUStringLiteral XML_PROGRESSMAX = u"ProgressMax"; -inline constexpr OUStringLiteral XML_PROGRESSCURRENT = u"ProgressCurrent"; -inline constexpr OUStringLiteral XML_PROGRESSREPEAT = u"ProgressRepeat"; +inline constexpr OUString XML_PROGRESSRANGE = u"ProgressRange"_ustr; +inline constexpr OUString XML_PROGRESSMAX = u"ProgressMax"_ustr; +inline constexpr OUString XML_PROGRESSCURRENT = u"ProgressCurrent"_ustr; +inline constexpr OUString XML_PROGRESSREPEAT = u"ProgressRepeat"_ustr; class XMLOFF_DLLPUBLIC ProgressBarHelper { diff --git a/include/xmloff/XMLFilterServiceNames.h b/include/xmloff/XMLFilterServiceNames.h index 31549345bec4..9d3b35a6c569 100644 --- a/include/xmloff/XMLFilterServiceNames.h +++ b/include/xmloff/XMLFilterServiceNames.h @@ -23,18 +23,18 @@ #include <rtl/ustring.hxx> -inline constexpr OUStringLiteral XML_IMPORT_FILTER_WRITER = u"com.sun.star.comp.Writer.XMLOasisImporter"; -inline constexpr OUStringLiteral XML_IMPORT_FILTER_CALC = u"com.sun.star.comp.Calc.XMLOasisImporter"; -inline constexpr OUStringLiteral XML_IMPORT_FILTER_DRAW = u"com.sun.star.comp.Draw.XMLOasisImporter"; -inline constexpr OUStringLiteral XML_IMPORT_FILTER_IMPRESS = u"com.sun.star.comp.Impress.XMLOasisImporter"; -inline constexpr OUStringLiteral XML_IMPORT_FILTER_MATH = u"com.sun.star.comp.Math.XMLImporter"; -inline constexpr OUStringLiteral XML_IMPORT_FILTER_CHART = u"com.sun.star.comp.Chart.XMLOasisImporter"; +inline constexpr OUString XML_IMPORT_FILTER_WRITER = u"com.sun.star.comp.Writer.XMLOasisImporter"_ustr; +inline constexpr OUString XML_IMPORT_FILTER_CALC = u"com.sun.star.comp.Calc.XMLOasisImporter"_ustr; +inline constexpr OUString XML_IMPORT_FILTER_DRAW = u"com.sun.star.comp.Draw.XMLOasisImporter"_ustr; +inline constexpr OUString XML_IMPORT_FILTER_IMPRESS = u"com.sun.star.comp.Impress.XMLOasisImporter"_ustr; +inline constexpr OUString XML_IMPORT_FILTER_MATH = u"com.sun.star.comp.Math.XMLImporter"_ustr; +inline constexpr OUString XML_IMPORT_FILTER_CHART = u"com.sun.star.comp.Chart.XMLOasisImporter"_ustr; -inline constexpr OUStringLiteral XML_EXPORT_FILTER_WRITER = u"com.sun.star.comp.Writer.XMLOasisExporter"; -inline constexpr OUStringLiteral XML_EXPORT_FILTER_CALC = u"com.sun.star.comp.Calc.XMLOasisExporter"; -inline constexpr OUStringLiteral XML_EXPORT_FILTER_DRAW = u"com.sun.star.comp.Draw.XMLOasisExporter"; -inline constexpr OUStringLiteral XML_EXPORT_FILTER_IMPRESS = u"com.sun.star.comp.Impress.XMLOasisExporter"; -inline constexpr OUStringLiteral XML_EXPORT_FILTER_MATH = u"com.sun.star.comp.Math.XMLExporter"; -inline constexpr OUStringLiteral XML_EXPORT_FILTER_CHART = u"com.sun.star.comp.Chart.XMLOasisExporter"; +inline constexpr OUString XML_EXPORT_FILTER_WRITER = u"com.sun.star.comp.Writer.XMLOasisExporter"_ustr; +inline constexpr OUString XML_EXPORT_FILTER_CALC = u"com.sun.star.comp.Calc.XMLOasisExporter"_ustr; +inline constexpr OUString XML_EXPORT_FILTER_DRAW = u"com.sun.star.comp.Draw.XMLOasisExporter"_ustr; +inline constexpr OUString XML_EXPORT_FILTER_IMPRESS = u"com.sun.star.comp.Impress.XMLOasisExporter"_ustr; +inline constexpr OUString XML_EXPORT_FILTER_MATH = u"com.sun.star.comp.Math.XMLExporter"_ustr; +inline constexpr OUString XML_EXPORT_FILTER_CHART = u"com.sun.star.comp.Chart.XMLOasisExporter"_ustr; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/xmloff/families.hxx b/include/xmloff/families.hxx index bad2200bcbe4..79a0e558e9d4 100644 --- a/include/xmloff/families.hxx +++ b/include/xmloff/families.hxx @@ -25,26 +25,26 @@ used in the SvXMLAutoStylePoolP. */ -inline constexpr OUStringLiteral XML_STYLE_FAMILY_PAGE_MASTER_NAME = u"page-layout"; -inline constexpr OUStringLiteral XML_STYLE_FAMILY_PAGE_MASTER_PREFIX = u"pm"; -inline constexpr OUStringLiteral XML_STYLE_FAMILY_TABLE_TABLE_STYLES_NAME = u"table"; -inline constexpr OUStringLiteral XML_STYLE_FAMILY_TABLE_TABLE_STYLES_PREFIX = u"ta"; -inline constexpr OUStringLiteral XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_NAME = u"table-column"; -inline constexpr OUStringLiteral XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_PREFIX = u"co"; -inline constexpr OUStringLiteral XML_STYLE_FAMILY_TABLE_ROW_STYLES_NAME = u"table-row"; -inline constexpr OUStringLiteral XML_STYLE_FAMILY_TABLE_ROW_STYLES_PREFIX = u"ro"; -inline constexpr OUStringLiteral XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME = u"table-cell"; -inline constexpr OUStringLiteral XML_STYLE_FAMILY_TABLE_CELL_STYLES_PREFIX = u"ce"; -inline constexpr OUStringLiteral XML_STYLE_FAMILY_SD_GRAPHICS_NAME = u"graphic"; -inline constexpr OUStringLiteral XML_STYLE_FAMILY_SD_GRAPHICS_PREFIX = u"gr"; -inline constexpr OUStringLiteral XML_STYLE_FAMILY_SD_PRESENTATION_NAME = u"presentation"; -inline constexpr OUStringLiteral XML_STYLE_FAMILY_SD_PRESENTATION_PREFIX = u"pr"; +inline constexpr OUString XML_STYLE_FAMILY_PAGE_MASTER_NAME = u"page-layout"_ustr; +inline constexpr OUString XML_STYLE_FAMILY_PAGE_MASTER_PREFIX = u"pm"_ustr; +inline constexpr OUString XML_STYLE_FAMILY_TABLE_TABLE_STYLES_NAME = u"table"_ustr; +inline constexpr OUString XML_STYLE_FAMILY_TABLE_TABLE_STYLES_PREFIX = u"ta"_ustr; +inline constexpr OUString XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_NAME = u"table-column"_ustr; +inline constexpr OUString XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_PREFIX = u"co"_ustr; +inline constexpr OUString XML_STYLE_FAMILY_TABLE_ROW_STYLES_NAME = u"table-row"_ustr; +inline constexpr OUString XML_STYLE_FAMILY_TABLE_ROW_STYLES_PREFIX = u"ro"_ustr; +inline constexpr OUString XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME = u"table-cell"_ustr; +inline constexpr OUString XML_STYLE_FAMILY_TABLE_CELL_STYLES_PREFIX = u"ce"_ustr; +inline constexpr OUString XML_STYLE_FAMILY_SD_GRAPHICS_NAME = u"graphic"_ustr; +inline constexpr OUString XML_STYLE_FAMILY_SD_GRAPHICS_PREFIX = u"gr"_ustr; +inline constexpr OUString XML_STYLE_FAMILY_SD_PRESENTATION_NAME = u"presentation"_ustr; +inline constexpr OUString XML_STYLE_FAMILY_SD_PRESENTATION_PREFIX = u"pr"_ustr; #define XML_STYLE_FAMILY_SD_POOL_NAME u"default" -inline constexpr OUStringLiteral XML_STYLE_FAMILY_SD_DRAWINGPAGE_NAME = u"drawing-page"; -inline constexpr OUStringLiteral XML_STYLE_FAMILY_SD_DRAWINGPAGE_PREFIX = u"dp"; -inline constexpr OUStringLiteral XML_STYLE_FAMILY_SCH_CHART_NAME = u"chart"; -inline constexpr OUStringLiteral XML_STYLE_FAMILY_SCH_CHART_PREFIX = u"ch"; -inline constexpr OUStringLiteral XML_STYLE_FAMILY_CONTROL_PREFIX = u"ctrl"; +inline constexpr OUString XML_STYLE_FAMILY_SD_DRAWINGPAGE_NAME = u"drawing-page"_ustr; +inline constexpr OUString XML_STYLE_FAMILY_SD_DRAWINGPAGE_PREFIX = u"dp"_ustr; +inline constexpr OUString XML_STYLE_FAMILY_SCH_CHART_NAME = u"chart"_ustr; +inline constexpr OUString XML_STYLE_FAMILY_SCH_CHART_PREFIX = u"ch"_ustr; +inline constexpr OUString XML_STYLE_FAMILY_CONTROL_PREFIX = u"ctrl"_ustr; enum class XmlStyleFamily { diff --git a/include/xmloff/maptype.hxx b/include/xmloff/maptype.hxx index 9271027cb6c8..f15ef3d38002 100644 --- a/include/xmloff/maptype.hxx +++ b/include/xmloff/maptype.hxx @@ -99,11 +99,10 @@ struct XMLPropertyMapEntry */ bool mbImportOnly; - static constexpr OUStringLiteral EMPTY{u""}; + static constexpr OUString EMPTY{u""_ustr}; - template<std::size_t N> constexpr XMLPropertyMapEntry( - const OUStringLiteral<N>& sApiName, + const OUString& sApiName, sal_uInt16 nNameSpace, enum ::xmloff::token::XMLTokenEnum eXMLName, sal_uInt32 nType, diff --git a/include/xmloff/odffields.hxx b/include/xmloff/odffields.hxx index d5439d873a0f..5ad888b0d75c 100644 --- a/include/xmloff/odffields.hxx +++ b/include/xmloff/odffields.hxx @@ -22,26 +22,26 @@ #include <rtl/ustring.hxx> -inline constexpr OUStringLiteral ODF_FORMTEXT = u"vnd.oasis.opendocument.field.FORMTEXT"; +inline constexpr OUString ODF_FORMTEXT = u"vnd.oasis.opendocument.field.FORMTEXT"_ustr; #define ODF_FORMFIELD_DEFAULT_LENGTH 5 -inline constexpr OUStringLiteral ODF_FORMCHECKBOX = u"vnd.oasis.opendocument.field.FORMCHECKBOX"; -inline constexpr OUStringLiteral ODF_FORMCHECKBOX_HELPTEXT = u"Checkbox_HelpText"; -inline constexpr OUStringLiteral ODF_FORMCHECKBOX_RESULT = u"Checkbox_Checked"; +inline constexpr OUString ODF_FORMCHECKBOX = u"vnd.oasis.opendocument.field.FORMCHECKBOX"_ustr; +inline constexpr OUString ODF_FORMCHECKBOX_HELPTEXT = u"Checkbox_HelpText"_ustr; +inline constexpr OUString ODF_FORMCHECKBOX_RESULT = u"Checkbox_Checked"_ustr; -inline constexpr OUStringLiteral ODF_FORMDROPDOWN = u"vnd.oasis.opendocument.field.FORMDROPDOWN"; -inline constexpr OUStringLiteral ODF_FORMDROPDOWN_LISTENTRY = u"Dropdown_ListEntry"; -inline constexpr OUStringLiteral ODF_FORMDROPDOWN_RESULT = u"Dropdown_Selected"; +inline constexpr OUString ODF_FORMDROPDOWN = u"vnd.oasis.opendocument.field.FORMDROPDOWN"_ustr; +inline constexpr OUString ODF_FORMDROPDOWN_LISTENTRY = u"Dropdown_ListEntry"_ustr; +inline constexpr OUString ODF_FORMDROPDOWN_RESULT = u"Dropdown_Selected"_ustr; #define ODF_FORMDROPDOWN_ENTRY_COUNT_LIMIT 25 -inline constexpr OUStringLiteral ODF_FORMDATE = u"vnd.oasis.opendocument.field.FORMDATE"; -inline constexpr OUStringLiteral ODF_FORMDATE_DATEFORMAT - = u"DateField_DateFormat"; // e.g. "MM.DD.YY"; -inline constexpr OUStringLiteral ODF_FORMDATE_DATEFORMAT_LANGUAGE - = u"DateField_DateFormat_Language"; // e.g. "en-US", "hu-HU"; -inline constexpr OUStringLiteral ODF_FORMDATE_CURRENTDATE - = u"DateField_CurrentDate"; // date string in a specific format -inline constexpr OUStringLiteral ODF_FORMDATE_CURRENTDATE_FORMAT = u"YYYY-MM-DD"; // Coming from MSO +inline constexpr OUString ODF_FORMDATE = u"vnd.oasis.opendocument.field.FORMDATE"_ustr; +inline constexpr OUString ODF_FORMDATE_DATEFORMAT + = u"DateField_DateFormat"_ustr; // e.g. "MM.DD.YY"; +inline constexpr OUString ODF_FORMDATE_DATEFORMAT_LANGUAGE + = u"DateField_DateFormat_Language"_ustr; // e.g. "en-US", "hu-HU"; +inline constexpr OUString ODF_FORMDATE_CURRENTDATE + = u"DateField_CurrentDate"_ustr; // date string in a specific format +inline constexpr OUString ODF_FORMDATE_CURRENTDATE_FORMAT = u"YYYY-MM-DD"_ustr; // Coming from MSO #define ODF_FORMDATE_CURRENTDATE_LANGUAGE LANGUAGE_ENGLISH_US #define ODF_TOC "vnd.oasis.opendocument.field.TOC" @@ -50,10 +50,10 @@ inline constexpr OUStringLiteral ODF_FORMDATE_CURRENTDATE_FORMAT = u"YYYY-MM-DD" #define ODF_PAGEREF "vnd.oasis.opendocument.field.PAGEREF" -inline constexpr OUStringLiteral ODF_UNHANDLED = u"vnd.oasis.opendocument.field.UNHANDLED"; -inline constexpr OUStringLiteral ODF_OLE_PARAM = u"vnd.oasis.opendocument.field.ole"; -inline constexpr OUStringLiteral ODF_ID_PARAM = u"vnd.oasis.opendocument.field.id"; -inline constexpr OUStringLiteral ODF_CODE_PARAM = u"vnd.oasis.opendocument.field.code"; +inline constexpr OUString ODF_UNHANDLED = u"vnd.oasis.opendocument.field.UNHANDLED"_ustr; +inline constexpr OUString ODF_OLE_PARAM = u"vnd.oasis.opendocument.field.ole"_ustr; +inline constexpr OUString ODF_ID_PARAM = u"vnd.oasis.opendocument.field.id"_ustr; +inline constexpr OUString ODF_CODE_PARAM = u"vnd.oasis.opendocument.field.code"_ustr; #endif // INCLUDED_XMLOFF_ODFFIELDS_HXX diff --git a/include/xmloff/txtparae.hxx b/include/xmloff/txtparae.hxx index 021d265363b7..436c2d2b629e 100644 --- a/include/xmloff/txtparae.hxx +++ b/include/xmloff/txtparae.hxx @@ -139,28 +139,28 @@ public: private: // Implement Title/Description Elements UI (#i73249#) - static constexpr OUStringLiteral gsAnchorCharStyleName = u"AnchorCharStyleName"; - static constexpr OUStringLiteral gsBeginNotice = u"BeginNotice"; - static constexpr OUStringLiteral gsCategory = u"Category"; - static constexpr OUStringLiteral gsCharStyleName = u"CharStyleName"; - static constexpr OUStringLiteral gsCharStyleNames = u"CharStyleNames"; - static constexpr OUStringLiteral gsEndNotice = u"EndNotice"; - static constexpr OUStringLiteral gsFootnote = u"Footnote"; - static constexpr OUStringLiteral gsFootnoteCounting = u"FootnoteCounting"; - static constexpr OUStringLiteral gsNumberingType = u"NumberingType"; - static constexpr OUStringLiteral gsPageDescName = u"PageDescName"; - static constexpr OUStringLiteral gsPageStyleName = u"PageStyleName"; - static constexpr OUStringLiteral gsParaStyleName = u"ParaStyleName"; - static constexpr OUStringLiteral gsPositionEndOfDoc = u"PositionEndOfDoc"; - static constexpr OUStringLiteral gsPrefix = u"Prefix"; - static constexpr OUStringLiteral gsReferenceId = u"ReferenceId"; - static constexpr OUStringLiteral gsStartAt = u"StartAt"; - static constexpr OUStringLiteral gsSuffix = u"Suffix"; - static constexpr OUStringLiteral gsTextEndnoteService = u"com.sun.star.text.Endnote"; - static constexpr OUStringLiteral gsTextSection = u"TextSection"; + static constexpr OUString gsAnchorCharStyleName = u"AnchorCharStyleName"_ustr; + static constexpr OUString gsBeginNotice = u"BeginNotice"_ustr; + static constexpr OUString gsCategory = u"Category"_ustr; + static constexpr OUString gsCharStyleName = u"CharStyleName"_ustr; + static constexpr OUString gsCharStyleNames = u"CharStyleNames"_ustr; + static constexpr OUString gsEndNotice = u"EndNotice"_ustr; + static constexpr OUString gsFootnote = u"Footnote"_ustr; + static constexpr OUString gsFootnoteCounting = u"FootnoteCounting"_ustr; + static constexpr OUString gsNumberingType = u"NumberingType"_ustr; + static constexpr OUString gsPageDescName = u"PageDescName"_ustr; + static constexpr OUString gsPageStyleName = u"PageStyleName"_ustr; + static constexpr OUString gsParaStyleName = u"ParaStyleName"_ustr; + static constexpr OUString gsPositionEndOfDoc = u"PositionEndOfDoc"_ustr; + static constexpr OUString gsPrefix = u"Prefix"_ustr; + static constexpr OUString gsReferenceId = u"ReferenceId"_ustr; + static constexpr OUString gsStartAt = u"StartAt"_ustr; + static constexpr OUString gsSuffix = u"Suffix"_ustr; + static constexpr OUString gsTextEndnoteService = u"com.sun.star.text.Endnote"_ustr; + static constexpr OUString gsTextSection = u"TextSection"_ustr; protected: - static constexpr OUStringLiteral gsFrameStyleName = u"FrameStyleName"; + static constexpr OUString gsFrameStyleName = u"FrameStyleName"_ustr; SinglePropertySetInfoCache m_aCharStyleNamesPropInfoCache; SvXMLAutoStylePoolP& GetAutoStylePool() { return m_rAutoStylePool; } diff --git a/include/xmloff/xmlimp.hxx b/include/xmloff/xmlimp.hxx index 922b211341c7..b4616056c4ec 100644 --- a/include/xmloff/xmlimp.hxx +++ b/include/xmloff/xmlimp.hxx @@ -525,7 +525,7 @@ public: **/ bool getBuildIds( sal_Int32& rUPD, sal_Int32& rBuild ) const; - static constexpr OUStringLiteral aNamespaceSeparator = u":"; + static constexpr OUString aNamespaceSeparator = u":"_ustr; static const sal_uInt16 OOo_1x = 10; static const sal_uInt16 OOo_2x = 20; diff --git a/include/xmloff/xmlnumfe.hxx b/include/xmloff/xmlnumfe.hxx index 7c76e5117b1f..64a66a27ef05 100644 --- a/include/xmloff/xmlnumfe.hxx +++ b/include/xmloff/xmlnumfe.hxx @@ -32,7 +32,7 @@ namespace com::sun::star::lang { struct Locale; } namespace com::sun::star::uno { template <typename > class Reference; } namespace com::sun::star::util { class XNumberFormatsSupplier; } -inline constexpr OUStringLiteral XML_WRITTENNUMBERSTYLES = u"WrittenNumberStyles"; +inline constexpr OUString XML_WRITTENNUMBERSTYLES = u"WrittenNumberStyles"_ustr; class Color; class LocaleDataWrapper; diff --git a/include/xmloff/xmlnumfi.hxx b/include/xmloff/xmlnumfi.hxx index bebc580a937b..bfbc61dc8a99 100644 --- a/include/xmloff/xmlnumfi.hxx +++ b/include/xmloff/xmlnumfi.hxx @@ -33,7 +33,7 @@ namespace com::sun::star::uno { class XComponentContext; } namespace com::sun::star::util { class XNumberFormatsSupplier; } namespace com::sun::star::xml::sax { class XAttributeList; } -inline constexpr OUStringLiteral XML_NUMBERSTYLES = u"NumberStyles"; +inline constexpr OUString XML_NUMBERSTYLES = u"NumberStyles"_ustr; enum class SvXMLStylesTokens { |