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 | |
| 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')
39 files changed, 758 insertions, 767 deletions
diff --git a/include/comphelper/documentconstants.hxx b/include/comphelper/documentconstants.hxx index aafa84e7591c..929a49458c87 100644 --- a/include/comphelper/documentconstants.hxx +++ b/include/comphelper/documentconstants.hxx @@ -23,50 +23,50 @@ #include <rtl/ustring.hxx> // formats of SO6/7 -inline constexpr OUStringLiteral MIMETYPE_VND_SUN_XML_WRITER_ASCII = u"application/vnd.sun.xml.writer"; -inline constexpr OUStringLiteral MIMETYPE_VND_SUN_XML_WRITER_WEB_ASCII = u"application/vnd.sun.xml.writer.web"; -inline constexpr OUStringLiteral MIMETYPE_VND_SUN_XML_WRITER_GLOBAL_ASCII = u"application/vnd.sun.xml.writer.global"; -inline constexpr OUStringLiteral MIMETYPE_VND_SUN_XML_DRAW_ASCII = u"application/vnd.sun.xml.draw"; -inline constexpr OUStringLiteral MIMETYPE_VND_SUN_XML_IMPRESS_ASCII = u"application/vnd.sun.xml.impress"; -inline constexpr OUStringLiteral MIMETYPE_VND_SUN_XML_CALC_ASCII = u"application/vnd.sun.xml.calc"; -inline constexpr OUStringLiteral MIMETYPE_VND_SUN_XML_CHART_ASCII = u"application/vnd.sun.xml.chart"; -inline constexpr OUStringLiteral MIMETYPE_VND_SUN_XML_MATH_ASCII = u"application/vnd.sun.xml.math"; -inline constexpr OUStringLiteral MIMETYPE_VND_SUN_XML_BASE_ASCII = u"application/vnd.sun.xml.base"; +inline constexpr OUString MIMETYPE_VND_SUN_XML_WRITER_ASCII = u"application/vnd.sun.xml.writer"_ustr; +inline constexpr OUString MIMETYPE_VND_SUN_XML_WRITER_WEB_ASCII = u"application/vnd.sun.xml.writer.web"_ustr; +inline constexpr OUString MIMETYPE_VND_SUN_XML_WRITER_GLOBAL_ASCII = u"application/vnd.sun.xml.writer.global"_ustr; +inline constexpr OUString MIMETYPE_VND_SUN_XML_DRAW_ASCII = u"application/vnd.sun.xml.draw"_ustr; +inline constexpr OUString MIMETYPE_VND_SUN_XML_IMPRESS_ASCII = u"application/vnd.sun.xml.impress"_ustr; +inline constexpr OUString MIMETYPE_VND_SUN_XML_CALC_ASCII = u"application/vnd.sun.xml.calc"_ustr; +inline constexpr OUString MIMETYPE_VND_SUN_XML_CHART_ASCII = u"application/vnd.sun.xml.chart"_ustr; +inline constexpr OUString MIMETYPE_VND_SUN_XML_MATH_ASCII = u"application/vnd.sun.xml.math"_ustr; +inline constexpr OUString MIMETYPE_VND_SUN_XML_BASE_ASCII = u"application/vnd.sun.xml.base"_ustr; // template formats of SO6/7 -inline constexpr OUStringLiteral MIMETYPE_VND_SUN_XML_WRITER_TEMPLATE_ASCII = u"application/vnd.sun.xml.writer.template"; -inline constexpr OUStringLiteral MIMETYPE_VND_SUN_XML_DRAW_TEMPLATE_ASCII = u"application/vnd.sun.xml.draw.template"; -inline constexpr OUStringLiteral MIMETYPE_VND_SUN_XML_IMPRESS_TEMPLATE_ASCII = u"application/vnd.sun.xml.impress.template"; -inline constexpr OUStringLiteral MIMETYPE_VND_SUN_XML_CALC_TEMPLATE_ASCII = u"application/vnd.sun.xml.calc.template"; +inline constexpr OUString MIMETYPE_VND_SUN_XML_WRITER_TEMPLATE_ASCII = u"application/vnd.sun.xml.writer.template"_ustr; +inline constexpr OUString MIMETYPE_VND_SUN_XML_DRAW_TEMPLATE_ASCII = u"application/vnd.sun.xml.draw.template"_ustr; +inline constexpr OUString MIMETYPE_VND_SUN_XML_IMPRESS_TEMPLATE_ASCII = u"application/vnd.sun.xml.impress.template"_ustr; +inline constexpr OUString MIMETYPE_VND_SUN_XML_CALC_TEMPLATE_ASCII = u"application/vnd.sun.xml.calc.template"_ustr; // formats of SO8 -inline constexpr OUStringLiteral MIMETYPE_OASIS_OPENDOCUMENT_TEXT_ASCII = u"application/vnd.oasis.opendocument.text"; -inline constexpr OUStringLiteral MIMETYPE_OASIS_OPENDOCUMENT_TEXT_WEB_ASCII = u"application/vnd.oasis.opendocument.text-web"; -inline constexpr OUStringLiteral MIMETYPE_OASIS_OPENDOCUMENT_TEXT_GLOBAL_ASCII = u"application/vnd.oasis.opendocument.text-master"; -inline constexpr OUStringLiteral MIMETYPE_OASIS_OPENDOCUMENT_DRAWING_ASCII = u"application/vnd.oasis.opendocument.graphics"; -inline constexpr OUStringLiteral MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_ASCII = u"application/vnd.oasis.opendocument.presentation"; -inline constexpr OUStringLiteral MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET_ASCII = u"application/vnd.oasis.opendocument.spreadsheet"; -inline constexpr OUStringLiteral MIMETYPE_OASIS_OPENDOCUMENT_CHART_ASCII = u"application/vnd.oasis.opendocument.chart"; -inline constexpr OUStringLiteral MIMETYPE_OASIS_OPENDOCUMENT_FORMULA_ASCII = u"application/vnd.oasis.opendocument.formula"; -inline constexpr OUStringLiteral MIMETYPE_OASIS_OPENDOCUMENT_DATABASE_ASCII = u"application/vnd.oasis.opendocument.base"; -inline constexpr OUStringLiteral MIMETYPE_OASIS_OPENDOCUMENT_REPORT_ASCII = u"application/vnd.sun.xml.report"; -inline constexpr OUStringLiteral MIMETYPE_OASIS_OPENDOCUMENT_REPORT_CHART_ASCII = u"application/vnd.sun.xml.report.chart"; +inline constexpr OUString MIMETYPE_OASIS_OPENDOCUMENT_TEXT_ASCII = u"application/vnd.oasis.opendocument.text"_ustr; +inline constexpr OUString MIMETYPE_OASIS_OPENDOCUMENT_TEXT_WEB_ASCII = u"application/vnd.oasis.opendocument.text-web"_ustr; +inline constexpr OUString MIMETYPE_OASIS_OPENDOCUMENT_TEXT_GLOBAL_ASCII = u"application/vnd.oasis.opendocument.text-master"_ustr; +inline constexpr OUString MIMETYPE_OASIS_OPENDOCUMENT_DRAWING_ASCII = u"application/vnd.oasis.opendocument.graphics"_ustr; +inline constexpr OUString MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_ASCII = u"application/vnd.oasis.opendocument.presentation"_ustr; +inline constexpr OUString MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET_ASCII = u"application/vnd.oasis.opendocument.spreadsheet"_ustr; +inline constexpr OUString MIMETYPE_OASIS_OPENDOCUMENT_CHART_ASCII = u"application/vnd.oasis.opendocument.chart"_ustr; +inline constexpr OUString MIMETYPE_OASIS_OPENDOCUMENT_FORMULA_ASCII = u"application/vnd.oasis.opendocument.formula"_ustr; +inline constexpr OUString MIMETYPE_OASIS_OPENDOCUMENT_DATABASE_ASCII = u"application/vnd.oasis.opendocument.base"_ustr; +inline constexpr OUString MIMETYPE_OASIS_OPENDOCUMENT_REPORT_ASCII = u"application/vnd.sun.xml.report"_ustr; +inline constexpr OUString MIMETYPE_OASIS_OPENDOCUMENT_REPORT_CHART_ASCII = u"application/vnd.sun.xml.report.chart"_ustr; // template formats of SO8 -inline constexpr OUStringLiteral MIMETYPE_OASIS_OPENDOCUMENT_TEXT_TEMPLATE_ASCII = u"application/vnd.oasis.opendocument.text-template"; -inline constexpr OUStringLiteral MIMETYPE_OASIS_OPENDOCUMENT_TEXT_GLOBAL_TEMPLATE_ASCII = u"application/vnd.oasis.opendocument.text-master-template"; -inline constexpr OUStringLiteral MIMETYPE_OASIS_OPENDOCUMENT_DRAWING_TEMPLATE_ASCII = u"application/vnd.oasis.opendocument.graphics-template"; -inline constexpr OUStringLiteral MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_TEMPLATE_ASCII = u"application/vnd.oasis.opendocument.presentation-template"; -inline constexpr OUStringLiteral MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET_TEMPLATE_ASCII = u"application/vnd.oasis.opendocument.spreadsheet-template"; -inline constexpr OUStringLiteral MIMETYPE_OASIS_OPENDOCUMENT_CHART_TEMPLATE_ASCII = u"application/vnd.oasis.opendocument.chart-template"; -inline constexpr OUStringLiteral MIMETYPE_OASIS_OPENDOCUMENT_FORMULA_TEMPLATE_ASCII = u"application/vnd.oasis.opendocument.formula-template"; +inline constexpr OUString MIMETYPE_OASIS_OPENDOCUMENT_TEXT_TEMPLATE_ASCII = u"application/vnd.oasis.opendocument.text-template"_ustr; +inline constexpr OUString MIMETYPE_OASIS_OPENDOCUMENT_TEXT_GLOBAL_TEMPLATE_ASCII = u"application/vnd.oasis.opendocument.text-master-template"_ustr; +inline constexpr OUString MIMETYPE_OASIS_OPENDOCUMENT_DRAWING_TEMPLATE_ASCII = u"application/vnd.oasis.opendocument.graphics-template"_ustr; +inline constexpr OUString MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_TEMPLATE_ASCII = u"application/vnd.oasis.opendocument.presentation-template"_ustr; +inline constexpr OUString MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET_TEMPLATE_ASCII = u"application/vnd.oasis.opendocument.spreadsheet-template"_ustr; +inline constexpr OUString MIMETYPE_OASIS_OPENDOCUMENT_CHART_TEMPLATE_ASCII = u"application/vnd.oasis.opendocument.chart-template"_ustr; +inline constexpr OUString MIMETYPE_OASIS_OPENDOCUMENT_FORMULA_TEMPLATE_ASCII = u"application/vnd.oasis.opendocument.formula-template"_ustr; // ODF versions -inline constexpr OUStringLiteral ODFVER_010_TEXT = u"1.0"; -inline constexpr OUStringLiteral ODFVER_011_TEXT = u"1.1"; -inline constexpr OUStringLiteral ODFVER_012_TEXT = u"1.2"; -inline constexpr OUStringLiteral ODFVER_013_TEXT = u"1.3"; +inline constexpr OUString ODFVER_010_TEXT = u"1.0"_ustr; +inline constexpr OUString ODFVER_011_TEXT = u"1.1"_ustr; +inline constexpr OUString ODFVER_012_TEXT = u"1.2"_ustr; +inline constexpr OUString ODFVER_013_TEXT = u"1.3"_ustr; // filter flags // TODO/LATER: The flags should be part of the UNO specification diff --git a/include/comphelper/mediamimetype.hxx b/include/comphelper/mediamimetype.hxx index 21b7ffa9211b..27565814d0cf 100644 --- a/include/comphelper/mediamimetype.hxx +++ b/include/comphelper/mediamimetype.hxx @@ -17,7 +17,7 @@ #include <comphelper/comphelperdllapi.h> -inline constexpr OUStringLiteral AVMEDIA_MIMETYPE_COMMON = u"application/vnd.sun.star.media"; +inline constexpr OUString AVMEDIA_MIMETYPE_COMMON = u"application/vnd.sun.star.media"_ustr; namespace comphelper { diff --git a/include/comphelper/storagehelper.hxx b/include/comphelper/storagehelper.hxx index 3d8e0bc916c5..2b36bbde5aac 100644 --- a/include/comphelper/storagehelper.hxx +++ b/include/comphelper/storagehelper.hxx @@ -26,14 +26,14 @@ #include <memory> #include <string_view> -inline constexpr OUStringLiteral PACKAGE_STORAGE_FORMAT_STRING = u"PackageFormat"; -inline constexpr OUStringLiteral ZIP_STORAGE_FORMAT_STRING = u"ZipFormat"; -inline constexpr OUStringLiteral OFOPXML_STORAGE_FORMAT_STRING = u"OFOPXMLFormat"; - -inline constexpr OUStringLiteral PACKAGE_ENCRYPTIONDATA_SHA256UTF8 = u"PackageSHA256UTF8EncryptionKey"; -inline constexpr OUStringLiteral PACKAGE_ENCRYPTIONDATA_SHA1UTF8 = u"PackageSHA1UTF8EncryptionKey"; -inline constexpr OUStringLiteral PACKAGE_ENCRYPTIONDATA_SHA1MS1252 = u"PackageSHA1MS1252EncryptionKey"; -inline constexpr OUStringLiteral PACKAGE_ENCRYPTIONDATA_SHA1CORRECT = u"PackageSHA1CorrectEncryptionKey"; +inline constexpr OUString PACKAGE_STORAGE_FORMAT_STRING = u"PackageFormat"_ustr; +inline constexpr OUString ZIP_STORAGE_FORMAT_STRING = u"ZipFormat"_ustr; +inline constexpr OUString OFOPXML_STORAGE_FORMAT_STRING = u"OFOPXMLFormat"_ustr; + +inline constexpr OUString PACKAGE_ENCRYPTIONDATA_SHA256UTF8 = u"PackageSHA256UTF8EncryptionKey"_ustr; +inline constexpr OUString PACKAGE_ENCRYPTIONDATA_SHA1UTF8 = u"PackageSHA1UTF8EncryptionKey"_ustr; +inline constexpr OUString PACKAGE_ENCRYPTIONDATA_SHA1MS1252 = u"PackageSHA1MS1252EncryptionKey"_ustr; +inline constexpr OUString PACKAGE_ENCRYPTIONDATA_SHA1CORRECT = u"PackageSHA1CorrectEncryptionKey"_ustr; namespace com::sun::star { namespace beans { struct NamedValue; } diff --git a/include/editeng/itemtype.hxx b/include/editeng/itemtype.hxx index 7f70a7073a45..f139a032f776 100644 --- a/include/editeng/itemtype.hxx +++ b/include/editeng/itemtype.hxx @@ -30,7 +30,7 @@ class Color; class IntlWrapper; // static and prototypes ------------------------------------------------- -inline constexpr OUStringLiteral cpDelim = u", "; +inline constexpr OUString cpDelim = u", "_ustr; EDITENG_DLLPUBLIC OUString GetMetricText( tools::Long nVal, MapUnit eSrcUnit, MapUnit eDestUnit, const IntlWrapper * pIntl ); OUString GetColorString( const Color& rCol ); diff --git a/include/editeng/unonames.hxx b/include/editeng/unonames.hxx index 2e5b44e1ad88..b1de4de3cb91 100644 --- a/include/editeng/unonames.hxx +++ b/include/editeng/unonames.hxx @@ -13,39 +13,39 @@ #include <rtl/ustring.hxx> // Common across fields -inline constexpr OUStringLiteral UNO_TC_PROP_ANCHOR = u"Anchor"; -inline constexpr OUStringLiteral UNO_TC_PROP_TEXTFIELD_TYPE = u"TextFieldType"; -inline constexpr OUStringLiteral UNO_TC_PROP_IS_FIXED = u"IsFixed"; -inline constexpr OUStringLiteral UNO_TC_PROP_CURRENT_PRESENTATION = u"CurrentPresentation"; -inline constexpr OUStringLiteral UNO_TC_PROP_NAME = u"Name"; -inline constexpr OUStringLiteral UNO_TC_PROP_IS_FIXED_LANGUAGE = u"IsFixedLanguage"; -inline constexpr OUStringLiteral UNO_TC_PROP_NUMFORMAT = u"NumberFormat"; +inline constexpr OUString UNO_TC_PROP_ANCHOR = u"Anchor"_ustr; +inline constexpr OUString UNO_TC_PROP_TEXTFIELD_TYPE = u"TextFieldType"_ustr; +inline constexpr OUString UNO_TC_PROP_IS_FIXED = u"IsFixed"_ustr; +inline constexpr OUString UNO_TC_PROP_CURRENT_PRESENTATION = u"CurrentPresentation"_ustr; +inline constexpr OUString UNO_TC_PROP_NAME = u"Name"_ustr; +inline constexpr OUString UNO_TC_PROP_IS_FIXED_LANGUAGE = u"IsFixedLanguage"_ustr; +inline constexpr OUString UNO_TC_PROP_NUMFORMAT = u"NumberFormat"_ustr; // Date & Time -inline constexpr OUStringLiteral UNO_TC_PROP_IS_DATE = u"IsDate"; -inline constexpr OUStringLiteral UNO_TC_PROP_DATE_TIME = u"DateTime"; +inline constexpr OUString UNO_TC_PROP_IS_DATE = u"IsDate"_ustr; +inline constexpr OUString UNO_TC_PROP_DATE_TIME = u"DateTime"_ustr; // URL -inline constexpr OUStringLiteral UNO_TC_PROP_URL_FORMAT = u"Format"; -inline constexpr OUStringLiteral UNO_TC_PROP_URL_REPRESENTATION = u"Representation"; -inline constexpr OUStringLiteral UNO_TC_PROP_URL_TARGET = u"TargetFrame"; -inline constexpr OUStringLiteral UNO_TC_PROP_URL = u"URL"; +inline constexpr OUString UNO_TC_PROP_URL_FORMAT = u"Format"_ustr; +inline constexpr OUString UNO_TC_PROP_URL_REPRESENTATION = u"Representation"_ustr; +inline constexpr OUString UNO_TC_PROP_URL_TARGET = u"TargetFrame"_ustr; +inline constexpr OUString UNO_TC_PROP_URL = u"URL"_ustr; // Table -inline constexpr OUStringLiteral UNO_TC_PROP_TABLE_POSITION = u"TablePosition"; +inline constexpr OUString UNO_TC_PROP_TABLE_POSITION = u"TablePosition"_ustr; // File -inline constexpr OUStringLiteral UNO_TC_PROP_FILE_FORMAT = u"FileFormat"; +inline constexpr OUString UNO_TC_PROP_FILE_FORMAT = u"FileFormat"_ustr; // Author -inline constexpr OUStringLiteral UNO_TC_PROP_AUTHOR_CONTENT = u"Content"; -inline constexpr OUStringLiteral UNO_TC_PROP_AUTHOR_FORMAT = u"AuthorFormat"; -inline constexpr OUStringLiteral UNO_TC_PROP_AUTHOR_FULLNAME = u"FullName"; +inline constexpr OUString UNO_TC_PROP_AUTHOR_CONTENT = u"Content"_ustr; +inline constexpr OUString UNO_TC_PROP_AUTHOR_FORMAT = u"AuthorFormat"_ustr; +inline constexpr OUString UNO_TC_PROP_AUTHOR_FULLNAME = u"FullName"_ustr; // Measure -inline constexpr OUStringLiteral UNO_TC_PROP_MEASURE_KIND = u"Kind"; +inline constexpr OUString UNO_TC_PROP_MEASURE_KIND = u"Kind"_ustr; -inline constexpr OUStringLiteral UNO_TR_PROP_SELECTION = u"Selection"; +inline constexpr OUString UNO_TR_PROP_SELECTION = u"Selection"_ustr; #endif // INCLUDED_EDITENG_UNONAMES_HXX diff --git a/include/editeng/unoprnms.hxx b/include/editeng/unoprnms.hxx index 214b8fd53dea..1300effe179f 100644 --- a/include/editeng/unoprnms.hxx +++ b/include/editeng/unoprnms.hxx @@ -20,353 +20,353 @@ #include <rtl/ustring.hxx> -inline constexpr OUStringLiteral UNO_NAME_CHAR_COLOR = u"CharColor"; -inline constexpr OUStringLiteral UNO_NAME_CHAR_COLOR_THEME = u"CharColorTheme"; -inline constexpr OUStringLiteral UNO_NAME_CHAR_COLOR_TINT_OR_SHADE = u"CharColorTintOrShade"; -inline constexpr OUStringLiteral UNO_NAME_CHAR_COMPLEX_COLOR = u"CharComplexColor"; -inline constexpr OUStringLiteral UNO_NAME_CHAR_HEIGHT = u"CharHeight"; -inline constexpr OUStringLiteral UNO_NAME_CHAR_POSTURE = u"CharPosture"; -inline constexpr OUStringLiteral UNO_NAME_CHAR_SHADOWED = u"CharShadowed"; -inline constexpr OUStringLiteral UNO_NAME_CHAR_UNDERLINE = u"CharUnderline"; -inline constexpr OUStringLiteral UNO_NAME_CHAR_WEIGHT = u"CharWeight"; - -inline constexpr OUStringLiteral UNO_NAME_FILLSTYLE = u"FillStyle"; -inline constexpr OUStringLiteral UNO_NAME_FILLCOLOR = u"FillColor"; -inline constexpr OUStringLiteral UNO_NAME_FILLCOLOR_THEME = u"FillColorTheme"; -inline constexpr OUStringLiteral UNO_NAME_FILLCOLOR_LUM_MOD = u"FillColorLumMod"; -inline constexpr OUStringLiteral UNO_NAME_FILLCOLOR_LUM_OFF = u"FillColorLumOff"; -inline constexpr OUStringLiteral UNO_NAME_FILL_COMPLEX_COLOR = u"FillComplexColor"; -inline constexpr OUStringLiteral UNO_NAME_FILLGRADIENT = u"FillGradient"; -inline constexpr OUStringLiteral UNO_NAME_FILLGRADIENTNAME = u"FillGradientName"; -inline constexpr OUStringLiteral UNO_NAME_FILLHATCH = u"FillHatch"; -inline constexpr OUStringLiteral UNO_NAME_FILLHATCHNAME = u"FillHatchName"; -inline constexpr OUStringLiteral UNO_NAME_FILLBITMAP = u"FillBitmap"; -inline constexpr OUStringLiteral UNO_NAME_FILLBITMAPURL = u"FillBitmapURL"; -inline constexpr OUStringLiteral UNO_NAME_FILLBITMAPNAME = u"FillBitmapName"; -inline constexpr OUStringLiteral UNO_NAME_FILLGRADIENTSTEPCOUNT = u"FillGradientStepCount"; -inline constexpr OUStringLiteral UNO_NAME_FILLBACKGROUND = u"FillBackground"; -inline constexpr OUStringLiteral UNO_NAME_FILLUSESLIDEBACKGROUND = u"FillUseSlideBackground"; -inline constexpr OUStringLiteral UNO_NAME_FILLCOLOR_2 = u"FillColor2"; - -inline constexpr OUStringLiteral UNO_NAME_EDGEKIND = u"EdgeKind"; -inline constexpr OUStringLiteral UNO_NAME_EDGELINE1DELTA = u"EdgeLine1Delta"; -inline constexpr OUStringLiteral UNO_NAME_EDGELINE2DELTA = u"EdgeLine2Delta"; -inline constexpr OUStringLiteral UNO_NAME_EDGELINE3DELTA = u"EdgeLine3Delta"; -inline constexpr OUStringLiteral UNO_NAME_EDGENODE1HORZDIST = u"EdgeNode1HorzDist"; -inline constexpr OUStringLiteral UNO_NAME_EDGENODE1VERTDIST = u"EdgeNode1VertDist"; -inline constexpr OUStringLiteral UNO_NAME_EDGENODE2HORZDIST = u"EdgeNode2HorzDist"; -inline constexpr OUStringLiteral UNO_NAME_EDGENODE2VERTDIST = u"EdgeNode2VertDist"; - -inline constexpr OUStringLiteral UNO_NAME_FILLBMP_OFFSET_X = u"FillBitmapOffsetX"; -inline constexpr OUStringLiteral UNO_NAME_FILLBMP_OFFSET_Y = u"FillBitmapOffsetY"; -inline constexpr OUStringLiteral UNO_NAME_FILLBMP_POSITION_OFFSET_X = u"FillBitmapPositionOffsetX"; -inline constexpr OUStringLiteral UNO_NAME_FILLBMP_POSITION_OFFSET_Y = u"FillBitmapPositionOffsetY"; -inline constexpr OUStringLiteral UNO_NAME_FILLBMP_RECTANGLE_POINT = u"FillBitmapRectanglePoint"; -inline constexpr OUStringLiteral UNO_NAME_FILLBMP_TILE = u"FillBitmapTile"; -inline constexpr OUStringLiteral UNO_NAME_FILLBMP_STRETCH = u"FillBitmapStretch"; -inline constexpr OUStringLiteral UNO_NAME_FILLBMP_LOGICAL_SIZE = u"FillBitmapLogicalSize"; -inline constexpr OUStringLiteral UNO_NAME_FILLBMP_SIZE_X = u"FillBitmapSizeX"; -inline constexpr OUStringLiteral UNO_NAME_FILLBMP_SIZE_Y = u"FillBitmapSizeY"; -inline constexpr OUStringLiteral UNO_NAME_FILL_TRANSPARENCE = u"FillTransparence"; -inline constexpr OUStringLiteral UNO_NAME_FILLTRANSPARENCEGRADIENT = u"FillTransparenceGradient"; -inline constexpr OUStringLiteral UNO_NAME_FILLTRANSPARENCEGRADIENTNAME = u"FillTransparenceGradientName"; -inline constexpr OUStringLiteral UNO_NAME_FILLBMP_MODE = u"FillBitmapMode"; - - -inline constexpr OUStringLiteral UNO_NAME_LINESTYLE = u"LineStyle"; -inline constexpr OUStringLiteral UNO_NAME_LINEDASH = u"LineDash"; -inline constexpr OUStringLiteral UNO_NAME_LINEWIDTH = u"LineWidth"; -inline constexpr OUStringLiteral UNO_NAME_LINECOLOR = u"LineColor"; -inline constexpr OUStringLiteral UNO_NAME_LINE_COMPLEX_COLOR = u"LineComplexColor"; -inline constexpr OUStringLiteral UNO_NAME_LINEJOINT = u"LineJoint"; -inline constexpr OUStringLiteral UNO_NAME_LINESTART = u"LineStart"; -inline constexpr OUStringLiteral UNO_NAME_LINEEND = u"LineEnd"; -inline constexpr OUStringLiteral UNO_NAME_LINESTARTWIDTH = u"LineStartWidth"; -inline constexpr OUStringLiteral UNO_NAME_LINEENDWIDTH = u"LineEndWidth"; -inline constexpr OUStringLiteral UNO_NAME_LINESTARTCENTER = u"LineStartCenter"; -inline constexpr OUStringLiteral UNO_NAME_LINEENDCENTER = u"LineEndCenter"; -inline constexpr OUStringLiteral UNO_NAME_LINETRANSPARENCE = u"LineTransparence"; -inline constexpr OUStringLiteral UNO_NAME_LINECAP = u"LineCap"; - -inline constexpr OUStringLiteral UNO_NAME_SHADOW = u"Shadow"; -inline constexpr OUStringLiteral UNO_NAME_SHADOWCOLOR = u"ShadowColor"; -inline constexpr OUStringLiteral UNO_NAME_SHADOWXDIST = u"ShadowXDistance"; -inline constexpr OUStringLiteral UNO_NAME_SHADOWYDIST = u"ShadowYDistance"; -inline constexpr OUStringLiteral UNO_NAME_SHADOWSIZEX = u"ShadowSizeX"; -inline constexpr OUStringLiteral UNO_NAME_SHADOWSIZEY = u"ShadowSizeY"; -inline constexpr OUStringLiteral UNO_NAME_SHADOWTRANSPARENCE = u"ShadowTransparence"; -inline constexpr OUStringLiteral UNO_NAME_SHADOWBLUR = u"ShadowBlur"; -inline constexpr OUStringLiteral UNO_NAME_SHADOWALIGNMENT = u"ShadowAlignment"; - -inline constexpr OUStringLiteral UNO_NAME_EDGERADIUS = u"CornerRadius"; - -inline constexpr OUStringLiteral UNO_NAME_TEXT_MINFRAMEHEIGHT = u"TextMinimumFrameHeight"; -inline constexpr OUStringLiteral UNO_NAME_TEXT_AUTOGROWHEIGHT = u"TextAutoGrowHeight"; -inline constexpr OUStringLiteral UNO_NAME_TEXT_FITTOSIZE = u"TextFitToSize"; -inline constexpr OUStringLiteral UNO_NAME_TEXT_LEFTDIST = u"TextLeftDistance"; -inline constexpr OUStringLiteral UNO_NAME_TEXT_RIGHTDIST = u"TextRightDistance"; -inline constexpr OUStringLiteral UNO_NAME_TEXT_UPPERDIST = u"TextUpperDistance"; -inline constexpr OUStringLiteral UNO_NAME_TEXT_LOWERDIST = u"TextLowerDistance"; -inline constexpr OUStringLiteral UNO_NAME_TEXT_VERTADJUST = u"TextVerticalAdjust"; -inline constexpr OUStringLiteral UNO_NAME_TEXT_MAXFRAMEHEIGHT = u"TextMaximumFrameHeight"; -inline constexpr OUStringLiteral UNO_NAME_TEXT_MINFRAMEWIDTH = u"TextMinimumFrameWidth"; -inline constexpr OUStringLiteral UNO_NAME_TEXT_MAXFRAMEWIDTH = u"TextMaximumFrameWidth"; -inline constexpr OUStringLiteral UNO_NAME_TEXT_AUTOGROWWIDTH = u"TextAutoGrowWidth"; -inline constexpr OUStringLiteral UNO_NAME_TEXT_HORZADJUST = u"TextHorizontalAdjust"; -inline constexpr OUStringLiteral UNO_NAME_TEXT_ANIKIND = u"TextAnimationKind"; -inline constexpr OUStringLiteral UNO_NAME_TEXT_ANIDIRECTION = u"TextAnimationDirection"; -inline constexpr OUStringLiteral UNO_NAME_TEXT_ANISTARTINSIDE = u"TextAnimationStartInside"; -inline constexpr OUStringLiteral UNO_NAME_TEXT_ANISTOPINSIDE = u"TextAnimationStopInside"; -inline constexpr OUStringLiteral UNO_NAME_TEXT_ANICOUNT = u"TextAnimationCount"; -inline constexpr OUStringLiteral UNO_NAME_TEXT_ANIDELAY = u"TextAnimationDelay"; -inline constexpr OUStringLiteral UNO_NAME_TEXT_ANIAMOUNT = u"TextAnimationAmount"; -inline constexpr OUStringLiteral UNO_NAME_TEXT_CONTOURFRAME = u"TextContourFrame"; -inline constexpr OUStringLiteral UNO_NAME_TEXT_WRITINGMODE = u"TextWritingMode"; -inline constexpr OUStringLiteral UNO_NAME_TEXT_FONTINDEPENDENTLINESPACING = u"FontIndependentLineSpacing"; -inline constexpr OUStringLiteral UNO_NAME_TEXT_WORDWRAP = u"TextWordWrap"; -inline constexpr OUStringLiteral UNO_NAME_TEXT_CHAINNEXTNAME = u"TextChainNextName"; -inline constexpr OUStringLiteral UNO_NAME_TEXT_CLIPVERTOVERFLOW = u"TextClipVerticalOverflow"; - -inline constexpr OUStringLiteral UNO_NAME_MEASUREKIND = u"MeasureKind"; -inline constexpr OUStringLiteral UNO_NAME_MEASURETEXTHPOS = u"MeasureTextHorizontalPosition"; -inline constexpr OUStringLiteral UNO_NAME_MEASURETEXTVPOS = u"MeasureTextVerticalPosition"; -inline constexpr OUStringLiteral UNO_NAME_MEASURELINEDIST = u"MeasureLineDistance"; -inline constexpr OUStringLiteral UNO_NAME_MEASUREHELPLINEOVERHANG = u"MeasureHelpLineOverhang"; -inline constexpr OUStringLiteral UNO_NAME_MEASUREHELPLINEDIST = u"MeasureHelpLineDistance"; -inline constexpr OUStringLiteral UNO_NAME_MEASUREHELPLINE1LEN = u"MeasureHelpLine1Length"; -inline constexpr OUStringLiteral UNO_NAME_MEASUREHELPLINE2LEN = u"MeasureHelpLine2Length"; -inline constexpr OUStringLiteral UNO_NAME_MEASUREBELOWREFEDGE = u"MeasureBelowReferenceEdge"; -inline constexpr OUStringLiteral UNO_NAME_MEASURETEXTROTA90 = u"MeasureTextRotate90"; -inline constexpr OUStringLiteral UNO_NAME_MEASURETEXTUPSIDEDOWN = u"MeasureTextUpsideDown"; -inline constexpr OUStringLiteral UNO_NAME_MEASUREOVERHANG = u"MeasureOverhang"; -inline constexpr OUStringLiteral UNO_NAME_MEASUREUNIT = u"MeasureUnit"; -inline constexpr OUStringLiteral UNO_NAME_MEASURESHOWUNIT = u"MeasureShowUnit"; -inline constexpr OUStringLiteral UNO_NAME_MEASUREFORMATSTRING = u"MeasureFormatString"; -inline constexpr OUStringLiteral UNO_NAME_MEASURETEXTAUTOANGLE = u"MeasureTextAutoAngle"; -inline constexpr OUStringLiteral UNO_NAME_MEASURETEXTAUTOANGLEVIEW = u"MeasureTextAutoAngleView"; -inline constexpr OUStringLiteral UNO_NAME_MEASURETEXTISFIXEDANGLE = u"MeasureTextIsFixedAngle"; -inline constexpr OUStringLiteral UNO_NAME_MEASURETEXTFIXEDANGLE = u"MeasureTextFixedAngle"; - -inline constexpr OUStringLiteral UNO_NAME_CIRCKIND = u"CircleKind"; -inline constexpr OUStringLiteral UNO_NAME_CIRCSTARTANGLE = u"CircleStartAngle"; -inline constexpr OUStringLiteral UNO_NAME_CIRCENDANGLE = u"CircleEndAngle"; - -inline constexpr OUStringLiteral UNO_NAME_POLYGONKIND = u"PolygonKind"; -inline constexpr OUStringLiteral UNO_NAME_POLYPOLYGON = u"PolyPolygon"; -inline constexpr OUStringLiteral UNO_NAME_POLYPOLYGONBEZIER = u"PolyPolygonBezier"; -inline constexpr OUStringLiteral UNO_NAME_POLYGON = u"Polygon"; - -inline constexpr OUStringLiteral UNO_NAME_MISC_OBJ_INTEROPGRABBAG = u"InteropGrabBag"; -inline constexpr OUStringLiteral UNO_NAME_MISC_OBJ_ZORDER = u"ZOrder"; -inline constexpr OUStringLiteral UNO_NAME_MISC_OBJ_MOVEPROTECT = u"MoveProtect"; -inline constexpr OUStringLiteral UNO_NAME_MISC_OBJ_SIZEPROTECT = u"SizeProtect"; -inline constexpr OUStringLiteral UNO_NAME_MISC_OBJ_PRINTABLE = u"Printable"; -inline constexpr OUStringLiteral UNO_NAME_MISC_OBJ_LAYERID = u"LayerID"; -inline constexpr OUStringLiteral UNO_NAME_MISC_OBJ_LAYERNAME = u"LayerName"; -inline constexpr OUStringLiteral UNO_NAME_MISC_OBJ_NAME = u"Name"; -inline constexpr OUStringLiteral UNO_NAME_MISC_OBJ_ROTATEANGLE = u"RotateAngle"; -inline constexpr OUStringLiteral UNO_NAME_MISC_OBJ_SHEARANGLE = u"ShearAngle"; -inline constexpr OUStringLiteral UNO_NAME_MISC_OBJ_FRAMERECT = u"FrameRect"; -inline constexpr OUStringLiteral UNO_NAME_MISC_OBJ_BOUNDRECT = u"BoundRect"; +inline constexpr OUString UNO_NAME_CHAR_COLOR = u"CharColor"_ustr; +inline constexpr OUString UNO_NAME_CHAR_COLOR_THEME = u"CharColorTheme"_ustr; +inline constexpr OUString UNO_NAME_CHAR_COLOR_TINT_OR_SHADE = u"CharColorTintOrShade"_ustr; +inline constexpr OUString UNO_NAME_CHAR_COMPLEX_COLOR = u"CharComplexColor"_ustr; +inline constexpr OUString UNO_NAME_CHAR_HEIGHT = u"CharHeight"_ustr; +inline constexpr OUString UNO_NAME_CHAR_POSTURE = u"CharPosture"_ustr; +inline constexpr OUString UNO_NAME_CHAR_SHADOWED = u"CharShadowed"_ustr; +inline constexpr OUString UNO_NAME_CHAR_UNDERLINE = u"CharUnderline"_ustr; +inline constexpr OUString UNO_NAME_CHAR_WEIGHT = u"CharWeight"_ustr; + +inline constexpr OUString UNO_NAME_FILLSTYLE = u"FillStyle"_ustr; +inline constexpr OUString UNO_NAME_FILLCOLOR = u"FillColor"_ustr; +inline constexpr OUString UNO_NAME_FILLCOLOR_THEME = u"FillColorTheme"_ustr; +inline constexpr OUString UNO_NAME_FILLCOLOR_LUM_MOD = u"FillColorLumMod"_ustr; +inline constexpr OUString UNO_NAME_FILLCOLOR_LUM_OFF = u"FillColorLumOff"_ustr; +inline constexpr OUString UNO_NAME_FILL_COMPLEX_COLOR = u"FillComplexColor"_ustr; +inline constexpr OUString UNO_NAME_FILLGRADIENT = u"FillGradient"_ustr; +inline constexpr OUString UNO_NAME_FILLGRADIENTNAME = u"FillGradientName"_ustr; +inline constexpr OUString UNO_NAME_FILLHATCH = u"FillHatch"_ustr; +inline constexpr OUString UNO_NAME_FILLHATCHNAME = u"FillHatchName"_ustr; +inline constexpr OUString UNO_NAME_FILLBITMAP = u"FillBitmap"_ustr; +inline constexpr OUString UNO_NAME_FILLBITMAPURL = u"FillBitmapURL"_ustr; +inline constexpr OUString UNO_NAME_FILLBITMAPNAME = u"FillBitmapName"_ustr; +inline constexpr OUString UNO_NAME_FILLGRADIENTSTEPCOUNT = u"FillGradientStepCount"_ustr; +inline constexpr OUString UNO_NAME_FILLBACKGROUND = u"FillBackground"_ustr; +inline constexpr OUString UNO_NAME_FILLUSESLIDEBACKGROUND = u"FillUseSlideBackground"_ustr; +inline constexpr OUString UNO_NAME_FILLCOLOR_2 = u"FillColor2"_ustr; + +inline constexpr OUString UNO_NAME_EDGEKIND = u"EdgeKind"_ustr; +inline constexpr OUString UNO_NAME_EDGELINE1DELTA = u"EdgeLine1Delta"_ustr; +inline constexpr OUString UNO_NAME_EDGELINE2DELTA = u"EdgeLine2Delta"_ustr; +inline constexpr OUString UNO_NAME_EDGELINE3DELTA = u"EdgeLine3Delta"_ustr; +inline constexpr OUString UNO_NAME_EDGENODE1HORZDIST = u"EdgeNode1HorzDist"_ustr; +inline constexpr OUString UNO_NAME_EDGENODE1VERTDIST = u"EdgeNode1VertDist"_ustr; +inline constexpr OUString UNO_NAME_EDGENODE2HORZDIST = u"EdgeNode2HorzDist"_ustr; +inline constexpr OUString UNO_NAME_EDGENODE2VERTDIST = u"EdgeNode2VertDist"_ustr; + +inline constexpr OUString UNO_NAME_FILLBMP_OFFSET_X = u"FillBitmapOffsetX"_ustr; +inline constexpr OUString UNO_NAME_FILLBMP_OFFSET_Y = u"FillBitmapOffsetY"_ustr; +inline constexpr OUString UNO_NAME_FILLBMP_POSITION_OFFSET_X = u"FillBitmapPositionOffsetX"_ustr; +inline constexpr OUString UNO_NAME_FILLBMP_POSITION_OFFSET_Y = u"FillBitmapPositionOffsetY"_ustr; +inline constexpr OUString UNO_NAME_FILLBMP_RECTANGLE_POINT = u"FillBitmapRectanglePoint"_ustr; +inline constexpr OUString UNO_NAME_FILLBMP_TILE = u"FillBitmapTile"_ustr; +inline constexpr OUString UNO_NAME_FILLBMP_STRETCH = u"FillBitmapStretch"_ustr; +inline constexpr OUString UNO_NAME_FILLBMP_LOGICAL_SIZE = u"FillBitmapLogicalSize"_ustr; +inline constexpr OUString UNO_NAME_FILLBMP_SIZE_X = u"FillBitmapSizeX"_ustr; +inline constexpr OUString UNO_NAME_FILLBMP_SIZE_Y = u"FillBitmapSizeY"_ustr; +inline constexpr OUString UNO_NAME_FILL_TRANSPARENCE = u"FillTransparence"_ustr; +inline constexpr OUString UNO_NAME_FILLTRANSPARENCEGRADIENT = u"FillTransparenceGradient"_ustr; +inline constexpr OUString UNO_NAME_FILLTRANSPARENCEGRADIENTNAME = u"FillTransparenceGradientName"_ustr; +inline constexpr OUString UNO_NAME_FILLBMP_MODE = u"FillBitmapMode"_ustr; + + +inline constexpr OUString UNO_NAME_LINESTYLE = u"LineStyle"_ustr; +inline constexpr OUString UNO_NAME_LINEDASH = u"LineDash"_ustr; +inline constexpr OUString UNO_NAME_LINEWIDTH = u"LineWidth"_ustr; +inline constexpr OUString UNO_NAME_LINECOLOR = u"LineColor"_ustr; +inline constexpr OUString UNO_NAME_LINE_COMPLEX_COLOR = u"LineComplexColor"_ustr; +inline constexpr OUString UNO_NAME_LINEJOINT = u"LineJoint"_ustr; +inline constexpr OUString UNO_NAME_LINESTART = u"LineStart"_ustr; +inline constexpr OUString UNO_NAME_LINEEND = u"LineEnd"_ustr; +inline constexpr OUString UNO_NAME_LINESTARTWIDTH = u"LineStartWidth"_ustr; +inline constexpr OUString UNO_NAME_LINEENDWIDTH = u"LineEndWidth"_ustr; +inline constexpr OUString UNO_NAME_LINESTARTCENTER = u"LineStartCenter"_ustr; +inline constexpr OUString UNO_NAME_LINEENDCENTER = u"LineEndCenter"_ustr; +inline constexpr OUString UNO_NAME_LINETRANSPARENCE = u"LineTransparence"_ustr; +inline constexpr OUString UNO_NAME_LINECAP = u"LineCap"_ustr; + +inline constexpr OUString UNO_NAME_SHADOW = u"Shadow"_ustr; +inline constexpr OUString UNO_NAME_SHADOWCOLOR = u"ShadowColor"_ustr; +inline constexpr OUString UNO_NAME_SHADOWXDIST = u"ShadowXDistance"_ustr; +inline constexpr OUString UNO_NAME_SHADOWYDIST = u"ShadowYDistance"_ustr; +inline constexpr OUString UNO_NAME_SHADOWSIZEX = u"ShadowSizeX"_ustr; +inline constexpr OUString UNO_NAME_SHADOWSIZEY = u"ShadowSizeY"_ustr; +inline constexpr OUString UNO_NAME_SHADOWTRANSPARENCE = u"ShadowTransparence"_ustr; +inline constexpr OUString UNO_NAME_SHADOWBLUR = u"ShadowBlur"_ustr; +inline constexpr OUString UNO_NAME_SHADOWALIGNMENT = u"ShadowAlignment"_ustr; + +inline constexpr OUString UNO_NAME_EDGERADIUS = u"CornerRadius"_ustr; + +inline constexpr OUString UNO_NAME_TEXT_MINFRAMEHEIGHT = u"TextMinimumFrameHeight"_ustr; +inline constexpr OUString UNO_NAME_TEXT_AUTOGROWHEIGHT = u"TextAutoGrowHeight"_ustr; +inline constexpr OUString UNO_NAME_TEXT_FITTOSIZE = u"TextFitToSize"_ustr; +inline constexpr OUString UNO_NAME_TEXT_LEFTDIST = u"TextLeftDistance"_ustr; +inline constexpr OUString UNO_NAME_TEXT_RIGHTDIST = u"TextRightDistance"_ustr; +inline constexpr OUString UNO_NAME_TEXT_UPPERDIST = u"TextUpperDistance"_ustr; +inline constexpr OUString UNO_NAME_TEXT_LOWERDIST = u"TextLowerDistance"_ustr; +inline constexpr OUString UNO_NAME_TEXT_VERTADJUST = u"TextVerticalAdjust"_ustr; +inline constexpr OUString UNO_NAME_TEXT_MAXFRAMEHEIGHT = u"TextMaximumFrameHeight"_ustr; +inline constexpr OUString UNO_NAME_TEXT_MINFRAMEWIDTH = u"TextMinimumFrameWidth"_ustr; +inline constexpr OUString UNO_NAME_TEXT_MAXFRAMEWIDTH = u"TextMaximumFrameWidth"_ustr; +inline constexpr OUString UNO_NAME_TEXT_AUTOGROWWIDTH = u"TextAutoGrowWidth"_ustr; +inline constexpr OUString UNO_NAME_TEXT_HORZADJUST = u"TextHorizontalAdjust"_ustr; +inline constexpr OUString UNO_NAME_TEXT_ANIKIND = u"TextAnimationKind"_ustr; +inline constexpr OUString UNO_NAME_TEXT_ANIDIRECTION = u"TextAnimationDirection"_ustr; +inline constexpr OUString UNO_NAME_TEXT_ANISTARTINSIDE = u"TextAnimationStartInside"_ustr; +inline constexpr OUString UNO_NAME_TEXT_ANISTOPINSIDE = u"TextAnimationStopInside"_ustr; +inline constexpr OUString UNO_NAME_TEXT_ANICOUNT = u"TextAnimationCount"_ustr; +inline constexpr OUString UNO_NAME_TEXT_ANIDELAY = u"TextAnimationDelay"_ustr; +inline constexpr OUString UNO_NAME_TEXT_ANIAMOUNT = u"TextAnimationAmount"_ustr; +inline constexpr OUString UNO_NAME_TEXT_CONTOURFRAME = u"TextContourFrame"_ustr; +inline constexpr OUString UNO_NAME_TEXT_WRITINGMODE = u"TextWritingMode"_ustr; +inline constexpr OUString UNO_NAME_TEXT_FONTINDEPENDENTLINESPACING = u"FontIndependentLineSpacing"_ustr; +inline constexpr OUString UNO_NAME_TEXT_WORDWRAP = u"TextWordWrap"_ustr; +inline constexpr OUString UNO_NAME_TEXT_CHAINNEXTNAME = u"TextChainNextName"_ustr; +inline constexpr OUString UNO_NAME_TEXT_CLIPVERTOVERFLOW = u"TextClipVerticalOverflow"_ustr; + +inline constexpr OUString UNO_NAME_MEASUREKIND = u"MeasureKind"_ustr; +inline constexpr OUString UNO_NAME_MEASURETEXTHPOS = u"MeasureTextHorizontalPosition"_ustr; +inline constexpr OUString UNO_NAME_MEASURETEXTVPOS = u"MeasureTextVerticalPosition"_ustr; +inline constexpr OUString UNO_NAME_MEASURELINEDIST = u"MeasureLineDistance"_ustr; +inline constexpr OUString UNO_NAME_MEASUREHELPLINEOVERHANG = u"MeasureHelpLineOverhang"_ustr; +inline constexpr OUString UNO_NAME_MEASUREHELPLINEDIST = u"MeasureHelpLineDistance"_ustr; +inline constexpr OUString UNO_NAME_MEASUREHELPLINE1LEN = u"MeasureHelpLine1Length"_ustr; +inline constexpr OUString UNO_NAME_MEASUREHELPLINE2LEN = u"MeasureHelpLine2Length"_ustr; +inline constexpr OUString UNO_NAME_MEASUREBELOWREFEDGE = u"MeasureBelowReferenceEdge"_ustr; +inline constexpr OUString UNO_NAME_MEASURETEXTROTA90 = u"MeasureTextRotate90"_ustr; +inline constexpr OUString UNO_NAME_MEASURETEXTUPSIDEDOWN = u"MeasureTextUpsideDown"_ustr; +inline constexpr OUString UNO_NAME_MEASUREOVERHANG = u"MeasureOverhang"_ustr; +inline constexpr OUString UNO_NAME_MEASUREUNIT = u"MeasureUnit"_ustr; +inline constexpr OUString UNO_NAME_MEASURESHOWUNIT = u"MeasureShowUnit"_ustr; +inline constexpr OUString UNO_NAME_MEASUREFORMATSTRING = u"MeasureFormatString"_ustr; +inline constexpr OUString UNO_NAME_MEASURETEXTAUTOANGLE = u"MeasureTextAutoAngle"_ustr; +inline constexpr OUString UNO_NAME_MEASURETEXTAUTOANGLEVIEW = u"MeasureTextAutoAngleView"_ustr; +inline constexpr OUString UNO_NAME_MEASURETEXTISFIXEDANGLE = u"MeasureTextIsFixedAngle"_ustr; +inline constexpr OUString UNO_NAME_MEASURETEXTFIXEDANGLE = u"MeasureTextFixedAngle"_ustr; + +inline constexpr OUString UNO_NAME_CIRCKIND = u"CircleKind"_ustr; +inline constexpr OUString UNO_NAME_CIRCSTARTANGLE = u"CircleStartAngle"_ustr; +inline constexpr OUString UNO_NAME_CIRCENDANGLE = u"CircleEndAngle"_ustr; + +inline constexpr OUString UNO_NAME_POLYGONKIND = u"PolygonKind"_ustr; +inline constexpr OUString UNO_NAME_POLYPOLYGON = u"PolyPolygon"_ustr; +inline constexpr OUString UNO_NAME_POLYPOLYGONBEZIER = u"PolyPolygonBezier"_ustr; +inline constexpr OUString UNO_NAME_POLYGON = u"Polygon"_ustr; + +inline constexpr OUString UNO_NAME_MISC_OBJ_INTEROPGRABBAG = u"InteropGrabBag"_ustr; +inline constexpr OUString UNO_NAME_MISC_OBJ_ZORDER = u"ZOrder"_ustr; +inline constexpr OUString UNO_NAME_MISC_OBJ_MOVEPROTECT = u"MoveProtect"_ustr; +inline constexpr OUString UNO_NAME_MISC_OBJ_SIZEPROTECT = u"SizeProtect"_ustr; +inline constexpr OUString UNO_NAME_MISC_OBJ_PRINTABLE = u"Printable"_ustr; +inline constexpr OUString UNO_NAME_MISC_OBJ_LAYERID = u"LayerID"_ustr; +inline constexpr OUString UNO_NAME_MISC_OBJ_LAYERNAME = u"LayerName"_ustr; +inline constexpr OUString UNO_NAME_MISC_OBJ_NAME = u"Name"_ustr; +inline constexpr OUString UNO_NAME_MISC_OBJ_ROTATEANGLE = u"RotateAngle"_ustr; +inline constexpr OUString UNO_NAME_MISC_OBJ_SHEARANGLE = u"ShearAngle"_ustr; +inline constexpr OUString UNO_NAME_MISC_OBJ_FRAMERECT = u"FrameRect"_ustr; +inline constexpr OUString UNO_NAME_MISC_OBJ_BOUNDRECT = u"BoundRect"_ustr; // #i68101# -inline constexpr OUStringLiteral UNO_NAME_MISC_OBJ_TITLE = u"Title"; -inline constexpr OUStringLiteral UNO_NAME_MISC_OBJ_DESCRIPTION = u"Description"; +inline constexpr OUString UNO_NAME_MISC_OBJ_TITLE = u"Title"_ustr; +inline constexpr OUString UNO_NAME_MISC_OBJ_DESCRIPTION = u"Description"_ustr; -inline constexpr OUStringLiteral UNO_NAME_HYPERLINK = u"Hyperlink"; +inline constexpr OUString UNO_NAME_HYPERLINK = u"Hyperlink"_ustr; -inline constexpr OUStringLiteral UNO_NAME_GRAPHOBJ_FILLBITMAP = u"GraphicObjectFillBitmap"; -inline constexpr OUStringLiteral UNO_NAME_GRAPHOBJ_REPLACEMENT_GRAPHIC = u"ReplacementGraphic"; -inline constexpr OUStringLiteral UNO_NAME_GRAPHOBJ_GRAFSTREAMURL = u"GraphicStreamURL"; +inline constexpr OUString UNO_NAME_GRAPHOBJ_FILLBITMAP = u"GraphicObjectFillBitmap"_ustr; +inline constexpr OUString UNO_NAME_GRAPHOBJ_REPLACEMENT_GRAPHIC = u"ReplacementGraphic"_ustr; +inline constexpr OUString UNO_NAME_GRAPHOBJ_GRAFSTREAMURL = u"GraphicStreamURL"_ustr; #define UNO_NAME_GRAPHOBJ_URLPKGPREFIX "vnd.sun.star.Package:" -inline constexpr OUStringLiteral UNO_NAME_GRAPHOBJ_GRAPHIC = u"Graphic"; -inline constexpr OUStringLiteral UNO_NAME_GRAPHOBJ_GRAPHIC_URL = u"GraphicURL"; -inline constexpr OUStringLiteral UNO_NAME_GRAPHOBJ_IS_SIGNATURELINE = u"IsSignatureLine"; -inline constexpr OUStringLiteral UNO_NAME_GRAPHOBJ_SIGNATURELINE_ID = u"SignatureLineId"; -inline constexpr OUStringLiteral UNO_NAME_GRAPHOBJ_SIGNATURELINE_SUGGESTED_SIGNER_NAME = u"SignatureLineSuggestedSignerName"; -inline constexpr OUStringLiteral UNO_NAME_GRAPHOBJ_SIGNATURELINE_SUGGESTED_SIGNER_TITLE = u"SignatureLineSuggestedSignerTitle"; -inline constexpr OUStringLiteral UNO_NAME_GRAPHOBJ_SIGNATURELINE_SUGGESTED_SIGNER_EMAIL = u"SignatureLineSuggestedSignerEmail"; -inline constexpr OUStringLiteral UNO_NAME_GRAPHOBJ_SIGNATURELINE_SIGNING_INSTRUCTIONS = u"SignatureLineSigningInstructions"; -inline constexpr OUStringLiteral UNO_NAME_GRAPHOBJ_SIGNATURELINE_SHOW_SIGN_DATE = u"SignatureLineShowSignDate"; -inline constexpr OUStringLiteral UNO_NAME_GRAPHOBJ_SIGNATURELINE_CAN_ADD_COMMENT = u"SignatureLineCanAddComment"; -inline constexpr OUStringLiteral UNO_NAME_GRAPHOBJ_SIGNATURELINE_UNSIGNED_IMAGE = u"SignatureLineUnsignedImage"; -inline constexpr OUStringLiteral UNO_NAME_GRAPHOBJ_SIGNATURELINE_IS_SIGNED = u"SignatureLineIsSigned"; -inline constexpr OUStringLiteral UNO_NAME_GRAPHOBJ_QRCODE = u"BarCodeProperties"; - -inline constexpr OUStringLiteral UNO_NAME_OLE2_METAFILE = u"MetaFile"; -inline constexpr OUStringLiteral UNO_NAME_OLE2_PERSISTNAME = u"PersistName"; - -inline constexpr OUStringLiteral UNO_NAME_3D_SCENE_PERSPECTIVE = u"D3DScenePerspective"; -inline constexpr OUStringLiteral UNO_NAME_3D_SCENE_DISTANCE = u"D3DSceneDistance"; -inline constexpr OUStringLiteral UNO_NAME_3D_SCENE_FOCAL_LENGTH = u"D3DSceneFocalLength"; -inline constexpr OUStringLiteral UNO_NAME_3D_SCENE_TWO_SIDED_LIGHTING = u"D3DSceneTwoSidedLighting"; -inline constexpr OUStringLiteral UNO_NAME_3D_SCENE_LIGHTCOLOR_1 = u"D3DSceneLightColor1"; -inline constexpr OUStringLiteral UNO_NAME_3D_SCENE_LIGHTCOLOR_2 = u"D3DSceneLightColor2"; -inline constexpr OUStringLiteral UNO_NAME_3D_SCENE_LIGHTCOLOR_3 = u"D3DSceneLightColor3"; -inline constexpr OUStringLiteral UNO_NAME_3D_SCENE_LIGHTCOLOR_4 = u"D3DSceneLightColor4"; -inline constexpr OUStringLiteral UNO_NAME_3D_SCENE_LIGHTCOLOR_5 = u"D3DSceneLightColor5"; -inline constexpr OUStringLiteral UNO_NAME_3D_SCENE_LIGHTCOLOR_6 = u"D3DSceneLightColor6"; -inline constexpr OUStringLiteral UNO_NAME_3D_SCENE_LIGHTCOLOR_7 = u"D3DSceneLightColor7"; -inline constexpr OUStringLiteral UNO_NAME_3D_SCENE_LIGHTCOLOR_8 = u"D3DSceneLightColor8"; -inline constexpr OUStringLiteral UNO_NAME_3D_SCENE_LIGHTON_1 = u"D3DSceneLightOn1"; -inline constexpr OUStringLiteral UNO_NAME_3D_SCENE_LIGHTON_2 = u"D3DSceneLightOn2"; -inline constexpr OUStringLiteral UNO_NAME_3D_SCENE_LIGHTON_3 = u"D3DSceneLightOn3"; -inline constexpr OUStringLiteral UNO_NAME_3D_SCENE_LIGHTON_4 = u"D3DSceneLightOn4"; -inline constexpr OUStringLiteral UNO_NAME_3D_SCENE_LIGHTON_5 = u"D3DSceneLightOn5"; -inline constexpr OUStringLiteral UNO_NAME_3D_SCENE_LIGHTON_6 = u"D3DSceneLightOn6"; -inline constexpr OUStringLiteral UNO_NAME_3D_SCENE_LIGHTON_7 = u"D3DSceneLightOn7"; -inline constexpr OUStringLiteral UNO_NAME_3D_SCENE_LIGHTON_8 = u"D3DSceneLightOn8"; -inline constexpr OUStringLiteral UNO_NAME_3D_SCENE_LIGHTDIRECTION_1 = u"D3DSceneLightDirection1"; -inline constexpr OUStringLiteral UNO_NAME_3D_SCENE_LIGHTDIRECTION_2 = u"D3DSceneLightDirection2"; -inline constexpr OUStringLiteral UNO_NAME_3D_SCENE_LIGHTDIRECTION_3 = u"D3DSceneLightDirection3"; -inline constexpr OUStringLiteral UNO_NAME_3D_SCENE_LIGHTDIRECTION_4 = u"D3DSceneLightDirection4"; -inline constexpr OUStringLiteral UNO_NAME_3D_SCENE_LIGHTDIRECTION_5 = u"D3DSceneLightDirection5"; -inline constexpr OUStringLiteral UNO_NAME_3D_SCENE_LIGHTDIRECTION_6 = u"D3DSceneLightDirection6"; -inline constexpr OUStringLiteral UNO_NAME_3D_SCENE_LIGHTDIRECTION_7 = u"D3DSceneLightDirection7"; -inline constexpr OUStringLiteral UNO_NAME_3D_SCENE_LIGHTDIRECTION_8 = u"D3DSceneLightDirection8"; -inline constexpr OUStringLiteral UNO_NAME_3D_SCENE_AMBIENTCOLOR = u"D3DSceneAmbientColor"; -inline constexpr OUStringLiteral UNO_NAME_3D_SCENE_SHADOW_SLANT = u"D3DSceneShadowSlant"; -inline constexpr OUStringLiteral UNO_NAME_3D_SCENE_SHADE_MODE = u"D3DSceneShadeMode"; - -inline constexpr OUStringLiteral UNO_NAME_3D_DOUBLE_SIDED = u"D3DDoubleSided"; -inline constexpr OUStringLiteral UNO_NAME_3D_NORMALS_KIND = u"D3DNormalsKind"; -inline constexpr OUStringLiteral UNO_NAME_3D_NORMALS_INVERT = u"D3DNormalsInvert"; -inline constexpr OUStringLiteral UNO_NAME_3D_TEXTURE_PROJ_X = u"D3DTextureProjectionX"; -inline constexpr OUStringLiteral UNO_NAME_3D_TEXTURE_PROJ_Y = u"D3DTextureProjectionY"; -inline constexpr OUStringLiteral UNO_NAME_3D_SHADOW_3D = u"D3DShadow3D"; -inline constexpr OUStringLiteral UNO_NAME_3D_MAT_COLOR = u"D3DMaterialColor"; -inline constexpr OUStringLiteral UNO_NAME_3D_MAT_EMISSION = u"D3DMaterialEmission"; -inline constexpr OUStringLiteral UNO_NAME_3D_MAT_SPECULAR = u"D3DMaterialSpecular"; -inline constexpr OUStringLiteral UNO_NAME_3D_MAT_SPECULAR_INTENSITY = u"D3DMaterialSpecularIntensity"; -inline constexpr OUStringLiteral UNO_NAME_3D_TEXTURE_KIND = u"D3DTextureKind"; -inline constexpr OUStringLiteral UNO_NAME_3D_TEXTURE_MODE = u"D3DTextureMode"; -inline constexpr OUStringLiteral UNO_NAME_3D_TEXTURE_FILTER = u"D3DTextureFilter"; +inline constexpr OUString UNO_NAME_GRAPHOBJ_GRAPHIC = u"Graphic"_ustr; +inline constexpr OUString UNO_NAME_GRAPHOBJ_GRAPHIC_URL = u"GraphicURL"_ustr; +inline constexpr OUString UNO_NAME_GRAPHOBJ_IS_SIGNATURELINE = u"IsSignatureLine"_ustr; +inline constexpr OUString UNO_NAME_GRAPHOBJ_SIGNATURELINE_ID = u"SignatureLineId"_ustr; +inline constexpr OUString UNO_NAME_GRAPHOBJ_SIGNATURELINE_SUGGESTED_SIGNER_NAME = u"SignatureLineSuggestedSignerName"_ustr; +inline constexpr OUString UNO_NAME_GRAPHOBJ_SIGNATURELINE_SUGGESTED_SIGNER_TITLE = u"SignatureLineSuggestedSignerTitle"_ustr; +inline constexpr OUString UNO_NAME_GRAPHOBJ_SIGNATURELINE_SUGGESTED_SIGNER_EMAIL = u"SignatureLineSuggestedSignerEmail"_ustr; +inline constexpr OUString UNO_NAME_GRAPHOBJ_SIGNATURELINE_SIGNING_INSTRUCTIONS = u"SignatureLineSigningInstructions"_ustr; +inline constexpr OUString UNO_NAME_GRAPHOBJ_SIGNATURELINE_SHOW_SIGN_DATE = u"SignatureLineShowSignDate"_ustr; +inline constexpr OUString UNO_NAME_GRAPHOBJ_SIGNATURELINE_CAN_ADD_COMMENT = u"SignatureLineCanAddComment"_ustr; +inline constexpr OUString UNO_NAME_GRAPHOBJ_SIGNATURELINE_UNSIGNED_IMAGE = u"SignatureLineUnsignedImage"_ustr; +inline constexpr OUString UNO_NAME_GRAPHOBJ_SIGNATURELINE_IS_SIGNED = u"SignatureLineIsSigned"_ustr; +inline constexpr OUString UNO_NAME_GRAPHOBJ_QRCODE = u"BarCodeProperties"_ustr; + +inline constexpr OUString UNO_NAME_OLE2_METAFILE = u"MetaFile"_ustr; +inline constexpr OUString UNO_NAME_OLE2_PERSISTNAME = u"PersistName"_ustr; + +inline constexpr OUString UNO_NAME_3D_SCENE_PERSPECTIVE = u"D3DScenePerspective"_ustr; +inline constexpr OUString UNO_NAME_3D_SCENE_DISTANCE = u"D3DSceneDistance"_ustr; +inline constexpr OUString UNO_NAME_3D_SCENE_FOCAL_LENGTH = u"D3DSceneFocalLength"_ustr; +inline constexpr OUString UNO_NAME_3D_SCENE_TWO_SIDED_LIGHTING = u"D3DSceneTwoSidedLighting"_ustr; +inline constexpr OUString UNO_NAME_3D_SCENE_LIGHTCOLOR_1 = u"D3DSceneLightColor1"_ustr; +inline constexpr OUString UNO_NAME_3D_SCENE_LIGHTCOLOR_2 = u"D3DSceneLightColor2"_ustr; +inline constexpr OUString UNO_NAME_3D_SCENE_LIGHTCOLOR_3 = u"D3DSceneLightColor3"_ustr; +inline constexpr OUString UNO_NAME_3D_SCENE_LIGHTCOLOR_4 = u"D3DSceneLightColor4"_ustr; +inline constexpr OUString UNO_NAME_3D_SCENE_LIGHTCOLOR_5 = u"D3DSceneLightColor5"_ustr; +inline constexpr OUString UNO_NAME_3D_SCENE_LIGHTCOLOR_6 = u"D3DSceneLightColor6"_ustr; +inline constexpr OUString UNO_NAME_3D_SCENE_LIGHTCOLOR_7 = u"D3DSceneLightColor7"_ustr; +inline constexpr OUString UNO_NAME_3D_SCENE_LIGHTCOLOR_8 = u"D3DSceneLightColor8"_ustr; +inline constexpr OUString UNO_NAME_3D_SCENE_LIGHTON_1 = u"D3DSceneLightOn1"_ustr; +inline constexpr OUString UNO_NAME_3D_SCENE_LIGHTON_2 = u"D3DSceneLightOn2"_ustr; +inline constexpr OUString UNO_NAME_3D_SCENE_LIGHTON_3 = u"D3DSceneLightOn3"_ustr; +inline constexpr OUString UNO_NAME_3D_SCENE_LIGHTON_4 = u"D3DSceneLightOn4"_ustr; +inline constexpr OUString UNO_NAME_3D_SCENE_LIGHTON_5 = u"D3DSceneLightOn5"_ustr; +inline constexpr OUString UNO_NAME_3D_SCENE_LIGHTON_6 = u"D3DSceneLightOn6"_ustr; +inline constexpr OUString UNO_NAME_3D_SCENE_LIGHTON_7 = u"D3DSceneLightOn7"_ustr; +inline constexpr OUString UNO_NAME_3D_SCENE_LIGHTON_8 = u"D3DSceneLightOn8"_ustr; +inline constexpr OUString UNO_NAME_3D_SCENE_LIGHTDIRECTION_1 = u"D3DSceneLightDirection1"_ustr; +inline constexpr OUString UNO_NAME_3D_SCENE_LIGHTDIRECTION_2 = u"D3DSceneLightDirection2"_ustr; +inline constexpr OUString UNO_NAME_3D_SCENE_LIGHTDIRECTION_3 = u"D3DSceneLightDirection3"_ustr; +inline constexpr OUString UNO_NAME_3D_SCENE_LIGHTDIRECTION_4 = u"D3DSceneLightDirection4"_ustr; +inline constexpr OUString UNO_NAME_3D_SCENE_LIGHTDIRECTION_5 = u"D3DSceneLightDirection5"_ustr; +inline constexpr OUString UNO_NAME_3D_SCENE_LIGHTDIRECTION_6 = u"D3DSceneLightDirection6"_ustr; +inline constexpr OUString UNO_NAME_3D_SCENE_LIGHTDIRECTION_7 = u"D3DSceneLightDirection7"_ustr; +inline constexpr OUString UNO_NAME_3D_SCENE_LIGHTDIRECTION_8 = u"D3DSceneLightDirection8"_ustr; +inline constexpr OUString UNO_NAME_3D_SCENE_AMBIENTCOLOR = u"D3DSceneAmbientColor"_ustr; +inline constexpr OUString UNO_NAME_3D_SCENE_SHADOW_SLANT = u"D3DSceneShadowSlant"_ustr; +inline constexpr OUString UNO_NAME_3D_SCENE_SHADE_MODE = u"D3DSceneShadeMode"_ustr; + +inline constexpr OUString UNO_NAME_3D_DOUBLE_SIDED = u"D3DDoubleSided"_ustr; +inline constexpr OUString UNO_NAME_3D_NORMALS_KIND = u"D3DNormalsKind"_ustr; +inline constexpr OUString UNO_NAME_3D_NORMALS_INVERT = u"D3DNormalsInvert"_ustr; +inline constexpr OUString UNO_NAME_3D_TEXTURE_PROJ_X = u"D3DTextureProjectionX"_ustr; +inline constexpr OUString UNO_NAME_3D_TEXTURE_PROJ_Y = u"D3DTextureProjectionY"_ustr; +inline constexpr OUString UNO_NAME_3D_SHADOW_3D = u"D3DShadow3D"_ustr; +inline constexpr OUString UNO_NAME_3D_MAT_COLOR = u"D3DMaterialColor"_ustr; +inline constexpr OUString UNO_NAME_3D_MAT_EMISSION = u"D3DMaterialEmission"_ustr; +inline constexpr OUString UNO_NAME_3D_MAT_SPECULAR = u"D3DMaterialSpecular"_ustr; +inline constexpr OUString UNO_NAME_3D_MAT_SPECULAR_INTENSITY = u"D3DMaterialSpecularIntensity"_ustr; +inline constexpr OUString UNO_NAME_3D_TEXTURE_KIND = u"D3DTextureKind"_ustr; +inline constexpr OUString UNO_NAME_3D_TEXTURE_MODE = u"D3DTextureMode"_ustr; +inline constexpr OUString UNO_NAME_3D_TEXTURE_FILTER = u"D3DTextureFilter"_ustr; // #i28528# // Added extra Item (Bool) for chart2 to be able to show reduced line geometry -inline constexpr OUStringLiteral UNO_NAME_3D_REDUCED_LINE_GEOMETRY = u"D3DReducedLineGeometry"; +inline constexpr OUString UNO_NAME_3D_REDUCED_LINE_GEOMETRY = u"D3DReducedLineGeometry"_ustr; -inline constexpr OUStringLiteral UNO_NAME_3D_HORZ_SEGS = u"D3DHorizontalSegments"; -inline constexpr OUStringLiteral UNO_NAME_3D_VERT_SEGS = u"D3DVerticalSegments"; +inline constexpr OUString UNO_NAME_3D_HORZ_SEGS = u"D3DHorizontalSegments"_ustr; +inline constexpr OUString UNO_NAME_3D_VERT_SEGS = u"D3DVerticalSegments"_ustr; -inline constexpr OUStringLiteral UNO_NAME_3D_PERCENT_DIAGONAL = u"D3DPercentDiagonal"; -inline constexpr OUStringLiteral UNO_NAME_3D_BACKSCALE = u"D3DBackscale"; -inline constexpr OUStringLiteral UNO_NAME_3D_LATHE_END_ANGLE = u"D3DEndAngle"; +inline constexpr OUString UNO_NAME_3D_PERCENT_DIAGONAL = u"D3DPercentDiagonal"_ustr; +inline constexpr OUString UNO_NAME_3D_BACKSCALE = u"D3DBackscale"_ustr; +inline constexpr OUString UNO_NAME_3D_LATHE_END_ANGLE = u"D3DEndAngle"_ustr; -inline constexpr OUStringLiteral UNO_NAME_3D_EXTRUDE_DEPTH = u"D3DDepth"; +inline constexpr OUString UNO_NAME_3D_EXTRUDE_DEPTH = u"D3DDepth"_ustr; -inline constexpr OUStringLiteral UNO_NAME_3D_TRANSFORM_MATRIX = u"D3DTransformMatrix"; -inline constexpr OUStringLiteral UNO_NAME_3D_CAMERA_GEOMETRY = u"D3DCameraGeometry"; -inline constexpr OUStringLiteral UNO_NAME_3D_POS = u"D3DPosition"; -inline constexpr OUStringLiteral UNO_NAME_3D_SIZE = u"D3DSize"; -inline constexpr OUStringLiteral UNO_NAME_3D_POS_IS_CENTER = u"D3DPositionIsCenter"; -inline constexpr OUStringLiteral UNO_NAME_3D_POLYPOLYGON3D = u"D3DPolyPolygon3D"; -inline constexpr OUStringLiteral UNO_NAME_3D_NORMALSPOLYGON3D = u"D3DNormalsPolygon3D"; -inline constexpr OUStringLiteral UNO_NAME_3D_TEXTUREPOLYGON3D = u"D3DTexturePolygon3D"; -inline constexpr OUStringLiteral UNO_NAME_3D_LINEONLY = u"D3DLineOnly"; +inline constexpr OUString UNO_NAME_3D_TRANSFORM_MATRIX = u"D3DTransformMatrix"_ustr; +inline constexpr OUString UNO_NAME_3D_CAMERA_GEOMETRY = u"D3DCameraGeometry"_ustr; +inline constexpr OUString UNO_NAME_3D_POS = u"D3DPosition"_ustr; +inline constexpr OUString UNO_NAME_3D_SIZE = u"D3DSize"_ustr; +inline constexpr OUString UNO_NAME_3D_POS_IS_CENTER = u"D3DPositionIsCenter"_ustr; +inline constexpr OUString UNO_NAME_3D_POLYPOLYGON3D = u"D3DPolyPolygon3D"_ustr; +inline constexpr OUString UNO_NAME_3D_NORMALSPOLYGON3D = u"D3DNormalsPolygon3D"_ustr; +inline constexpr OUString UNO_NAME_3D_TEXTUREPOLYGON3D = u"D3DTexturePolygon3D"_ustr; +inline constexpr OUString UNO_NAME_3D_LINEONLY = u"D3DLineOnly"_ustr; // New 3D properties which are possible for lathe and extrude 3d objects -inline constexpr OUStringLiteral UNO_NAME_3D_SMOOTH_NORMALS = u"D3DSmoothNormals"; -inline constexpr OUStringLiteral UNO_NAME_3D_SMOOTH_LIDS = u"D3DSmoothLids"; -inline constexpr OUStringLiteral UNO_NAME_3D_CHARACTER_MODE = u"D3DCharacterMode"; -inline constexpr OUStringLiteral UNO_NAME_3D_CLOSE_FRONT = u"D3DCloseFront"; -inline constexpr OUStringLiteral UNO_NAME_3D_CLOSE_BACK = u"D3DCloseBack"; - -inline constexpr OUStringLiteral UNO_NAME_NUMBERING = u"NumberingIsNumber"; -inline constexpr OUStringLiteral UNO_NAME_NUMBERING_RULES = u"NumberingRules"; -inline constexpr OUStringLiteral UNO_NAME_NUMBERING_LEVEL = u"NumberingLevel"; - -inline constexpr OUStringLiteral UNO_NAME_NRULE_NUMBERINGTYPE = u"NumberingType"; -inline constexpr OUStringLiteral UNO_NAME_NRULE_PREFIX = u"Prefix"; -inline constexpr OUStringLiteral UNO_NAME_NRULE_SUFFIX = u"Suffix"; +inline constexpr OUString UNO_NAME_3D_SMOOTH_NORMALS = u"D3DSmoothNormals"_ustr; +inline constexpr OUString UNO_NAME_3D_SMOOTH_LIDS = u"D3DSmoothLids"_ustr; +inline constexpr OUString UNO_NAME_3D_CHARACTER_MODE = u"D3DCharacterMode"_ustr; +inline constexpr OUString UNO_NAME_3D_CLOSE_FRONT = u"D3DCloseFront"_ustr; +inline constexpr OUString UNO_NAME_3D_CLOSE_BACK = u"D3DCloseBack"_ustr; + +inline constexpr OUString UNO_NAME_NUMBERING = u"NumberingIsNumber"_ustr; +inline constexpr OUString UNO_NAME_NUMBERING_RULES = u"NumberingRules"_ustr; +inline constexpr OUString UNO_NAME_NUMBERING_LEVEL = u"NumberingLevel"_ustr; + +inline constexpr OUString UNO_NAME_NRULE_NUMBERINGTYPE = u"NumberingType"_ustr; +inline constexpr OUString UNO_NAME_NRULE_PREFIX = u"Prefix"_ustr; +inline constexpr OUString UNO_NAME_NRULE_SUFFIX = u"Suffix"_ustr; #define UNO_NAME_NRULE_BULLETID "BulletId" -inline constexpr OUStringLiteral UNO_NAME_NRULE_BULLET_COLOR = u"BulletColor"; -inline constexpr OUStringLiteral UNO_NAME_NRULE_BULLET_RELSIZE = u"BulletRelSize"; -inline constexpr OUStringLiteral UNO_NAME_NRULE_BULLET_FONT = u"BulletFont"; -inline constexpr OUStringLiteral UNO_NAME_NRULE_START_WITH = u"StartWith"; -inline constexpr OUStringLiteral UNO_NAME_NRULE_LEFT_MARGIN = u"LeftMargin"; -inline constexpr OUStringLiteral UNO_NAME_NRULE_FIRST_LINE_OFFSET = u"FirstLineOffset"; -inline constexpr OUStringLiteral UNO_NAME_NRULE_ADJUST = u"Adjust"; - -inline constexpr OUStringLiteral UNO_NAME_EDIT_FONT_DESCRIPTOR = u"FontDescriptor"; - -inline constexpr OUStringLiteral UNO_NAME_EDIT_PARA_ADJUST = u"ParaAdjust"; -inline constexpr OUStringLiteral UNO_NAME_EDIT_PARA_BMARGIN = u"ParaBottomMargin"; -inline constexpr OUStringLiteral UNO_NAME_EDIT_PARA_LASTLINEADJ = u"ParaLastLineAdjust"; -inline constexpr OUStringLiteral UNO_NAME_EDIT_PARA_LMARGIN = u"ParaLeftMargin"; -inline constexpr OUStringLiteral UNO_NAME_EDIT_PARA_LINESPACING = u"ParaLineSpacing"; -inline constexpr OUStringLiteral UNO_NAME_EDIT_PARA_RMARGIN = u"ParaRightMargin"; -inline constexpr OUStringLiteral UNO_NAME_EDIT_PARA_TABSTOPS = u"ParaTabStops"; -inline constexpr OUStringLiteral UNO_NAME_EDIT_PARA_TABSTOP_DEFAULT_DISTANCE = u"ParaTabStopDefaultDistance"; -inline constexpr OUStringLiteral UNO_NAME_EDIT_PARA_TMARGIN = u"ParaTopMargin"; -inline constexpr OUStringLiteral UNO_NAME_EDIT_PARA_IS_HYPHEN = u"ParaIsHyphenation"; -inline constexpr OUStringLiteral UNO_NAME_EDIT_PARA_IS_HANGING_PUNCTUATION = u"ParaIsHangingPunctuation"; -inline constexpr OUStringLiteral UNO_NAME_EDIT_PARA_IS_CHARACTER_DISTANCE = u"ParaIsCharacterDistance"; -inline constexpr OUStringLiteral UNO_NAME_EDIT_PARA_IS_FORBIDDEN_RULES = u"ParaIsForbiddenRules"; -inline constexpr OUStringLiteral UNO_NAME_EDIT_PARA_FIRST_LINE_INDENT = u"ParaFirstLineIndent"; - -inline constexpr OUStringLiteral UNO_NAME_EDIT_CHAR_HEIGHT = u"CharHeight"; -inline constexpr OUStringLiteral UNO_NAME_EDIT_CHAR_FONTNAME = u"CharFontName"; -inline constexpr OUStringLiteral UNO_NAME_EDIT_CHAR_FONTSTYLENAME = u"CharFontStyleName"; -inline constexpr OUStringLiteral UNO_NAME_EDIT_CHAR_FONTFAMILY = u"CharFontFamily"; -inline constexpr OUStringLiteral UNO_NAME_EDIT_CHAR_FONTCHARSET = u"CharFontCharSet"; -inline constexpr OUStringLiteral UNO_NAME_EDIT_CHAR_FONTPITCH = u"CharFontPitch"; -inline constexpr OUStringLiteral UNO_NAME_EDIT_CHAR_POSTURE = u"CharPosture"; -inline constexpr OUStringLiteral UNO_NAME_EDIT_CHAR_WEIGHT = u"CharWeight"; -inline constexpr OUStringLiteral UNO_NAME_EDIT_CHAR_LOCALE = u"CharLocale"; - -inline constexpr OUStringLiteral UNO_NAME_EDIT_CHAR_HEIGHT_ASIAN = u"CharHeightAsian"; -inline constexpr OUStringLiteral UNO_NAME_EDIT_CHAR_FONTNAME_ASIAN = u"CharFontNameAsian"; -inline constexpr OUStringLiteral UNO_NAME_EDIT_CHAR_FONTSTYLENAME_ASIAN = u"CharFontStyleNameAsian"; -inline constexpr OUStringLiteral UNO_NAME_EDIT_CHAR_FONTFAMILY_ASIAN = u"CharFontFamilyAsian"; -inline constexpr OUStringLiteral UNO_NAME_EDIT_CHAR_FONTCHARSET_ASIAN = u"CharFontCharSetAsian"; -inline constexpr OUStringLiteral UNO_NAME_EDIT_CHAR_FONTPITCH_ASIAN = u"CharFontPitchAsian"; -inline constexpr OUStringLiteral UNO_NAME_EDIT_CHAR_POSTURE_ASIAN = u"CharPostureAsian"; -inline constexpr OUStringLiteral UNO_NAME_EDIT_CHAR_WEIGHT_ASIAN = u"CharWeightAsian"; -inline constexpr OUStringLiteral UNO_NAME_EDIT_CHAR_LOCALE_ASIAN = u"CharLocaleAsian"; - -inline constexpr OUStringLiteral UNO_NAME_EDIT_CHAR_HEIGHT_COMPLEX = u"CharHeightComplex"; -inline constexpr OUStringLiteral UNO_NAME_EDIT_CHAR_FONTNAME_COMPLEX = u"CharFontNameComplex"; -inline constexpr OUStringLiteral UNO_NAME_EDIT_CHAR_FONTSTYLENAME_COMPLEX = u"CharFontStyleNameComplex"; -inline constexpr OUStringLiteral UNO_NAME_EDIT_CHAR_FONTFAMILY_COMPLEX = u"CharFontFamilyComplex"; -inline constexpr OUStringLiteral UNO_NAME_EDIT_CHAR_FONTCHARSET_COMPLEX = u"CharFontCharSetComplex"; -inline constexpr OUStringLiteral UNO_NAME_EDIT_CHAR_FONTPITCH_COMPLEX = u"CharFontPitchComplex"; -inline constexpr OUStringLiteral UNO_NAME_EDIT_CHAR_POSTURE_COMPLEX = u"CharPostureComplex"; -inline constexpr OUStringLiteral UNO_NAME_EDIT_CHAR_WEIGHT_COMPLEX = u"CharWeightComplex"; -inline constexpr OUStringLiteral UNO_NAME_EDIT_CHAR_LOCALE_COMPLEX = u"CharLocaleComplex"; - -inline constexpr OUStringLiteral UNO_NAME_EDIT_CHAR_COLOR = u"CharColor"; -inline constexpr OUStringLiteral UNO_NAME_EDIT_CHAR_COLOR_THEME = u"CharColorTheme"; -inline constexpr OUStringLiteral UNO_NAME_EDIT_CHAR_COLOR_TINT_OR_SHADE = u"CharColorTintOrShade"; -inline constexpr OUStringLiteral UNO_NAME_EDIT_CHAR_COLOR_LUM_MOD = u"CharColorLumMod"; -inline constexpr OUStringLiteral UNO_NAME_EDIT_CHAR_COLOR_LUM_OFF = u"CharColorLumOff"; -inline constexpr OUStringLiteral UNO_NAME_EDIT_CHAR_COMPLEX_COLOR = u"CharComplexColor"; -inline constexpr OUStringLiteral UNO_NAME_EDIT_CHAR_TRANSPARENCE = u"CharTransparence"; -inline constexpr OUStringLiteral UNO_NAME_EDIT_CHAR_CROSSEDOUT = u"CharCrossedOut"; -inline constexpr OUStringLiteral UNO_NAME_EDIT_CHAR_STRIKEOUT = u"CharStrikeout"; -inline constexpr OUStringLiteral UNO_NAME_EDIT_CHAR_CASEMAP = u"CharCaseMap"; -inline constexpr OUStringLiteral UNO_NAME_EDIT_CHAR_ESCAPEMENT = u"CharEscapement"; -inline constexpr OUStringLiteral UNO_NAME_EDIT_CHAR_SHADOWED = u"CharShadowed"; -inline constexpr OUStringLiteral UNO_NAME_EDIT_CHAR_UNDERLINE = u"CharUnderline"; -inline constexpr OUStringLiteral UNO_NAME_EDIT_CHAR_OVERLINE = u"CharOverline"; - -inline constexpr OUStringLiteral UNO_NAME_EDIT_CHAR_BACKGROUND_COLOR = u"CharBackColor"; -inline constexpr OUStringLiteral UNO_NAME_EDIT_CHAR_BACKGROUND_COMPLEX_COLOR = u"CharBackgroundComplexColor"; -inline constexpr OUStringLiteral UNO_NAME_EDIT_CHAR_BACKGROUND_TRANSPARENT = u"CharBackTransparent"; - -inline constexpr OUStringLiteral UNO_NAME_BITMAP = u"Bitmap"; - -inline constexpr OUStringLiteral UNO_NAME_LINKDISPLAYNAME = u"LinkDisplayName"; -inline constexpr OUStringLiteral UNO_NAME_LINKDISPLAYBITMAP = u"LinkDisplayBitmap"; - -inline constexpr OUStringLiteral UNO_NAME_GRAPHIC_LUMINANCE = u"AdjustLuminance"; -inline constexpr OUStringLiteral UNO_NAME_GRAPHIC_CONTRAST = u"AdjustContrast"; -inline constexpr OUStringLiteral UNO_NAME_GRAPHIC_RED = u"AdjustRed"; -inline constexpr OUStringLiteral UNO_NAME_GRAPHIC_GREEN = u"AdjustGreen"; -inline constexpr OUStringLiteral UNO_NAME_GRAPHIC_BLUE = u"AdjustBlue"; -inline constexpr OUStringLiteral UNO_NAME_GRAPHIC_GAMMA = u"Gamma"; -inline constexpr OUStringLiteral UNO_NAME_GRAPHIC_TRANSPARENCY = u"Transparency"; -inline constexpr OUStringLiteral UNO_NAME_GRAPHIC_COLOR_MODE = u"GraphicColorMode"; -inline constexpr OUStringLiteral UNO_NAME_GRAPHIC_GRAPHICCROP = u"GraphicCrop"; +inline constexpr OUString UNO_NAME_NRULE_BULLET_COLOR = u"BulletColor"_ustr; +inline constexpr OUString UNO_NAME_NRULE_BULLET_RELSIZE = u"BulletRelSize"_ustr; +inline constexpr OUString UNO_NAME_NRULE_BULLET_FONT = u"BulletFont"_ustr; +inline constexpr OUString UNO_NAME_NRULE_START_WITH = u"StartWith"_ustr; +inline constexpr OUString UNO_NAME_NRULE_LEFT_MARGIN = u"LeftMargin"_ustr; +inline constexpr OUString UNO_NAME_NRULE_FIRST_LINE_OFFSET = u"FirstLineOffset"_ustr; +inline constexpr OUString UNO_NAME_NRULE_ADJUST = u"Adjust"_ustr; + +inline constexpr OUString UNO_NAME_EDIT_FONT_DESCRIPTOR = u"FontDescriptor"_ustr; + +inline constexpr OUString UNO_NAME_EDIT_PARA_ADJUST = u"ParaAdjust"_ustr; +inline constexpr OUString UNO_NAME_EDIT_PARA_BMARGIN = u"ParaBottomMargin"_ustr; +inline constexpr OUString UNO_NAME_EDIT_PARA_LASTLINEADJ = u"ParaLastLineAdjust"_ustr; +inline constexpr OUString UNO_NAME_EDIT_PARA_LMARGIN = u"ParaLeftMargin"_ustr; +inline constexpr OUString UNO_NAME_EDIT_PARA_LINESPACING = u"ParaLineSpacing"_ustr; +inline constexpr OUString UNO_NAME_EDIT_PARA_RMARGIN = u"ParaRightMargin"_ustr; +inline constexpr OUString UNO_NAME_EDIT_PARA_TABSTOPS = u"ParaTabStops"_ustr; +inline constexpr OUString UNO_NAME_EDIT_PARA_TABSTOP_DEFAULT_DISTANCE = u"ParaTabStopDefaultDistance"_ustr; +inline constexpr OUString UNO_NAME_EDIT_PARA_TMARGIN = u"ParaTopMargin"_ustr; +inline constexpr OUString UNO_NAME_EDIT_PARA_IS_HYPHEN = u"ParaIsHyphenation"_ustr; +inline constexpr OUString UNO_NAME_EDIT_PARA_IS_HANGING_PUNCTUATION = u"ParaIsHangingPunctuation"_ustr; +inline constexpr OUString UNO_NAME_EDIT_PARA_IS_CHARACTER_DISTANCE = u"ParaIsCharacterDistance"_ustr; +inline constexpr OUString UNO_NAME_EDIT_PARA_IS_FORBIDDEN_RULES = u"ParaIsForbiddenRules"_ustr; +inline constexpr OUString UNO_NAME_EDIT_PARA_FIRST_LINE_INDENT = u"ParaFirstLineIndent"_ustr; + +inline constexpr OUString UNO_NAME_EDIT_CHAR_HEIGHT = u"CharHeight"_ustr; +inline constexpr OUString UNO_NAME_EDIT_CHAR_FONTNAME = u"CharFontName"_ustr; +inline constexpr OUString UNO_NAME_EDIT_CHAR_FONTSTYLENAME = u"CharFontStyleName"_ustr; +inline constexpr OUString UNO_NAME_EDIT_CHAR_FONTFAMILY = u"CharFontFamily"_ustr; +inline constexpr OUString UNO_NAME_EDIT_CHAR_FONTCHARSET = u"CharFontCharSet"_ustr; +inline constexpr OUString UNO_NAME_EDIT_CHAR_FONTPITCH = u"CharFontPitch"_ustr; +inline constexpr OUString UNO_NAME_EDIT_CHAR_POSTURE = u"CharPosture"_ustr; +inline constexpr OUString UNO_NAME_EDIT_CHAR_WEIGHT = u"CharWeight"_ustr; +inline constexpr OUString UNO_NAME_EDIT_CHAR_LOCALE = u"CharLocale"_ustr; + +inline constexpr OUString UNO_NAME_EDIT_CHAR_HEIGHT_ASIAN = u"CharHeightAsian"_ustr; +inline constexpr OUString UNO_NAME_EDIT_CHAR_FONTNAME_ASIAN = u"CharFontNameAsian"_ustr; +inline constexpr OUString UNO_NAME_EDIT_CHAR_FONTSTYLENAME_ASIAN = u"CharFontStyleNameAsian"_ustr; +inline constexpr OUString UNO_NAME_EDIT_CHAR_FONTFAMILY_ASIAN = u"CharFontFamilyAsian"_ustr; +inline constexpr OUString UNO_NAME_EDIT_CHAR_FONTCHARSET_ASIAN = u"CharFontCharSetAsian"_ustr; +inline constexpr OUString UNO_NAME_EDIT_CHAR_FONTPITCH_ASIAN = u"CharFontPitchAsian"_ustr; +inline constexpr OUString UNO_NAME_EDIT_CHAR_POSTURE_ASIAN = u"CharPostureAsian"_ustr; +inline constexpr OUString UNO_NAME_EDIT_CHAR_WEIGHT_ASIAN = u"CharWeightAsian"_ustr; +inline constexpr OUString UNO_NAME_EDIT_CHAR_LOCALE_ASIAN = u"CharLocaleAsian"_ustr; + +inline constexpr OUString UNO_NAME_EDIT_CHAR_HEIGHT_COMPLEX = u"CharHeightComplex"_ustr; +inline constexpr OUString UNO_NAME_EDIT_CHAR_FONTNAME_COMPLEX = u"CharFontNameComplex"_ustr; +inline constexpr OUString UNO_NAME_EDIT_CHAR_FONTSTYLENAME_COMPLEX = u"CharFontStyleNameComplex"_ustr; +inline constexpr OUString UNO_NAME_EDIT_CHAR_FONTFAMILY_COMPLEX = u"CharFontFamilyComplex"_ustr; +inline constexpr OUString UNO_NAME_EDIT_CHAR_FONTCHARSET_COMPLEX = u"CharFontCharSetComplex"_ustr; +inline constexpr OUString UNO_NAME_EDIT_CHAR_FONTPITCH_COMPLEX = u"CharFontPitchComplex"_ustr; +inline constexpr OUString UNO_NAME_EDIT_CHAR_POSTURE_COMPLEX = u"CharPostureComplex"_ustr; +inline constexpr OUString UNO_NAME_EDIT_CHAR_WEIGHT_COMPLEX = u"CharWeightComplex"_ustr; +inline constexpr OUString UNO_NAME_EDIT_CHAR_LOCALE_COMPLEX = u"CharLocaleComplex"_ustr; + +inline constexpr OUString UNO_NAME_EDIT_CHAR_COLOR = u"CharColor"_ustr; +inline constexpr OUString UNO_NAME_EDIT_CHAR_COLOR_THEME = u"CharColorTheme"_ustr; +inline constexpr OUString UNO_NAME_EDIT_CHAR_COLOR_TINT_OR_SHADE = u"CharColorTintOrShade"_ustr; +inline constexpr OUString UNO_NAME_EDIT_CHAR_COLOR_LUM_MOD = u"CharColorLumMod"_ustr; +inline constexpr OUString UNO_NAME_EDIT_CHAR_COLOR_LUM_OFF = u"CharColorLumOff"_ustr; +inline constexpr OUString UNO_NAME_EDIT_CHAR_COMPLEX_COLOR = u"CharComplexColor"_ustr; +inline constexpr OUString UNO_NAME_EDIT_CHAR_TRANSPARENCE = u"CharTransparence"_ustr; +inline constexpr OUString UNO_NAME_EDIT_CHAR_CROSSEDOUT = u"CharCrossedOut"_ustr; +inline constexpr OUString UNO_NAME_EDIT_CHAR_STRIKEOUT = u"CharStrikeout"_ustr; +inline constexpr OUString UNO_NAME_EDIT_CHAR_CASEMAP = u"CharCaseMap"_ustr; +inline constexpr OUString UNO_NAME_EDIT_CHAR_ESCAPEMENT = u"CharEscapement"_ustr; +inline constexpr OUString UNO_NAME_EDIT_CHAR_SHADOWED = u"CharShadowed"_ustr; +inline constexpr OUString UNO_NAME_EDIT_CHAR_UNDERLINE = u"CharUnderline"_ustr; +inline constexpr OUString UNO_NAME_EDIT_CHAR_OVERLINE = u"CharOverline"_ustr; + +inline constexpr OUString UNO_NAME_EDIT_CHAR_BACKGROUND_COLOR = u"CharBackColor"_ustr; +inline constexpr OUString UNO_NAME_EDIT_CHAR_BACKGROUND_COMPLEX_COLOR = u"CharBackgroundComplexColor"_ustr; +inline constexpr OUString UNO_NAME_EDIT_CHAR_BACKGROUND_TRANSPARENT = u"CharBackTransparent"_ustr; + +inline constexpr OUString UNO_NAME_BITMAP = u"Bitmap"_ustr; + +inline constexpr OUString UNO_NAME_LINKDISPLAYNAME = u"LinkDisplayName"_ustr; +inline constexpr OUString UNO_NAME_LINKDISPLAYBITMAP = u"LinkDisplayBitmap"_ustr; + +inline constexpr OUString UNO_NAME_GRAPHIC_LUMINANCE = u"AdjustLuminance"_ustr; +inline constexpr OUString UNO_NAME_GRAPHIC_CONTRAST = u"AdjustContrast"_ustr; +inline constexpr OUString UNO_NAME_GRAPHIC_RED = u"AdjustRed"_ustr; +inline constexpr OUString UNO_NAME_GRAPHIC_GREEN = u"AdjustGreen"_ustr; +inline constexpr OUString UNO_NAME_GRAPHIC_BLUE = u"AdjustBlue"_ustr; +inline constexpr OUString UNO_NAME_GRAPHIC_GAMMA = u"Gamma"_ustr; +inline constexpr OUString UNO_NAME_GRAPHIC_TRANSPARENCY = u"Transparency"_ustr; +inline constexpr OUString UNO_NAME_GRAPHIC_COLOR_MODE = u"GraphicColorMode"_ustr; +inline constexpr OUString UNO_NAME_GRAPHIC_GRAPHICCROP = u"GraphicCrop"_ustr; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx index 7f2c5a2763d0..c48280c7a4a4 100644 --- a/include/filter/msfilter/msdffimp.hxx +++ b/include/filter/msfilter/msdffimp.hxx @@ -120,7 +120,7 @@ public: typedef ::std::map< sal_Int32, SdrObject* > SvxMSDffShapeIdContainer; -inline constexpr OUStringLiteral SVEXT_PERSIST_STREAM = u"\002OlePres000"; +inline constexpr OUString SVEXT_PERSIST_STREAM = u"\002OlePres000"_ustr; /// the following will be sorted by the order of their appearance: typedef std::vector<std::unique_ptr<SvxMSDffShapeOrder>> SvxMSDffShapeOrders; diff --git a/include/framework/addonsoptions.hxx b/include/framework/addonsoptions.hxx index 0e97f7a24a86..f421da6d43e8 100644 --- a/include/framework/addonsoptions.hxx +++ b/include/framework/addonsoptions.hxx @@ -33,14 +33,14 @@ namespace osl { class Mutex; } @descr The method GetAddonsMenu() returns a list of property values. Use follow defines to separate values by names. *//*-*************************************************************************************************************/ -inline constexpr OUStringLiteral ADDONSMENUITEM_STRING_URL = u"URL"; -inline constexpr OUStringLiteral ADDONSMENUITEM_STRING_TITLE = u"Title"; -inline constexpr OUStringLiteral ADDONSMENUITEM_STRING_TARGET = u"Target"; -inline constexpr OUStringLiteral ADDONSMENUITEM_STRING_IMAGEIDENTIFIER = u"ImageIdentifier"; -inline constexpr OUStringLiteral ADDONSMENUITEM_STRING_CONTEXT = u"Context"; -inline constexpr OUStringLiteral ADDONSMENUITEM_STRING_SUBMENU = u"Submenu"; - -inline constexpr OUStringLiteral ADDONSPOPUPMENU_URL_PREFIX_STR = u"private:menu/Addon"; +inline constexpr OUString ADDONSMENUITEM_STRING_URL = u"URL"_ustr; +inline constexpr OUString ADDONSMENUITEM_STRING_TITLE = u"Title"_ustr; +inline constexpr OUString ADDONSMENUITEM_STRING_TARGET = u"Target"_ustr; +inline constexpr OUString ADDONSMENUITEM_STRING_IMAGEIDENTIFIER = u"ImageIdentifier"_ustr; +inline constexpr OUString ADDONSMENUITEM_STRING_CONTEXT = u"Context"_ustr; +inline constexpr OUString ADDONSMENUITEM_STRING_SUBMENU = u"Submenu"_ustr; + +inline constexpr OUString ADDONSPOPUPMENU_URL_PREFIX_STR = u"private:menu/Addon"_ustr; namespace framework { diff --git a/include/i18nlangtag/languagetag.hxx b/include/i18nlangtag/languagetag.hxx index 79ffc28d771a..39982148bcbb 100644 --- a/include/i18nlangtag/languagetag.hxx +++ b/include/i18nlangtag/languagetag.hxx @@ -33,7 +33,7 @@ detailed BCP 47 language tag use LanguageTag::isIsoLocale() instead. */ #define I18NLANGTAG_QLT_ASCII "qlt" -inline constexpr OUStringLiteral I18NLANGTAG_QLT = u"qlt"; +inline constexpr OUString I18NLANGTAG_QLT = u"qlt"_ustr; class LanguageTagImpl; diff --git a/include/linguistic/lngprops.hxx b/include/linguistic/lngprops.hxx index 2c3dc1d901f1..b9a00d44c90e 100644 --- a/include/linguistic/lngprops.hxx +++ b/include/linguistic/lngprops.hxx @@ -24,7 +24,7 @@ // maximal number of suggestions to be returned in spelling context-menu // (may not include results added by looking up user dictionaries) -inline constexpr OUStringLiteral UPN_MAX_NUMBER_OF_SUGGESTIONS = u"MaxNumberOfSuggestions"; +inline constexpr OUString UPN_MAX_NUMBER_OF_SUGGESTIONS = u"MaxNumberOfSuggestions"_ustr; #endif diff --git a/include/linguistic/misc.hxx b/include/linguistic/misc.hxx index 02b3d44b3fb4..57c7179a2007 100644 --- a/include/linguistic/misc.hxx +++ b/include/linguistic/misc.hxx @@ -46,10 +46,10 @@ class CharClass; class LocaleDataWrapper; -inline constexpr OUStringLiteral SN_GRAMMARCHECKER = u"com.sun.star.linguistic2.Proofreader"; -inline constexpr OUStringLiteral SN_SPELLCHECKER = u"com.sun.star.linguistic2.SpellChecker"; -inline constexpr OUStringLiteral SN_HYPHENATOR = u"com.sun.star.linguistic2.Hyphenator"; -inline constexpr OUStringLiteral SN_THESAURUS = u"com.sun.star.linguistic2.Thesaurus"; +inline constexpr OUString SN_GRAMMARCHECKER = u"com.sun.star.linguistic2.Proofreader"_ustr; +inline constexpr OUString SN_SPELLCHECKER = u"com.sun.star.linguistic2.SpellChecker"_ustr; +inline constexpr OUString SN_HYPHENATOR = u"com.sun.star.linguistic2.Hyphenator"_ustr; +inline constexpr OUString SN_THESAURUS = u"com.sun.star.linguistic2.Thesaurus"_ustr; namespace linguistic diff --git a/include/oox/dump/dumperbase.hxx b/include/oox/dump/dumperbase.hxx index 04a41e92a964..f80b2f4d93f0 100644 --- a/include/oox/dump/dumperbase.hxx +++ b/include/oox/dump/dumperbase.hxx @@ -61,13 +61,13 @@ namespace oox::core { namespace oox::dump { -inline constexpr OUStringLiteral OOX_DUMP_UNUSED = u"unused"; -inline constexpr OUStringLiteral OOX_DUMP_UNKNOWN = u"?unknown"; +inline constexpr OUString OOX_DUMP_UNUSED = u"unused"_ustr; +inline constexpr OUString OOX_DUMP_UNKNOWN = u"?unknown"_ustr; #define OOX_DUMP_ERRASCII( ascii ) "?err:" ascii #define OOX_DUMP_ERR_NOMAP "no-map" -inline constexpr OUStringLiteral OOX_DUMP_ERR_NONAME = u"no-name"; +inline constexpr OUString OOX_DUMP_ERR_NONAME = u"no-name"_ustr; #define OOX_DUMP_ERR_STREAM "stream-error" #define OOX_DUMP_DUMPEXT ".dump" @@ -1393,8 +1393,8 @@ protected: void dumpRemainingStream(); void dumpArray( const String& rName, sal_Int32 nBytes, sal_Unicode cSep = OOX_DUMP_LISTSEP ); - void dumpUnused( sal_Int32 nBytes ) { dumpArray( OUString(OOX_DUMP_UNUSED), nBytes ); } - void dumpUnknown( sal_Int32 nBytes ) { dumpArray( OUString(OOX_DUMP_UNKNOWN), nBytes ); } + void dumpUnused( sal_Int32 nBytes ) { dumpArray( OOX_DUMP_UNUSED, nBytes ); } + void dumpUnknown( sal_Int32 nBytes ) { dumpArray( OOX_DUMP_UNKNOWN, nBytes ); } sal_Unicode dumpUnicode( const String& rName ); diff --git a/include/sfx2/evntconf.hxx b/include/sfx2/evntconf.hxx index 6c4649cba17d..6716678813d1 100644 --- a/include/sfx2/evntconf.hxx +++ b/include/sfx2/evntconf.hxx @@ -85,10 +85,10 @@ public: }; -inline constexpr OUStringLiteral PROP_EVENT_TYPE = u"EventType"; -inline constexpr OUStringLiteral PROP_LIBRARY = u"Library"; -inline constexpr OUStringLiteral PROP_SCRIPT = u"Script"; -inline constexpr OUStringLiteral PROP_MACRO_NAME = u"MacroName"; +inline constexpr OUString PROP_EVENT_TYPE = u"EventType"_ustr; +inline constexpr OUString PROP_LIBRARY = u"Library"_ustr; +inline constexpr OUString PROP_SCRIPT = u"Script"_ustr; +inline constexpr OUString PROP_MACRO_NAME = u"MacroName"_ustr; #define STAR_BASIC "StarBasic" class SFX2_DLLPUBLIC SfxEventConfiguration diff --git a/include/sfx2/filedlghelper.hxx b/include/sfx2/filedlghelper.hxx index c535a6b7bb55..d637a4194c2a 100644 --- a/include/sfx2/filedlghelper.hxx +++ b/include/sfx2/filedlghelper.hxx @@ -68,7 +68,7 @@ namespace o3tl { template<> struct typed_flags<FileDialogFlags> : is_typed_flags<FileDialogFlags, 0xFF> {}; } -inline constexpr OUStringLiteral FILEDIALOG_FILTER_ALL = u"*.*"; +inline constexpr OUString FILEDIALOG_FILTER_ALL = u"*.*"_ustr; namespace sfx2 { diff --git a/include/svl/inettype.hxx b/include/svl/inettype.hxx index 7d9ebce51f60..b0ecc300acae 100644 --- a/include/svl/inettype.hxx +++ b/include/svl/inettype.hxx @@ -25,119 +25,111 @@ /** Definitions for frequently used media type names. */ -inline constexpr OUStringLiteral CONTENT_TYPE_STR_APP_OCTSTREAM = u"application/octet-stream"; -inline constexpr OUStringLiteral CONTENT_TYPE_STR_APP_PDF = u"application/pdf"; -inline constexpr OUStringLiteral CONTENT_TYPE_STR_APP_RTF = u"application/rtf"; -inline constexpr OUStringLiteral CONTENT_TYPE_STR_APP_VND_CALC - = u"application/vnd.stardivision.calc"; -inline constexpr OUStringLiteral CONTENT_TYPE_STR_APP_VND_CHART - = u"application/vnd.stardivision.chart"; -inline constexpr OUStringLiteral CONTENT_TYPE_STR_APP_VND_DRAW - = u"application/vnd.stardivision.draw"; -inline constexpr OUStringLiteral CONTENT_TYPE_STR_APP_VND_IMAGE - = u"application/vnd.stardivision.image"; -inline constexpr OUStringLiteral CONTENT_TYPE_STR_APP_VND_IMPRESSPACKED - = u"application/vnd.stardivision.impress-packed"; -inline constexpr OUStringLiteral CONTENT_TYPE_STR_APP_VND_IMPRESS - = u"application/vnd.stardivision.impress"; -inline constexpr OUStringLiteral CONTENT_TYPE_STR_APP_VND_MAIL - = u"application/vnd.stardivision.mail"; -inline constexpr OUStringLiteral CONTENT_TYPE_STR_APP_VND_MATH - = u"application/vnd.stardivision.math"; -inline constexpr OUStringLiteral CONTENT_TYPE_STR_APP_VND_NEWS - = u"application/vnd.stardivision.news"; -inline constexpr OUStringLiteral CONTENT_TYPE_STR_APP_VND_OUTTRAY - = u"application/vnd.stardivision.outtray"; -inline constexpr OUStringLiteral CONTENT_TYPE_STR_APP_VND_TEMPLATE - = u"application/vnd.stardivision.template"; -inline constexpr OUStringLiteral CONTENT_TYPE_STR_APP_VND_WRITER_GLOBAL - = u"application/vnd.stardivision.writer-global"; -inline constexpr OUStringLiteral CONTENT_TYPE_STR_APP_VND_WRITER_WEB - = u"application/vnd.stardivision.writer-web"; -inline constexpr OUStringLiteral CONTENT_TYPE_STR_APP_VND_WRITER - = u"application/vnd.stardivision.writer"; -inline constexpr OUStringLiteral CONTENT_TYPE_STR_APP_FRAMESET = u"application/x-frameset"; -inline constexpr OUStringLiteral CONTENT_TYPE_STR_APP_GALLERY_THEME - = u"application/x-gallery-theme"; -inline constexpr OUStringLiteral CONTENT_TYPE_STR_APP_GALLERY = u"application/x-gallery"; -inline constexpr OUStringLiteral CONTENT_TYPE_STR_APP_JAR = u"application/x-jar"; -inline constexpr OUStringLiteral CONTENT_TYPE_STR_APP_MACRO = u"application/x-macro"; -inline constexpr OUStringLiteral CONTENT_TYPE_STR_APP_MSEXCEL_TEMPL - = u"application/x-msexcel-template"; -inline constexpr OUStringLiteral CONTENT_TYPE_STR_APP_MSEXCEL = u"application/x-msexcel"; -inline constexpr OUStringLiteral CONTENT_TYPE_STR_APP_MSPPOINT_TEMPL - = u"application/x-mspowerpoint-template"; -inline constexpr OUStringLiteral CONTENT_TYPE_STR_APP_MSPPOINT = u"application/x-mspowerpoint"; -inline constexpr OUStringLiteral CONTENT_TYPE_STR_APP_MSWORD_TEMPL - = u"application/x-msword-template"; -inline constexpr OUStringLiteral CONTENT_TYPE_STR_APP_MSWORD = u"application/x-msword"; -inline constexpr OUStringLiteral CONTENT_TYPE_STR_APP_STARCALC = u"application/x-starcalc"; -inline constexpr OUStringLiteral CONTENT_TYPE_STR_APP_STARCHART = u"application/x-starchart;"; -inline constexpr OUStringLiteral CONTENT_TYPE_STR_APP_STARDRAW = u"application/x-stardraw"; -inline constexpr OUStringLiteral CONTENT_TYPE_STR_APP_STARHELP = u"application/x-starhelp"; -inline constexpr OUStringLiteral CONTENT_TYPE_STR_APP_STARIMAGE = u"application/x-starimage"; -inline constexpr OUStringLiteral CONTENT_TYPE_STR_APP_STARIMPRESS = u"application/x-starimpress"; -inline constexpr OUStringLiteral CONTENT_TYPE_STR_APP_STARMAIL_SDM = u"application/x-starmail-sdm"; -inline constexpr OUStringLiteral CONTENT_TYPE_STR_APP_STARMAIL_SMD = u"application/x-starmail-smd"; -inline constexpr OUStringLiteral CONTENT_TYPE_STR_APP_STARMATH = u"application/x-starmath"; -inline constexpr OUStringLiteral CONTENT_TYPE_STR_APP_STARWRITER_GLOB - = u"application/x-starwriter-global"; -inline constexpr OUStringLiteral CONTENT_TYPE_STR_APP_STARWRITER = u"application/x-starwriter"; -inline constexpr OUStringLiteral CONTENT_TYPE_STR_APP_CDE_CALENDAR_APP - = u"application/x-sun-ae-file"; -inline constexpr OUStringLiteral CONTENT_TYPE_STR_APP_ZIP = u"application/x-zip-compressed"; -inline constexpr OUStringLiteral CONTENT_TYPE_STR_AUDIO_AIFF = u"audio/aiff"; -inline constexpr OUStringLiteral CONTENT_TYPE_STR_AUDIO_BASIC = u"audio/basic"; -inline constexpr OUStringLiteral CONTENT_TYPE_STR_AUDIO_MIDI = u"audio/midi"; -inline constexpr OUStringLiteral CONTENT_TYPE_STR_AUDIO_VORBIS = u"audio/vorbis"; -inline constexpr OUStringLiteral CONTENT_TYPE_STR_AUDIO_WAV = u"audio/wav"; -inline constexpr OUStringLiteral CONTENT_TYPE_STR_AUDIO_WEBM = u"audio/webm"; -inline constexpr OUStringLiteral CONTENT_TYPE_STR_X_CNT_FSYSBOX = u".chaos/fsys-box"; -inline constexpr OUStringLiteral CONTENT_TYPE_STR_X_CNT_FSYSFOLDER = u".chaos/fsys-folder"; -inline constexpr OUStringLiteral CONTENT_TYPE_STR_X_CNT_FSYSSPECIALFOLDER - = u".chaos/fsys-special-folder"; -inline constexpr OUStringLiteral CONTENT_TYPE_STR_IMAGE_GENERIC = u"image/generic"; -inline constexpr OUStringLiteral CONTENT_TYPE_STR_IMAGE_GIF = u"image/gif"; -inline constexpr OUStringLiteral CONTENT_TYPE_STR_IMAGE_JPEG = u"image/jpeg"; -inline constexpr OUStringLiteral CONTENT_TYPE_STR_IMAGE_PCX = u"image/pcx"; -inline constexpr OUStringLiteral CONTENT_TYPE_STR_IMAGE_PNG = u"image/png"; -inline constexpr OUStringLiteral CONTENT_TYPE_STR_IMAGE_TIFF = u"image/tiff"; -inline constexpr OUStringLiteral CONTENT_TYPE_STR_IMAGE_BMP = u"image/x-MS-bmp"; -inline constexpr OUStringLiteral CONTENT_TYPE_STR_INET_MSG_RFC822 = u"message/rfc822"; -inline constexpr OUStringLiteral CONTENT_TYPE_STR_INET_MULTI_ALTERNATIVE = u"multipart/alternative"; -inline constexpr OUStringLiteral CONTENT_TYPE_STR_INET_MULTI_DIGEST = u"multipart/digest"; -inline constexpr OUStringLiteral CONTENT_TYPE_STR_INET_MULTI_MIXED = u"multipart/mixed"; -inline constexpr OUStringLiteral CONTENT_TYPE_STR_INET_MULTI_PARALLEL = u"multipart/parallel"; -inline constexpr OUStringLiteral CONTENT_TYPE_STR_INET_MULTI_RELATED = u"multipart/related"; -inline constexpr OUStringLiteral CONTENT_TYPE_STR_TEXT_ICALENDAR = u"text/calendar"; -inline constexpr OUStringLiteral CONTENT_TYPE_STR_TEXT_HTML = u"text/html"; -inline constexpr OUStringLiteral CONTENT_TYPE_STR_TEXT_PLAIN = u"text/plain"; -inline constexpr OUStringLiteral CONTENT_TYPE_STR_TEXT_XMLICALENDAR = u"text/x-icalxml"; -inline constexpr OUStringLiteral CONTENT_TYPE_STR_TEXT_URL = u"text/x-url"; -inline constexpr OUStringLiteral CONTENT_TYPE_STR_TEXT_VCALENDAR = u"text/x-vCalendar"; -inline constexpr OUStringLiteral CONTENT_TYPE_STR_TEXT_VCARD = u"text/x-vCard"; -inline constexpr OUStringLiteral CONTENT_TYPE_STR_VIDEO_MSVIDEO = u"video/x-msvideo"; -inline constexpr OUStringLiteral CONTENT_TYPE_STR_VIDEO_THEORA = u"video/theora"; -inline constexpr OUStringLiteral CONTENT_TYPE_STR_VIDEO_VDO = u"video/vdo"; -inline constexpr OUStringLiteral CONTENT_TYPE_STR_VIDEO_WEBM = u"audio/webm"; -inline constexpr OUStringLiteral CONTENT_TYPE_STR_X_STARMAIL = u"x-starmail"; -inline constexpr OUStringLiteral CONTENT_TYPE_STR_X_VRML = u"x-world/x-vrml"; -inline constexpr OUStringLiteral CONTENT_TYPE_STR_APP_VND_SUN_XML_WRITER - = u"application/vnd.sun.xml.writer"; -inline constexpr OUStringLiteral CONTENT_TYPE_STR_APP_VND_SUN_XML_CALC - = u"application/vnd.sun.xml.calc"; -inline constexpr OUStringLiteral CONTENT_TYPE_STR_APP_VND_SUN_XML_IMPRESS - = u"application/vnd.sun.xml.impress"; -inline constexpr OUStringLiteral CONTENT_TYPE_STR_APP_VND_SUN_XML_DRAW - = u"application/vnd.sun.xml.draw"; -inline constexpr OUStringLiteral CONTENT_TYPE_STR_APP_VND_SUN_XML_CHART - = u"application/vnd.sun.xml.chart"; -inline constexpr OUStringLiteral CONTENT_TYPE_STR_APP_VND_SUN_XML_MATH - = u"application/vnd.sun.xml.math"; -inline constexpr OUStringLiteral CONTENT_TYPE_STR_APP_VND_SUN_XML_WRITER_GLOBAL - = u"application/vnd.sun.xml.writer-global"; -inline constexpr OUStringLiteral CONTENT_TYPE_STR_APP_VND_SUN_XML_IMPRESSPACKED - = u"application/vnd.sun.xml.impress-packed"; +inline constexpr OUString CONTENT_TYPE_STR_APP_OCTSTREAM = u"application/octet-stream"_ustr; +inline constexpr OUString CONTENT_TYPE_STR_APP_PDF = u"application/pdf"_ustr; +inline constexpr OUString CONTENT_TYPE_STR_APP_RTF = u"application/rtf"_ustr; +inline constexpr OUString CONTENT_TYPE_STR_APP_VND_CALC = u"application/vnd.stardivision.calc"_ustr; +inline constexpr OUString CONTENT_TYPE_STR_APP_VND_CHART + = u"application/vnd.stardivision.chart"_ustr; +inline constexpr OUString CONTENT_TYPE_STR_APP_VND_DRAW = u"application/vnd.stardivision.draw"_ustr; +inline constexpr OUString CONTENT_TYPE_STR_APP_VND_IMAGE + = u"application/vnd.stardivision.image"_ustr; +inline constexpr OUString CONTENT_TYPE_STR_APP_VND_IMPRESSPACKED + = u"application/vnd.stardivision.impress-packed"_ustr; +inline constexpr OUString CONTENT_TYPE_STR_APP_VND_IMPRESS + = u"application/vnd.stardivision.impress"_ustr; +inline constexpr OUString CONTENT_TYPE_STR_APP_VND_MAIL = u"application/vnd.stardivision.mail"_ustr; +inline constexpr OUString CONTENT_TYPE_STR_APP_VND_MATH = u"application/vnd.stardivision.math"_ustr; +inline constexpr OUString CONTENT_TYPE_STR_APP_VND_NEWS = u"application/vnd.stardivision.news"_ustr; +inline constexpr OUString CONTENT_TYPE_STR_APP_VND_OUTTRAY + = u"application/vnd.stardivision.outtray"_ustr; +inline constexpr OUString CONTENT_TYPE_STR_APP_VND_TEMPLATE + = u"application/vnd.stardivision.template"_ustr; +inline constexpr OUString CONTENT_TYPE_STR_APP_VND_WRITER_GLOBAL + = u"application/vnd.stardivision.writer-global"_ustr; +inline constexpr OUString CONTENT_TYPE_STR_APP_VND_WRITER_WEB + = u"application/vnd.stardivision.writer-web"_ustr; +inline constexpr OUString CONTENT_TYPE_STR_APP_VND_WRITER + = u"application/vnd.stardivision.writer"_ustr; +inline constexpr OUString CONTENT_TYPE_STR_APP_FRAMESET = u"application/x-frameset"_ustr; +inline constexpr OUString CONTENT_TYPE_STR_APP_GALLERY_THEME = u"application/x-gallery-theme"_ustr; +inline constexpr OUString CONTENT_TYPE_STR_APP_GALLERY = u"application/x-gallery"_ustr; +inline constexpr OUString CONTENT_TYPE_STR_APP_JAR = u"application/x-jar"_ustr; +inline constexpr OUString CONTENT_TYPE_STR_APP_MACRO = u"application/x-macro"_ustr; +inline constexpr OUString CONTENT_TYPE_STR_APP_MSEXCEL_TEMPL + = u"application/x-msexcel-template"_ustr; +inline constexpr OUString CONTENT_TYPE_STR_APP_MSEXCEL = u"application/x-msexcel"_ustr; +inline constexpr OUString CONTENT_TYPE_STR_APP_MSPPOINT_TEMPL + = u"application/x-mspowerpoint-template"_ustr; +inline constexpr OUString CONTENT_TYPE_STR_APP_MSPPOINT = u"application/x-mspowerpoint"_ustr; +inline constexpr OUString CONTENT_TYPE_STR_APP_MSWORD_TEMPL = u"application/x-msword-template"_ustr; +inline constexpr OUString CONTENT_TYPE_STR_APP_MSWORD = u"application/x-msword"_ustr; +inline constexpr OUString CONTENT_TYPE_STR_APP_STARCALC = u"application/x-starcalc"_ustr; +inline constexpr OUString CONTENT_TYPE_STR_APP_STARCHART = u"application/x-starchart;"_ustr; +inline constexpr OUString CONTENT_TYPE_STR_APP_STARDRAW = u"application/x-stardraw"_ustr; +inline constexpr OUString CONTENT_TYPE_STR_APP_STARHELP = u"application/x-starhelp"_ustr; +inline constexpr OUString CONTENT_TYPE_STR_APP_STARIMAGE = u"application/x-starimage"_ustr; +inline constexpr OUString CONTENT_TYPE_STR_APP_STARIMPRESS = u"application/x-starimpress"_ustr; +inline constexpr OUString CONTENT_TYPE_STR_APP_STARMAIL_SDM = u"application/x-starmail-sdm"_ustr; +inline constexpr OUString CONTENT_TYPE_STR_APP_STARMAIL_SMD = u"application/x-starmail-smd"_ustr; +inline constexpr OUString CONTENT_TYPE_STR_APP_STARMATH = u"application/x-starmath"_ustr; +inline constexpr OUString CONTENT_TYPE_STR_APP_STARWRITER_GLOB + = u"application/x-starwriter-global"_ustr; +inline constexpr OUString CONTENT_TYPE_STR_APP_STARWRITER = u"application/x-starwriter"_ustr; +inline constexpr OUString CONTENT_TYPE_STR_APP_CDE_CALENDAR_APP = u"application/x-sun-ae-file"_ustr; +inline constexpr OUString CONTENT_TYPE_STR_APP_ZIP = u"application/x-zip-compressed"_ustr; +inline constexpr OUString CONTENT_TYPE_STR_AUDIO_AIFF = u"audio/aiff"_ustr; +inline constexpr OUString CONTENT_TYPE_STR_AUDIO_BASIC = u"audio/basic"_ustr; +inline constexpr OUString CONTENT_TYPE_STR_AUDIO_MIDI = u"audio/midi"_ustr; +inline constexpr OUString CONTENT_TYPE_STR_AUDIO_VORBIS = u"audio/vorbis"_ustr; +inline constexpr OUString CONTENT_TYPE_STR_AUDIO_WAV = u"audio/wav"_ustr; +inline constexpr OUString CONTENT_TYPE_STR_AUDIO_WEBM = u"audio/webm"_ustr; +inline constexpr OUString CONTENT_TYPE_STR_X_CNT_FSYSBOX = u".chaos/fsys-box"_ustr; +inline constexpr OUString CONTENT_TYPE_STR_X_CNT_FSYSFOLDER = u".chaos/fsys-folder"_ustr; +inline constexpr OUString CONTENT_TYPE_STR_X_CNT_FSYSSPECIALFOLDER + = u".chaos/fsys-special-folder"_ustr; +inline constexpr OUString CONTENT_TYPE_STR_IMAGE_GENERIC = u"image/generic"_ustr; +inline constexpr OUString CONTENT_TYPE_STR_IMAGE_GIF = u"image/gif"_ustr; +inline constexpr OUString CONTENT_TYPE_STR_IMAGE_JPEG = u"image/jpeg"_ustr; +inline constexpr OUString CONTENT_TYPE_STR_IMAGE_PCX = u"image/pcx"_ustr; +inline constexpr OUString CONTENT_TYPE_STR_IMAGE_PNG = u"image/png"_ustr; +inline constexpr OUString CONTENT_TYPE_STR_IMAGE_TIFF = u"image/tiff"_ustr; +inline constexpr OUString CONTENT_TYPE_STR_IMAGE_BMP = u"image/x-MS-bmp"_ustr; +inline constexpr OUString CONTENT_TYPE_STR_INET_MSG_RFC822 = u"message/rfc822"_ustr; +inline constexpr OUString CONTENT_TYPE_STR_INET_MULTI_ALTERNATIVE = u"multipart/alternative"_ustr; +inline constexpr OUString CONTENT_TYPE_STR_INET_MULTI_DIGEST = u"multipart/digest"_ustr; +inline constexpr OUString CONTENT_TYPE_STR_INET_MULTI_MIXED = u"multipart/mixed"_ustr; +inline constexpr OUString CONTENT_TYPE_STR_INET_MULTI_PARALLEL = u"multipart/parallel"_ustr; +inline constexpr OUString CONTENT_TYPE_STR_INET_MULTI_RELATED = u"multipart/related"_ustr; +inline constexpr OUString CONTENT_TYPE_STR_TEXT_ICALENDAR = u"text/calendar"_ustr; +inline constexpr OUString CONTENT_TYPE_STR_TEXT_HTML = u"text/html"_ustr; +inline constexpr OUString CONTENT_TYPE_STR_TEXT_PLAIN = u"text/plain"_ustr; +inline constexpr OUString CONTENT_TYPE_STR_TEXT_XMLICALENDAR = u"text/x-icalxml"_ustr; +inline constexpr OUString CONTENT_TYPE_STR_TEXT_URL = u"text/x-url"_ustr; +inline constexpr OUString CONTENT_TYPE_STR_TEXT_VCALENDAR = u"text/x-vCalendar"_ustr; +inline constexpr OUString CONTENT_TYPE_STR_TEXT_VCARD = u"text/x-vCard"_ustr; +inline constexpr OUString CONTENT_TYPE_STR_VIDEO_MSVIDEO = u"video/x-msvideo"_ustr; +inline constexpr OUString CONTENT_TYPE_STR_VIDEO_THEORA = u"video/theora"_ustr; +inline constexpr OUString CONTENT_TYPE_STR_VIDEO_VDO = u"video/vdo"_ustr; +inline constexpr OUString CONTENT_TYPE_STR_VIDEO_WEBM = u"audio/webm"_ustr; +inline constexpr OUString CONTENT_TYPE_STR_X_STARMAIL = u"x-starmail"_ustr; +inline constexpr OUString CONTENT_TYPE_STR_X_VRML = u"x-world/x-vrml"_ustr; +inline constexpr OUString CONTENT_TYPE_STR_APP_VND_SUN_XML_WRITER + = u"application/vnd.sun.xml.writer"_ustr; +inline constexpr OUString CONTENT_TYPE_STR_APP_VND_SUN_XML_CALC + = u"application/vnd.sun.xml.calc"_ustr; +inline constexpr OUString CONTENT_TYPE_STR_APP_VND_SUN_XML_IMPRESS + = u"application/vnd.sun.xml.impress"_ustr; +inline constexpr OUString CONTENT_TYPE_STR_APP_VND_SUN_XML_DRAW + = u"application/vnd.sun.xml.draw"_ustr; +inline constexpr OUString CONTENT_TYPE_STR_APP_VND_SUN_XML_CHART + = u"application/vnd.sun.xml.chart"_ustr; +inline constexpr OUString CONTENT_TYPE_STR_APP_VND_SUN_XML_MATH + = u"application/vnd.sun.xml.math"_ustr; +inline constexpr OUString CONTENT_TYPE_STR_APP_VND_SUN_XML_WRITER_GLOBAL + = u"application/vnd.sun.xml.writer-global"_ustr; +inline constexpr OUString CONTENT_TYPE_STR_APP_VND_SUN_XML_IMPRESSPACKED + = u"application/vnd.sun.xml.impress-packed"_ustr; /** Definitions for matching parts of URIs. */ diff --git a/include/svl/macitem.hxx b/include/svl/macitem.hxx index e58871101adc..1c2a4cf301b7 100644 --- a/include/svl/macitem.hxx +++ b/include/svl/macitem.hxx @@ -30,9 +30,9 @@ class SvStream; enum class SvMacroItemId : sal_uInt16; -inline constexpr OUStringLiteral SVX_MACRO_LANGUAGE_JAVASCRIPT = u"JavaScript"; -inline constexpr OUStringLiteral SVX_MACRO_LANGUAGE_STARBASIC = u"StarBasic"; -inline constexpr OUStringLiteral SVX_MACRO_LANGUAGE_SF = u"Script"; +inline constexpr OUString SVX_MACRO_LANGUAGE_JAVASCRIPT = u"JavaScript"_ustr; +inline constexpr OUString SVX_MACRO_LANGUAGE_STARBASIC = u"StarBasic"_ustr; +inline constexpr OUString SVX_MACRO_LANGUAGE_SF = u"Script"_ustr; enum ScriptType { diff --git a/include/svtools/genericunodialog.hxx b/include/svtools/genericunodialog.hxx index 467a52382363..d21d76291d8d 100644 --- a/include/svtools/genericunodialog.hxx +++ b/include/svtools/genericunodialog.hxx @@ -44,8 +44,8 @@ namespace svt #define UNODIALOG_PROPERTY_ID_TITLE 1 #define UNODIALOG_PROPERTY_ID_PARENT 2 -inline constexpr OUStringLiteral UNODIALOG_PROPERTY_TITLE = u"Title"; -inline constexpr OUStringLiteral UNODIALOG_PROPERTY_PARENT = u"ParentWindow"; +inline constexpr OUString UNODIALOG_PROPERTY_TITLE = u"Title"_ustr; +inline constexpr OUString UNODIALOG_PROPERTY_PARENT = u"ParentWindow"_ustr; typedef cppu::WeakImplHelper< css::ui::dialogs::XExecutableDialog, css::lang::XServiceInfo, diff --git a/include/svtools/helpids.h b/include/svtools/helpids.h index 3a8bd633865e..12870129c192 100644 --- a/include/svtools/helpids.h +++ b/include/svtools/helpids.h @@ -21,29 +21,29 @@ #include <rtl/ustring.hxx> -inline constexpr OUStringLiteral HID_FILEDLG_LINK_CB = u"SVT_HID_FILEDLG_LINK_CB"; -inline constexpr OUStringLiteral HID_FILEDLG_PREVIEW_CB = u"SVT_HID_FILEDLG_PREVIEW_CB"; -inline constexpr OUStringLiteral HID_FILEDLG_STANDARD = u"SVT_HID_FILEDLG_STANDARD"; +inline constexpr OUString HID_FILEDLG_LINK_CB = u"SVT_HID_FILEDLG_LINK_CB"_ustr; +inline constexpr OUString HID_FILEDLG_PREVIEW_CB = u"SVT_HID_FILEDLG_PREVIEW_CB"_ustr; +inline constexpr OUString HID_FILEDLG_STANDARD = u"SVT_HID_FILEDLG_STANDARD"_ustr; // help ids for the different modi of the file picker dialog -inline constexpr OUStringLiteral HID_FILESAVE_LEVELUP = u"SVT_HID_FILESAVE_LEVELUP"; -inline constexpr OUStringLiteral HID_FILESAVE_CREATEDIRECTORY = u"SVT_HID_FILESAVE_CREATEDIRECTORY"; -inline constexpr OUStringLiteral HID_FILESAVE_FILEVIEW = u"SVT_HID_FILESAVE_FILEVIEW"; -inline constexpr OUStringLiteral HID_FILESAVE_TEMPLATE = u"SVT_HID_FILESAVE_TEMPLATE"; -inline constexpr OUStringLiteral HID_FILESAVE_FILEURL = u"SVT_HID_FILESAVE_FILEURL"; -inline constexpr OUStringLiteral HID_FILESAVE_FILETYPE = u"SVT_HID_FILESAVE_FILETYPE"; -inline constexpr OUStringLiteral HID_FILESAVE_DOSAVE = u"SVT_HID_FILESAVE_DOSAVE"; -inline constexpr OUStringLiteral HID_FILESAVE_AUTOEXTENSION = u"SVT_HID_FILESAVE_AUTOEXTENSION"; -inline constexpr OUStringLiteral HID_FILESAVE_SAVEWITHPASSWORD = u"SVT_HID_FILESAVE_SAVEWITHPASSWORD"; -inline constexpr OUStringLiteral HID_FILESAVE_CUSTOMIZEFILTER = u"SVT_HID_FILESAVE_CUSTOMIZEFILTER"; -inline constexpr OUStringLiteral HID_FILESAVE_SELECTION = u"SVT_HID_FILESAVE_SELECTION"; -inline constexpr OUStringLiteral HID_FILESAVE_DIALOG = u"SVT_HID_FILESAVE_DIALOG"; -inline constexpr OUStringLiteral HID_FILESAVE_DOPLAY = u"SVT_HID_FILESAVE_DOPLAY"; +inline constexpr OUString HID_FILESAVE_LEVELUP = u"SVT_HID_FILESAVE_LEVELUP"_ustr; +inline constexpr OUString HID_FILESAVE_CREATEDIRECTORY = u"SVT_HID_FILESAVE_CREATEDIRECTORY"_ustr; +inline constexpr OUString HID_FILESAVE_FILEVIEW = u"SVT_HID_FILESAVE_FILEVIEW"_ustr; +inline constexpr OUString HID_FILESAVE_TEMPLATE = u"SVT_HID_FILESAVE_TEMPLATE"_ustr; +inline constexpr OUString HID_FILESAVE_FILEURL = u"SVT_HID_FILESAVE_FILEURL"_ustr; +inline constexpr OUString HID_FILESAVE_FILETYPE = u"SVT_HID_FILESAVE_FILETYPE"_ustr; +inline constexpr OUString HID_FILESAVE_DOSAVE = u"SVT_HID_FILESAVE_DOSAVE"_ustr; +inline constexpr OUString HID_FILESAVE_AUTOEXTENSION = u"SVT_HID_FILESAVE_AUTOEXTENSION"_ustr; +inline constexpr OUString HID_FILESAVE_SAVEWITHPASSWORD = u"SVT_HID_FILESAVE_SAVEWITHPASSWORD"_ustr; +inline constexpr OUString HID_FILESAVE_CUSTOMIZEFILTER = u"SVT_HID_FILESAVE_CUSTOMIZEFILTER"_ustr; +inline constexpr OUString HID_FILESAVE_SELECTION = u"SVT_HID_FILESAVE_SELECTION"_ustr; +inline constexpr OUString HID_FILESAVE_DIALOG = u"SVT_HID_FILESAVE_DIALOG"_ustr; +inline constexpr OUString HID_FILESAVE_DOPLAY = u"SVT_HID_FILESAVE_DOPLAY"_ustr; -inline constexpr OUStringLiteral HID_FILEOPEN_LEVELUP = u"SVT_HID_FILEOPEN_LEVELUP"; -inline constexpr OUStringLiteral HID_FILEOPEN_READONLY = u"SVT_HID_FILEOPEN_READONLY"; -inline constexpr OUStringLiteral HID_FILEOPEN_VERSION = u"SVT_HID_FILEOPEN_VERSION"; -inline constexpr OUStringLiteral HID_FILEOPEN_IMAGE_TEMPLATE = u"SVT_HID_FILEOPEN_IMAGE_TEMPLATE"; -inline constexpr OUStringLiteral HID_FILEOPEN_IMAGE_ANCHOR = u"SVT_HID_FILEOPEN_IMAGE_ANCHOR"; +inline constexpr OUString HID_FILEOPEN_LEVELUP = u"SVT_HID_FILEOPEN_LEVELUP"_ustr; +inline constexpr OUString HID_FILEOPEN_READONLY = u"SVT_HID_FILEOPEN_READONLY"_ustr; +inline constexpr OUString HID_FILEOPEN_VERSION = u"SVT_HID_FILEOPEN_VERSION"_ustr; +inline constexpr OUString HID_FILEOPEN_IMAGE_TEMPLATE = u"SVT_HID_FILEOPEN_IMAGE_TEMPLATE"_ustr; +inline constexpr OUString HID_FILEOPEN_IMAGE_ANCHOR = u"SVT_HID_FILEOPEN_IMAGE_ANCHOR"_ustr; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/javainteractionhandler.hxx b/include/svtools/javainteractionhandler.hxx index 1abeb73a1097..8cd220cc4a0f 100644 --- a/include/svtools/javainteractionhandler.hxx +++ b/include/svtools/javainteractionhandler.hxx @@ -26,7 +26,7 @@ namespace com :: sun :: star :: task { class XInteractionRequest; } -inline constexpr OUStringLiteral JAVA_INTERACTION_HANDLER_NAME = u"java-vm.interaction-handler"; +inline constexpr OUString JAVA_INTERACTION_HANDLER_NAME = u"java-vm.interaction-handler"_ustr; namespace svt { diff --git a/include/svx/galleryitem.hxx b/include/svx/galleryitem.hxx index de16c6f24214..cf786ab2d95a 100644 --- a/include/svx/galleryitem.hxx +++ b/include/svx/galleryitem.hxx @@ -29,13 +29,13 @@ namespace com::sun::star::lang { class XComponent; } // property names map those from css::gallery::GalleryItem // with exception of "AsLink" and "FilterName" -inline constexpr OUStringLiteral SVXGALLERYITEM_TYPE = u"GalleryItemType"; -inline constexpr OUStringLiteral SVXGALLERYITEM_URL = u"URL"; -inline constexpr OUStringLiteral SVXGALLERYITEM_FILTER = u"FilterName"; -inline constexpr OUStringLiteral SVXGALLERYITEM_DRAWING = u"Drawing"; -inline constexpr OUStringLiteral SVXGALLERYITEM_GRAPHIC = u"Graphic"; +inline constexpr OUString SVXGALLERYITEM_TYPE = u"GalleryItemType"_ustr; +inline constexpr OUString SVXGALLERYITEM_URL = u"URL"_ustr; +inline constexpr OUString SVXGALLERYITEM_FILTER = u"FilterName"_ustr; +inline constexpr OUString SVXGALLERYITEM_DRAWING = u"Drawing"_ustr; +inline constexpr OUString SVXGALLERYITEM_GRAPHIC = u"Graphic"_ustr; #define SVXGALLERYITEM_PARAMS 5 -inline constexpr OUStringLiteral SVXGALLERYITEM_ARGNAME = u"GalleryItem"; +inline constexpr OUString SVXGALLERYITEM_ARGNAME = u"GalleryItem"_ustr; class SVXCORE_DLLPUBLIC SvxGalleryItem final : public SfxPoolItem { diff --git a/include/tools/urlobj.hxx b/include/tools/urlobj.hxx index 9d6820ddf241..1045e66b717d 100644 --- a/include/tools/urlobj.hxx +++ b/include/tools/urlobj.hxx @@ -37,12 +37,12 @@ namespace com::sun::star::util { namespace com::sun::star::uno { template <typename > class Reference; } // Common URL prefixes for various schemes: -inline constexpr OUStringLiteral INET_FTP_SCHEME = u"ftp://"; -inline constexpr OUStringLiteral INET_HTTP_SCHEME = u"http://"; -inline constexpr OUStringLiteral INET_HTTPS_SCHEME = u"https://"; -inline constexpr OUStringLiteral INET_FILE_SCHEME = u"file://"; -inline constexpr OUStringLiteral INET_MAILTO_SCHEME = u"mailto:"; -inline constexpr OUStringLiteral INET_HID_SCHEME = u"hid:"; +inline constexpr OUString INET_FTP_SCHEME = u"ftp://"_ustr; +inline constexpr OUString INET_HTTP_SCHEME = u"http://"_ustr; +inline constexpr OUString INET_HTTPS_SCHEME = u"https://"_ustr; +inline constexpr OUString INET_FILE_SCHEME = u"file://"_ustr; +inline constexpr OUString INET_MAILTO_SCHEME = u"mailto:"_ustr; +inline constexpr OUString INET_HID_SCHEME = u"hid:"_ustr; #define URL_PREFIX_PRIV_SOFFICE "private:" diff --git a/include/ucbhelper/resultset.hxx b/include/ucbhelper/resultset.hxx index 6790c3dd1c59..779b5ab1df32 100644 --- a/include/ucbhelper/resultset.hxx +++ b/include/ucbhelper/resultset.hxx @@ -41,7 +41,7 @@ namespace com::sun::star::ucb { class XCommandEnvironment; } namespace ucbhelper { -inline constexpr OUStringLiteral RESULTSET_SERVICE_NAME = u"com.sun.star.ucb.ContentResultSet"; +inline constexpr OUString RESULTSET_SERVICE_NAME = u"com.sun.star.ucb.ContentResultSet"_ustr; class ResultSetDataSupplier; diff --git a/include/ucbhelper/resultsethelper.hxx b/include/ucbhelper/resultsethelper.hxx index 31f96790581a..9a0da6a5c1f9 100644 --- a/include/ucbhelper/resultsethelper.hxx +++ b/include/ucbhelper/resultsethelper.hxx @@ -38,7 +38,7 @@ namespace cppu { namespace ucbhelper { -inline constexpr OUStringLiteral DYNAMICRESULTSET_SERVICE_NAME = u"com.sun.star.ucb.DynamicResultSet"; +inline constexpr OUString DYNAMICRESULTSET_SERVICE_NAME = u"com.sun.star.ucb.DynamicResultSet"_ustr; /** diff --git a/include/unotools/compatibility.hxx b/include/unotools/compatibility.hxx index ed7b0f9d52f3..620d3c1c3fa4 100644 --- a/include/unotools/compatibility.hxx +++ b/include/unotools/compatibility.hxx @@ -75,8 +75,8 @@ class SvtCompatibilityEntry static OUString getName( const Index rIdx ); - static constexpr OUStringLiteral USER_ENTRY_NAME = u"_user"; - static constexpr OUStringLiteral DEFAULT_ENTRY_NAME = u"_default"; + static constexpr OUString USER_ENTRY_NAME = u"_user"_ustr; + static constexpr OUString DEFAULT_ENTRY_NAME = u"_default"_ustr; static size_t getElementCount() { diff --git a/include/unotools/linguprops.hxx b/include/unotools/linguprops.hxx index 7f55a9e74042..b14376f5c43f 100644 --- a/include/unotools/linguprops.hxx +++ b/include/unotools/linguprops.hxx @@ -26,53 +26,53 @@ #endif // UNO property names for general options -inline constexpr OUStringLiteral UPN_IS_GERMAN_PRE_REFORM = u"IsGermanPreReform"; /*! deprecated #i91949 !*/ -inline constexpr OUStringLiteral UPN_IS_USE_DICTIONARY_LIST = u"IsUseDictionaryList"; -inline constexpr OUStringLiteral UPN_IS_IGNORE_CONTROL_CHARACTERS = u"IsIgnoreControlCharacters"; -inline constexpr OUStringLiteral UPN_ACTIVE_DICTIONARIES = u"ActiveDictionaries"; +inline constexpr OUString UPN_IS_GERMAN_PRE_REFORM = u"IsGermanPreReform"_ustr; /*! deprecated #i91949 !*/ +inline constexpr OUString UPN_IS_USE_DICTIONARY_LIST = u"IsUseDictionaryList"_ustr; +inline constexpr OUString UPN_IS_IGNORE_CONTROL_CHARACTERS = u"IsIgnoreControlCharacters"_ustr; +inline constexpr OUString UPN_ACTIVE_DICTIONARIES = u"ActiveDictionaries"_ustr; // UNO property names for SpellChecker -inline constexpr OUStringLiteral UPN_IS_SPELL_UPPER_CASE = u"IsSpellUpperCase"; -inline constexpr OUStringLiteral UPN_IS_SPELL_WITH_DIGITS = u"IsSpellWithDigits"; -inline constexpr OUStringLiteral UPN_IS_SPELL_CAPITALIZATION = u"IsSpellCapitalization"; +inline constexpr OUString UPN_IS_SPELL_UPPER_CASE = u"IsSpellUpperCase"_ustr; +inline constexpr OUString UPN_IS_SPELL_WITH_DIGITS = u"IsSpellWithDigits"_ustr; +inline constexpr OUString UPN_IS_SPELL_CAPITALIZATION = u"IsSpellCapitalization"_ustr; // UNO property names for Hyphenator -inline constexpr OUStringLiteral UPN_HYPH_MIN_LEADING = u"HyphMinLeading"; -inline constexpr OUStringLiteral UPN_HYPH_MIN_TRAILING = u"HyphMinTrailing"; -inline constexpr OUStringLiteral UPN_HYPH_MIN_WORD_LENGTH = u"HyphMinWordLength"; -inline constexpr OUStringLiteral UPN_HYPH_NO_CAPS = u"HyphNoCaps"; -inline constexpr OUStringLiteral UPN_HYPH_NO_LAST_WORD = u"HyphNoLastWord"; -inline constexpr OUStringLiteral UPN_HYPH_ZONE = u"HyphZone"; +inline constexpr OUString UPN_HYPH_MIN_LEADING = u"HyphMinLeading"_ustr; +inline constexpr OUString UPN_HYPH_MIN_TRAILING = u"HyphMinTrailing"_ustr; +inline constexpr OUString UPN_HYPH_MIN_WORD_LENGTH = u"HyphMinWordLength"_ustr; +inline constexpr OUString UPN_HYPH_NO_CAPS = u"HyphNoCaps"_ustr; +inline constexpr OUString UPN_HYPH_NO_LAST_WORD = u"HyphNoLastWord"_ustr; +inline constexpr OUString UPN_HYPH_ZONE = u"HyphZone"_ustr; // UNO property names for Lingu // (those not covered by the SpellChecker and Hyphenator // properties and more likely to be used in other modules only) -inline constexpr OUStringLiteral UPN_DEFAULT_LANGUAGE = u"DefaultLanguage"; -inline constexpr OUStringLiteral UPN_DEFAULT_LOCALE = u"DefaultLocale"; -inline constexpr OUStringLiteral UPN_DEFAULT_LOCALE_CJK = u"DefaultLocale_CJK"; -inline constexpr OUStringLiteral UPN_DEFAULT_LOCALE_CTL = u"DefaultLocale_CTL"; -inline constexpr OUStringLiteral UPN_IS_HYPH_AUTO = u"IsHyphAuto"; -inline constexpr OUStringLiteral UPN_IS_HYPH_SPECIAL = u"IsHyphSpecial"; -inline constexpr OUStringLiteral UPN_IS_SPELL_AUTO = u"IsSpellAuto"; -inline constexpr OUStringLiteral UPN_IS_SPELL_CLOSED_COMPOUND = u"IsSpellClosedCompound"; -inline constexpr OUStringLiteral UPN_IS_SPELL_HYPHENATED_COMPOUND = u"IsSpellHyphenatedCompound"; -inline constexpr OUStringLiteral UPN_IS_SPELL_SPECIAL = u"IsSpellSpecial"; -inline constexpr OUStringLiteral UPN_IS_WRAP_REVERSE = u"IsWrapReverse"; -inline constexpr OUStringLiteral UPN_DATA_FILES_CHANGED_CHECK_VALUE = u"DataFilesChangedCheckValue"; +inline constexpr OUString UPN_DEFAULT_LANGUAGE = u"DefaultLanguage"_ustr; +inline constexpr OUString UPN_DEFAULT_LOCALE = u"DefaultLocale"_ustr; +inline constexpr OUString UPN_DEFAULT_LOCALE_CJK = u"DefaultLocale_CJK"_ustr; +inline constexpr OUString UPN_DEFAULT_LOCALE_CTL = u"DefaultLocale_CTL"_ustr; +inline constexpr OUString UPN_IS_HYPH_AUTO = u"IsHyphAuto"_ustr; +inline constexpr OUString UPN_IS_HYPH_SPECIAL = u"IsHyphSpecial"_ustr; +inline constexpr OUString UPN_IS_SPELL_AUTO = u"IsSpellAuto"_ustr; +inline constexpr OUString UPN_IS_SPELL_CLOSED_COMPOUND = u"IsSpellClosedCompound"_ustr; +inline constexpr OUString UPN_IS_SPELL_HYPHENATED_COMPOUND = u"IsSpellHyphenatedCompound"_ustr; +inline constexpr OUString UPN_IS_SPELL_SPECIAL = u"IsSpellSpecial"_ustr; +inline constexpr OUString UPN_IS_WRAP_REVERSE = u"IsWrapReverse"_ustr; +inline constexpr OUString UPN_DATA_FILES_CHANGED_CHECK_VALUE = u"DataFilesChangedCheckValue"_ustr; // UNO property names for text conversion options -inline constexpr OUStringLiteral UPN_ACTIVE_CONVERSION_DICTIONARIES = u"ActiveConversionDictionaries"; -inline constexpr OUStringLiteral UPN_IS_IGNORE_POST_POSITIONAL_WORD = u"IsIgnorePostPositionalWord"; -inline constexpr OUStringLiteral UPN_IS_AUTO_CLOSE_DIALOG = u"IsAutoCloseDialog"; -inline constexpr OUStringLiteral UPN_IS_SHOW_ENTRIES_RECENTLY_USED_FIRST = u"IsShowEntriesRecentlyUsedFirst"; -inline constexpr OUStringLiteral UPN_IS_AUTO_REPLACE_UNIQUE_ENTRIES = u"IsAutoReplaceUniqueEntries"; -inline constexpr OUStringLiteral UPN_IS_DIRECTION_TO_SIMPLIFIED = u"IsDirectionToSimplified"; -inline constexpr OUStringLiteral UPN_IS_USE_CHARACTER_VARIANTS = u"IsUseCharacterVariants"; -inline constexpr OUStringLiteral UPN_IS_TRANSLATE_COMMON_TERMS = u"IsTranslateCommonTerms"; -inline constexpr OUStringLiteral UPN_IS_REVERSE_MAPPING = u"IsReverseMapping"; +inline constexpr OUString UPN_ACTIVE_CONVERSION_DICTIONARIES = u"ActiveConversionDictionaries"_ustr; +inline constexpr OUString UPN_IS_IGNORE_POST_POSITIONAL_WORD = u"IsIgnorePostPositionalWord"_ustr; +inline constexpr OUString UPN_IS_AUTO_CLOSE_DIALOG = u"IsAutoCloseDialog"_ustr; +inline constexpr OUString UPN_IS_SHOW_ENTRIES_RECENTLY_USED_FIRST = u"IsShowEntriesRecentlyUsedFirst"_ustr; +inline constexpr OUString UPN_IS_AUTO_REPLACE_UNIQUE_ENTRIES = u"IsAutoReplaceUniqueEntries"_ustr; +inline constexpr OUString UPN_IS_DIRECTION_TO_SIMPLIFIED = u"IsDirectionToSimplified"_ustr; +inline constexpr OUString UPN_IS_USE_CHARACTER_VARIANTS = u"IsUseCharacterVariants"_ustr; +inline constexpr OUString UPN_IS_TRANSLATE_COMMON_TERMS = u"IsTranslateCommonTerms"_ustr; +inline constexpr OUString UPN_IS_REVERSE_MAPPING = u"IsReverseMapping"_ustr; -inline constexpr OUStringLiteral UPN_IS_GRAMMAR_AUTO = u"IsAutoGrammarCheck"; -inline constexpr OUStringLiteral UPN_IS_GRAMMAR_INTERACTIVE = u"IsInteractiveGrammarCheck"; +inline constexpr OUString UPN_IS_GRAMMAR_AUTO = u"IsAutoGrammarCheck"_ustr; +inline constexpr OUString UPN_IS_GRAMMAR_INTERACTIVE = u"IsInteractiveGrammarCheck"_ustr; // uno property handles #define UPH_IS_GERMAN_PRE_REFORM 0 diff --git a/include/unotools/mediadescriptor.hxx b/include/unotools/mediadescriptor.hxx index 8b4f9365acf9..67ae2704246e 100644 --- a/include/unotools/mediadescriptor.hxx +++ b/include/unotools/mediadescriptor.hxx @@ -57,52 +57,52 @@ class UNOTOOLS_DLLPUBLIC MediaDescriptor : public comphelper::SequenceAsHashMap does not work as expected under windows (under unix it works as well) these way must be used :-( */ - static constexpr OUStringLiteral PROP_ABORTED = u"Aborted"; - static constexpr OUStringLiteral PROP_ASTEMPLATE = u"AsTemplate"; - static constexpr OUStringLiteral PROP_COMPONENTDATA = u"ComponentData"; - static constexpr OUStringLiteral PROP_DOCUMENTSERVICE = u"DocumentService"; - static constexpr OUStringLiteral PROP_ENCRYPTIONDATA = u"EncryptionData"; - static constexpr OUStringLiteral PROP_FILENAME = u"FileName"; - static constexpr OUStringLiteral PROP_FILTERNAME = u"FilterName"; - static constexpr OUStringLiteral PROP_FILTERPROVIDER = u"FilterProvider"; - static constexpr OUStringLiteral PROP_FILTEROPTIONS = u"FilterOptions"; - static constexpr OUStringLiteral PROP_FRAME = u"Frame"; - static constexpr OUStringLiteral PROP_FRAMENAME = u"FrameName"; - static constexpr OUStringLiteral PROP_HIDDEN = u"Hidden"; - static constexpr OUStringLiteral PROP_INPUTSTREAM = u"InputStream"; - static constexpr OUStringLiteral PROP_INTERACTIONHANDLER = u"InteractionHandler"; - static constexpr OUStringLiteral PROP_AUTHENTICATIONHANDLER = u"AuthenticationHandler"; - static constexpr OUStringLiteral PROP_JUMPMARK = u"JumpMark"; - static constexpr OUStringLiteral PROP_MACROEXECUTIONMODE = u"MacroExecutionMode"; - static constexpr OUStringLiteral PROP_MEDIATYPE = u"MediaType"; - static constexpr OUStringLiteral PROP_MINIMIZED = u"Minimized"; - static constexpr OUStringLiteral PROP_NOAUTOSAVE = u"NoAutoSave"; - static constexpr OUStringLiteral PROP_OPENNEWVIEW = u"OpenNewView"; - static constexpr OUStringLiteral PROP_OUTPUTSTREAM = u"OutputStream"; - static constexpr OUStringLiteral PROP_PASSWORD = u"Password"; - static constexpr OUStringLiteral PROP_POSTDATA = u"PostData"; - static constexpr OUStringLiteral PROP_PREVIEW = u"Preview"; - static constexpr OUStringLiteral PROP_READONLY = u"ReadOnly"; - static constexpr OUStringLiteral PROP_REFERRER = u"Referer"; - static constexpr OUStringLiteral PROP_REPLACEABLE = u"Replaceable"; - static constexpr OUStringLiteral PROP_SALVAGEDFILE = u"SalvagedFile"; - static constexpr OUStringLiteral PROP_SILENT = u"Silent"; - static constexpr OUStringLiteral PROP_STATUSINDICATOR = u"StatusIndicator"; - static constexpr OUStringLiteral PROP_STREAM = u"Stream"; - static constexpr OUStringLiteral PROP_STREAMFOROUTPUT = u"StreamForOutput"; - static constexpr OUStringLiteral PROP_TEMPLATENAME = u"TemplateName"; - static constexpr OUStringLiteral PROP_TITLE = u"Title"; - static constexpr OUStringLiteral PROP_TYPENAME = u"TypeName"; - static constexpr OUStringLiteral PROP_UCBCONTENT = u"UCBContent"; - static constexpr OUStringLiteral PROP_UPDATEDOCMODE = u"UpdateDocMode"; - static constexpr OUStringLiteral PROP_URL = u"URL"; - static constexpr OUStringLiteral PROP_VERSION = u"Version"; - static constexpr OUStringLiteral PROP_DOCUMENTTITLE = u"DocumentTitle"; - static constexpr OUStringLiteral PROP_MODEL = u"Model"; - static constexpr OUStringLiteral PROP_VIEWONLY = u"ViewOnly"; - static constexpr OUStringLiteral PROP_DOCUMENTBASEURL = u"DocumentBaseURL"; - static constexpr OUStringLiteral PROP_SUGGESTEDSAVEASNAME = u"SuggestedSaveAsName"; - static constexpr OUStringLiteral PROP_AUTOSAVEEVENT = u"AutoSaveEvent"; + static constexpr OUString PROP_ABORTED = u"Aborted"_ustr; + static constexpr OUString PROP_ASTEMPLATE = u"AsTemplate"_ustr; + static constexpr OUString PROP_COMPONENTDATA = u"ComponentData"_ustr; + static constexpr OUString PROP_DOCUMENTSERVICE = u"DocumentService"_ustr; + static constexpr OUString PROP_ENCRYPTIONDATA = u"EncryptionData"_ustr; + static constexpr OUString PROP_FILENAME = u"FileName"_ustr; + static constexpr OUString PROP_FILTERNAME = u"FilterName"_ustr; + static constexpr OUString PROP_FILTERPROVIDER = u"FilterProvider"_ustr; + static constexpr OUString PROP_FILTEROPTIONS = u"FilterOptions"_ustr; + static constexpr OUString PROP_FRAME = u"Frame"_ustr; + static constexpr OUString PROP_FRAMENAME = u"FrameName"_ustr; + static constexpr OUString PROP_HIDDEN = u"Hidden"_ustr; + static constexpr OUString PROP_INPUTSTREAM = u"InputStream"_ustr; + static constexpr OUString PROP_INTERACTIONHANDLER = u"InteractionHandler"_ustr; + static constexpr OUString PROP_AUTHENTICATIONHANDLER = u"AuthenticationHandler"_ustr; + static constexpr OUString PROP_JUMPMARK = u"JumpMark"_ustr; + static constexpr OUString PROP_MACROEXECUTIONMODE = u"MacroExecutionMode"_ustr; + static constexpr OUString PROP_MEDIATYPE = u"MediaType"_ustr; + static constexpr OUString PROP_MINIMIZED = u"Minimized"_ustr; + static constexpr OUString PROP_NOAUTOSAVE = u"NoAutoSave"_ustr; + static constexpr OUString PROP_OPENNEWVIEW = u"OpenNewView"_ustr; + static constexpr OUString PROP_OUTPUTSTREAM = u"OutputStream"_ustr; + static constexpr OUString PROP_PASSWORD = u"Password"_ustr; + static constexpr OUString PROP_POSTDATA = u"PostData"_ustr; + static constexpr OUString PROP_PREVIEW = u"Preview"_ustr; + static constexpr OUString PROP_READONLY = u"ReadOnly"_ustr; + static constexpr OUString PROP_REFERRER = u"Referer"_ustr; + static constexpr OUString PROP_REPLACEABLE = u"Replaceable"_ustr; + static constexpr OUString PROP_SALVAGEDFILE = u"SalvagedFile"_ustr; + static constexpr OUString PROP_SILENT = u"Silent"_ustr; + static constexpr OUString PROP_STATUSINDICATOR = u"StatusIndicator"_ustr; + static constexpr OUString PROP_STREAM = u"Stream"_ustr; + static constexpr OUString PROP_STREAMFOROUTPUT = u"StreamForOutput"_ustr; + static constexpr OUString PROP_TEMPLATENAME = u"TemplateName"_ustr; + static constexpr OUString PROP_TITLE = u"Title"_ustr; + static constexpr OUString PROP_TYPENAME = u"TypeName"_ustr; + static constexpr OUString PROP_UCBCONTENT = u"UCBContent"_ustr; + static constexpr OUString PROP_UPDATEDOCMODE = u"UpdateDocMode"_ustr; + static constexpr OUString PROP_URL = u"URL"_ustr; + static constexpr OUString PROP_VERSION = u"Version"_ustr; + static constexpr OUString PROP_DOCUMENTTITLE = u"DocumentTitle"_ustr; + static constexpr OUString PROP_MODEL = u"Model"_ustr; + static constexpr OUString PROP_VIEWONLY = u"ViewOnly"_ustr; + static constexpr OUString PROP_DOCUMENTBASEURL = u"DocumentBaseURL"_ustr; + static constexpr OUString PROP_SUGGESTEDSAVEASNAME = u"SuggestedSaveAsName"_ustr; + static constexpr OUString PROP_AUTOSAVEEVENT = u"AutoSaveEvent"_ustr; // interface public: diff --git a/include/vcl/IconThemeInfo.hxx b/include/vcl/IconThemeInfo.hxx index 0ac2b7dc2857..5d1fa4a68b1e 100644 --- a/include/vcl/IconThemeInfo.hxx +++ b/include/vcl/IconThemeInfo.hxx @@ -29,8 +29,8 @@ class VCL_DLLPUBLIC IconThemeInfo { public: /** The name of the icon theme to use for high contrast mode */ - static constexpr OUStringLiteral HIGH_CONTRAST_ID_BRIGHT = u"sifr"; - static constexpr OUStringLiteral HIGH_CONTRAST_ID_DARK = u"sifr_dark"; + static constexpr OUString HIGH_CONTRAST_ID_BRIGHT = u"sifr"_ustr; + static constexpr OUString HIGH_CONTRAST_ID_DARK = u"sifr_dark"_ustr; /** Construct an IconThemeInfo from the URL to a file. * This method will throw a std::runtime_error if the URL cannot be properly parsed. diff --git a/include/vcl/filter/PDFiumLibrary.hxx b/include/vcl/filter/PDFiumLibrary.hxx index 9c278d281a1c..3c087cf7b11c 100644 --- a/include/vcl/filter/PDFiumLibrary.hxx +++ b/include/vcl/filter/PDFiumLibrary.hxx @@ -40,11 +40,11 @@ class SvMemoryStream; namespace vcl::pdf { -inline constexpr OStringLiteral constDictionaryKeyTitle = "T"; -inline constexpr OStringLiteral constDictionaryKeyContents = "Contents"; -inline constexpr OStringLiteral constDictionaryKeyPopup = "Popup"; -inline constexpr OStringLiteral constDictionaryKeyModificationDate = "M"; -inline constexpr OStringLiteral constDictionaryKeyInteriorColor = "IC"; +inline constexpr OString constDictionaryKeyTitle = "T"_ostr; +inline constexpr OString constDictionaryKeyContents = "Contents"_ostr; +inline constexpr OString constDictionaryKeyPopup = "Popup"_ostr; +inline constexpr OString constDictionaryKeyModificationDate = "M"_ostr; +inline constexpr OString constDictionaryKeyInteriorColor = "IC"_ostr; class PDFiumBitmap; class PDFiumDocument; diff --git a/include/vcl/graphicfilter.hxx b/include/vcl/graphicfilter.hxx index e25e0cdde566..fd6c205bd491 100644 --- a/include/vcl/graphicfilter.hxx +++ b/include/vcl/graphicfilter.hxx @@ -113,19 +113,19 @@ namespace o3tl #define EXP_WEBP "SVEWEBP" -inline constexpr OUStringLiteral BMP_SHORTNAME = u"BMP"; -inline constexpr OUStringLiteral GIF_SHORTNAME = u"GIF"; -inline constexpr OUStringLiteral JPG_SHORTNAME = u"JPG"; -inline constexpr OUStringLiteral MET_SHORTNAME = u"MET"; -inline constexpr OUStringLiteral PCT_SHORTNAME = u"PCT"; -inline constexpr OUStringLiteral PNG_SHORTNAME = u"PNG"; -inline constexpr OUStringLiteral SVM_SHORTNAME = u"SVM"; -inline constexpr OUStringLiteral TIF_SHORTNAME = u"TIF"; -inline constexpr OUStringLiteral WMF_SHORTNAME = u"WMF"; -inline constexpr OUStringLiteral EMF_SHORTNAME = u"EMF"; -inline constexpr OUStringLiteral SVG_SHORTNAME = u"SVG"; -inline constexpr OUStringLiteral PDF_SHORTNAME = u"PDF"; -inline constexpr OUStringLiteral WEBP_SHORTNAME = u"WEBP"; +inline constexpr OUString BMP_SHORTNAME = u"BMP"_ustr; +inline constexpr OUString GIF_SHORTNAME = u"GIF"_ustr; +inline constexpr OUString JPG_SHORTNAME = u"JPG"_ustr; +inline constexpr OUString MET_SHORTNAME = u"MET"_ustr; +inline constexpr OUString PCT_SHORTNAME = u"PCT"_ustr; +inline constexpr OUString PNG_SHORTNAME = u"PNG"_ustr; +inline constexpr OUString SVM_SHORTNAME = u"SVM"_ustr; +inline constexpr OUString TIF_SHORTNAME = u"TIF"_ustr; +inline constexpr OUString WMF_SHORTNAME = u"WMF"_ustr; +inline constexpr OUString EMF_SHORTNAME = u"EMF"_ustr; +inline constexpr OUString SVG_SHORTNAME = u"SVG"_ustr; +inline constexpr OUString PDF_SHORTNAME = u"PDF"_ustr; +inline constexpr OUString WEBP_SHORTNAME = u"WEBP"_ustr; class VCL_DLLPUBLIC GraphicDescriptor final { 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 { diff --git a/include/xmlscript/xmlns.h b/include/xmlscript/xmlns.h index 1b06d390fb02..2e21b309812b 100644 --- a/include/xmlscript/xmlns.h +++ b/include/xmlscript/xmlns.h @@ -20,19 +20,19 @@ #include <rtl/ustring.hxx> -inline constexpr OUStringLiteral XMLNS_DIALOGS_URI = u"http://openoffice.org/2000/dialog"; +inline constexpr OUString XMLNS_DIALOGS_URI = u"http://openoffice.org/2000/dialog"_ustr; #define XMLNS_DIALOGS_PREFIX "dlg" -inline constexpr OUStringLiteral XMLNS_SCRIPT_URI = u"http://openoffice.org/2000/script"; +inline constexpr OUString XMLNS_SCRIPT_URI = u"http://openoffice.org/2000/script"_ustr; #define XMLNS_SCRIPT_PREFIX "script" -inline constexpr OUStringLiteral XMLNS_OOO_URI = u"http://openoffice.org/2004/office"; -inline constexpr OUStringLiteral XMLNS_OOO_PREFIX = u"ooo"; +inline constexpr OUString XMLNS_OOO_URI = u"http://openoffice.org/2004/office"_ustr; +inline constexpr OUString XMLNS_OOO_PREFIX = u"ooo"_ustr; -inline constexpr OUStringLiteral XMLNS_LIBRARY_URI = u"http://openoffice.org/2000/library"; +inline constexpr OUString XMLNS_LIBRARY_URI = u"http://openoffice.org/2000/library"_ustr; #define XMLNS_LIBRARY_PREFIX "library" -inline constexpr OUStringLiteral XMLNS_XLINK_URI = u"http://www.w3.org/1999/xlink"; +inline constexpr OUString XMLNS_XLINK_URI = u"http://www.w3.org/1999/xlink"_ustr; #define XMLNS_XLINK_PREFIX "xlink" /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |