Change OUStringLiteral from char[] to char16_t[]

This is a prerequisite for making conversion from OUStringLiteral to OUString
more efficient at least for C++20 (by replacing its internals with a constexpr-
generated sal_uString-compatible layout with a SAL_STRING_STATIC_FLAG refCount,
conditionally for C++20 for now).

For a configure-wise bare-bones build on Linux, size reported by `du -bs
instdir` grew by 118792 bytes from 1155636636 to 1155755428.

In most places just a u"..." string literal prefix had to be added.  In some
places

char const a[] = "...";

variables have been changed to char16_t, and a few places required even further
changes to code (which prompted the addition of include/o3tl/string_view.hxx
helper function o3tl::equalsIgnoreAsciiCase and the additional
OUString::createFromAscii overload).

For all uses of macros expanding to string literals, the relevant uses have been
rewritten as

u"" MACRO

instead of changing the macro definitions.  It should be possible to change at
least some of those macro definitions (and drop the u"" from their call sites)
in follow-up commits.

Change-Id: Iec4ef1a057d412d22443312d40c6a8a290dc6144
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101483
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

41 files changed, 369 insertions, 369 deletions

diff --git a/xmloff/source/chart/ColorPropertySet.cxx b/xmloff/source/chart/ColorPropertySet.cxx
index 59ebd9ae6731..ea15d40161dc 100644
--- a/xmloff/source/chart/ColorPropertySet.cxx
+++ b/xmloff/source/chart/ColorPropertySet.cxx
@@ -44,7 +44,7 @@ protected:
     virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) override;
 
 private:
-    static constexpr OUStringLiteral g_aColorPropName = "FillColor";
+    static constexpr OUStringLiteral g_aColorPropName = u"FillColor";
     Property m_aColorProp;
 };
 
diff --git a/xmloff/source/chart/ColorPropertySet.hxx b/xmloff/source/chart/ColorPropertySet.hxx
index c3d3d560e914..a69d326548bd 100644
--- a/xmloff/source/chart/ColorPropertySet.hxx
+++ b/xmloff/source/chart/ColorPropertySet.hxx
@@ -69,7 +69,7 @@ protected:
 
 private:
     css::uno::Reference< css::beans::XPropertySetInfo > m_xInfo;
-    static constexpr OUStringLiteral g_aColorPropName = "FillColor";
+    static constexpr OUStringLiteral g_aColorPropName = u"FillColor";
     Color     m_nColor;
     Color     m_nDefaultColor;
 };
diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx
index 0c10f10a09e2..2d65645d26c5 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -253,7 +253,7 @@ public:
     rtl::Reference< XMLPropertySetMapper > mxPropertySetMapper;
     rtl::Reference< XMLChartExportPropertyMapper > mxExpPropMapper;
 
-    static constexpr OUStringLiteral gsTableName = "local-table";
+    static constexpr OUStringLiteral gsTableName = u"local-table";
     OUStringBuffer msStringBuffer;
     OUString msString;
 
diff --git a/xmloff/source/core/SettingsExportHelper.cxx b/xmloff/source/core/SettingsExportHelper.cxx
index c9a4ef73ba76..853db459e374 100644
--- a/xmloff/source/core/SettingsExportHelper.cxx
+++ b/xmloff/source/core/SettingsExportHelper.cxx
@@ -45,13 +45,13 @@
 using namespace ::com::sun::star;
 using namespace ::xmloff::token;
 
-const OUStringLiteral gsPrinterIndependentLayout( "PrinterIndependentLayout" );
-const OUStringLiteral gsColorTableURL( "ColorTableURL" );
-const OUStringLiteral gsLineEndTableURL( "LineEndTableURL" );
-const OUStringLiteral gsHatchTableURL( "HatchTableURL" );
-const OUStringLiteral gsDashTableURL( "DashTableURL" );
-const OUStringLiteral gsGradientTableURL( "GradientTableURL" );
-const OUStringLiteral gsBitmapTableURL( "BitmapTableURL" );
+const OUStringLiteral gsPrinterIndependentLayout( u"PrinterIndependentLayout" );
+const OUStringLiteral gsColorTableURL( u"ColorTableURL" );
+const OUStringLiteral gsLineEndTableURL( u"LineEndTableURL" );
+const OUStringLiteral gsHatchTableURL( u"HatchTableURL" );
+const OUStringLiteral gsDashTableURL( u"DashTableURL" );
+const OUStringLiteral gsGradientTableURL( u"GradientTableURL" );
+const OUStringLiteral gsBitmapTableURL( u"BitmapTableURL" );
 
 XMLSettingsExportHelper::XMLSettingsExportHelper( ::xmloff::XMLSettingsExportContext& i_rContext )
 : m_rContext( i_rContext )
diff --git a/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx b/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx
index dbd43a3a2ccd..2293e726399d 100644
--- a/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx
+++ b/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx
@@ -170,10 +170,10 @@ XMLEmbeddedObjectImportContext::XMLEmbeddedObjectImportContext(
 
         OUString sClass;
         static OUStringLiteral const prefixes[] = {
-            "application/vnd.oasis.openoffice.",
-            "application/x-vnd.oasis.openoffice.",
-            "application/vnd.oasis.opendocument.",
-            "application/x-vnd.oasis.opendocument."};
+            u"application/vnd.oasis.openoffice.",
+            u"application/x-vnd.oasis.openoffice.",
+            u"application/vnd.oasis.opendocument.",
+            u"application/x-vnd.oasis.opendocument."};
         for (auto const & p: prefixes)
         {
             if (sMime.startsWith(p, &sClass))
@@ -186,13 +186,13 @@ XMLEmbeddedObjectImportContext::XMLEmbeddedObjectImportContext(
         {
             static struct { XMLTokenEnum eClass; OUStringLiteral sFilterService;
             } const aServiceMap[] = {
-                { XML_TEXT,         OUStringLiteral(XML_IMPORT_FILTER_WRITER) },
-                { XML_ONLINE_TEXT,  OUStringLiteral(XML_IMPORT_FILTER_WRITER) },
-                { XML_SPREADSHEET,  OUStringLiteral(XML_IMPORT_FILTER_CALC) },
-                { XML_DRAWING,      OUStringLiteral(XML_IMPORT_FILTER_DRAW) },
-                { XML_GRAPHICS,     OUStringLiteral(XML_IMPORT_FILTER_DRAW) },
-                { XML_PRESENTATION, OUStringLiteral(XML_IMPORT_FILTER_IMPRESS) },
-                { XML_CHART,        OUStringLiteral(XML_IMPORT_FILTER_CHART) }};
+                { XML_TEXT,         OUStringLiteral(u"" XML_IMPORT_FILTER_WRITER) },
+                { XML_ONLINE_TEXT,  OUStringLiteral(u"" XML_IMPORT_FILTER_WRITER) },
+                { XML_SPREADSHEET,  OUStringLiteral(u"" XML_IMPORT_FILTER_CALC) },
+                { XML_DRAWING,      OUStringLiteral(u"" XML_IMPORT_FILTER_DRAW) },
+                { XML_GRAPHICS,     OUStringLiteral(u"" XML_IMPORT_FILTER_DRAW) },
+                { XML_PRESENTATION, OUStringLiteral(u"" XML_IMPORT_FILTER_IMPRESS) },
+                { XML_CHART,        OUStringLiteral(u"" XML_IMPORT_FILTER_CHART) }};
             for (auto const & entry: aServiceMap)
             {
                 if( IsXMLToken( sClass, entry.eClass ) )
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index 4c4d413874b2..8fbc4a9d5d8c 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -85,8 +85,8 @@ using namespace ::xmloff::token;
 rtl::Reference< FastTokenHandler > SvXMLImport::xTokenHandler( new FastTokenHandler() );
 std::unordered_map< sal_Int32, std::pair< OUString, OUString > > SvXMLImport::aNamespaceMap;
 std::unordered_map< OUString, OUString > SvXMLImport::aNamespaceURIPrefixMap;
-const OUStringLiteral SvXMLImport::aDefaultNamespace = "";
-const OUStringLiteral SvXMLImport::aNamespaceSeparator = ":";
+const OUStringLiteral SvXMLImport::aDefaultNamespace = u"";
+const OUStringLiteral SvXMLImport::aNamespaceSeparator = u":";
 bool SvXMLImport::bIsNSMapsInitialized = false;
 
 namespace {
diff --git a/xmloff/source/draw/XMLImageMapContext.cxx b/xmloff/source/draw/XMLImageMapContext.cxx
index c1504079eca4..d822f363400e 100644
--- a/xmloff/source/draw/XMLImageMapContext.cxx
+++ b/xmloff/source/draw/XMLImageMapContext.cxx
@@ -554,7 +554,7 @@ void XMLImageMapCircleContext::Prepare(
 }
 
 
-const OUStringLiteral gsImageMap("ImageMap");
+const OUStringLiteral gsImageMap(u"ImageMap");
 
 XMLImageMapContext::XMLImageMapContext(
     SvXMLImport& rImport,
diff --git a/xmloff/source/draw/XMLImageMapExport.cxx b/xmloff/source/draw/XMLImageMapExport.cxx
index 709214a7664a..25117838ac88 100644
--- a/xmloff/source/draw/XMLImageMapExport.cxx
+++ b/xmloff/source/draw/XMLImageMapExport.cxx
@@ -53,17 +53,17 @@ using ::com::sun::star::document::XEventsSupplier;
 using ::com::sun::star::lang::XServiceInfo;
 using ::com::sun::star::drawing::PointSequence;
 
-const OUStringLiteral gsBoundary("Boundary");
-const OUStringLiteral gsCenter("Center");
-const OUStringLiteral gsDescription("Description");
-const OUStringLiteral gsImageMap("ImageMap");
-const OUStringLiteral gsIsActive("IsActive");
-const OUStringLiteral gsName("Name");
-const OUStringLiteral gsPolygon("Polygon");
-const OUStringLiteral gsRadius("Radius");
-const OUStringLiteral gsTarget("Target");
-const OUStringLiteral gsURL("URL");
-const OUStringLiteral gsTitle("Title");
+const OUStringLiteral gsBoundary(u"Boundary");
+const OUStringLiteral gsCenter(u"Center");
+const OUStringLiteral gsDescription(u"Description");
+const OUStringLiteral gsImageMap(u"ImageMap");
+const OUStringLiteral gsIsActive(u"IsActive");
+const OUStringLiteral gsName(u"Name");
+const OUStringLiteral gsPolygon(u"Polygon");
+const OUStringLiteral gsRadius(u"Radius");
+const OUStringLiteral gsTarget(u"Target");
+const OUStringLiteral gsURL(u"URL");
+const OUStringLiteral gsTitle(u"Title");
 
 XMLImageMapExport::XMLImageMapExport(SvXMLExport& rExp) :
     mrExport(rExp)
diff --git a/xmloff/source/draw/animexp.cxx b/xmloff/source/draw/animexp.cxx
index e671bd7f7fbb..cc1beefbdd07 100644
--- a/xmloff/source/draw/animexp.cxx
+++ b/xmloff/source/draw/animexp.cxx
@@ -233,18 +233,18 @@ class AnimExpImpl
 public:
     list<XMLEffectHint> maEffects;
 
-    static constexpr OUStringLiteral gsDimColor = "DimColor";
-    static constexpr OUStringLiteral gsDimHide = "DimHide";
-    static constexpr OUStringLiteral gsDimPrev = "DimPrevious";
-    static constexpr OUStringLiteral gsEffect = "Effect";
-    static constexpr OUStringLiteral gsPlayFull = "PlayFull";
-    static constexpr OUStringLiteral gsPresOrder = "PresentationOrder";
-    static constexpr OUStringLiteral gsSound = "Sound";
-    static constexpr OUStringLiteral gsSoundOn = "SoundOn";
-    static constexpr OUStringLiteral gsSpeed = "Speed";
-    static constexpr OUStringLiteral gsTextEffect = "TextEffect";
-    static constexpr OUStringLiteral gsIsAnimation = "IsAnimation";
-    static constexpr OUStringLiteral gsAnimPath = "AnimationPath";
+    static constexpr OUStringLiteral gsDimColor = u"DimColor";
+    static constexpr OUStringLiteral gsDimHide = u"DimHide";
+    static constexpr OUStringLiteral gsDimPrev = u"DimPrevious";
+    static constexpr OUStringLiteral gsEffect = u"Effect";
+    static constexpr OUStringLiteral gsPlayFull = u"PlayFull";
+    static constexpr OUStringLiteral gsPresOrder = u"PresentationOrder";
+    static constexpr OUStringLiteral gsSound = u"Sound";
+    static constexpr OUStringLiteral gsSoundOn = u"SoundOn";
+    static constexpr OUStringLiteral gsSpeed = u"Speed";
+    static constexpr OUStringLiteral gsTextEffect = u"TextEffect";
+    static constexpr OUStringLiteral gsIsAnimation = u"IsAnimation";
+    static constexpr OUStringLiteral gsAnimPath = u"AnimationPath";
 };
 
 XMLAnimationsExporter::XMLAnimationsExporter()
diff --git a/xmloff/source/draw/animimp.cxx b/xmloff/source/draw/animimp.cxx
index 9e1d3ca38c6f..c0c471f92f50 100644
--- a/xmloff/source/draw/animimp.cxx
+++ b/xmloff/source/draw/animimp.cxx
@@ -318,18 +318,18 @@ AnimationEffect ImplSdXMLgetEffect( XMLEffect eKind, XMLEffectDirection eDirecti
 
 namespace
 {
-    constexpr OUStringLiteral gsDimColor = "DimColor";
-    constexpr OUStringLiteral gsDimHide = "DimHide";
-    constexpr OUStringLiteral gsDimPrev = "DimPrevious";
-    constexpr OUStringLiteral gsEffect = "Effect";
-    constexpr OUStringLiteral gsPlayFull = "PlayFull";
-    constexpr OUStringLiteral gsSound = "Sound";
-    constexpr OUStringLiteral gsSoundOn = "SoundOn";
-    constexpr OUStringLiteral gsSpeed = "Speed";
-    constexpr OUStringLiteral gsTextEffect = "TextEffect";
-    constexpr OUStringLiteral gsPresShapeService = "com.sun.star.presentation.Shape";
-    constexpr OUStringLiteral gsAnimPath = "AnimationPath";
-    constexpr OUStringLiteral gsIsAnimation = "IsAnimation";
+    constexpr OUStringLiteral gsDimColor = u"DimColor";
+    constexpr OUStringLiteral gsDimHide = u"DimHide";
+    constexpr OUStringLiteral gsDimPrev = u"DimPrevious";
+    constexpr OUStringLiteral gsEffect = u"Effect";
+    constexpr OUStringLiteral gsPlayFull = u"PlayFull";
+    constexpr OUStringLiteral gsSound = u"Sound";
+    constexpr OUStringLiteral gsSoundOn = u"SoundOn";
+    constexpr OUStringLiteral gsSpeed = u"Speed";
+    constexpr OUStringLiteral gsTextEffect = u"TextEffect";
+    constexpr OUStringLiteral gsPresShapeService = u"com.sun.star.presentation.Shape";
+    constexpr OUStringLiteral gsAnimPath = u"AnimationPath";
+    constexpr OUStringLiteral gsIsAnimation = u"IsAnimation";
 };
 
 namespace {
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index 691e6ed49762..0297c6f4e285 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -368,7 +368,7 @@ ImpXMLAutoLayoutInfo::ImpXMLAutoLayoutInfo(sal_uInt16 nTyp, ImpXMLEXPPageMasterI
     maPresRect.SetSize(aLayoutSize);
 }
 
-const OUStringLiteral gsPageLayoutNames( "PageLayoutNames" );
+const OUStringLiteral gsPageLayoutNames( u"PageLayoutNames" );
 
 SdXMLExport::SdXMLExport(
     const css::uno::Reference< css::uno::XComponentContext >& xContext,
diff --git a/xmloff/source/draw/sdxmlimp_impl.hxx b/xmloff/source/draw/sdxmlimp_impl.hxx
index 29ffde9a2de4..8d4f3e7407fd 100644
--- a/xmloff/source/draw/sdxmlimp_impl.hxx
+++ b/xmloff/source/draw/sdxmlimp_impl.hxx
@@ -119,8 +119,8 @@ class SdXMLImport: public SvXMLImport
     bool                        mbLoadDoc;
     bool                        mbPreview;
 
-    static constexpr OUStringLiteral gsPageLayouts = "PageLayouts";
-    static constexpr OUStringLiteral gsPreview = "Preview";
+    static constexpr OUStringLiteral gsPageLayouts = u"PageLayouts";
+    static constexpr OUStringLiteral gsPreview = u"Preview";
 
     HeaderFooterDeclMap         maHeaderDeclsMap;
     HeaderFooterDeclMap         maFooterDeclsMap;
diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx
index 5c5d81201f93..6b3559200d02 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -146,26 +146,26 @@ bool supportsText(XmlShapeType eShapeType)
 
 }
 
-const OUStringLiteral gsZIndex( "ZOrder" );
-const OUStringLiteral gsPrintable( "Printable" );
-const OUStringLiteral gsVisible( "Visible" );
-const OUStringLiteral gsModel( "Model" );
-const OUStringLiteral gsStartShape( "StartShape" );
-const OUStringLiteral gsEndShape( "EndShape" );
-const OUStringLiteral gsOnClick( "OnClick" );
-const OUStringLiteral gsEventType( "EventType" );
-const OUStringLiteral gsPresentation( "Presentation" );
-const OUStringLiteral gsMacroName( "MacroName" );
-const OUStringLiteral gsScript( "Script" );
-const OUStringLiteral gsLibrary( "Library" );
-const OUStringLiteral gsClickAction( "ClickAction" );
-const OUStringLiteral gsBookmark( "Bookmark" );
-const OUStringLiteral gsEffect( "Effect" );
-const OUStringLiteral gsPlayFull( "PlayFull" );
-const OUStringLiteral gsVerb( "Verb" );
-const OUStringLiteral gsSoundURL( "SoundURL" );
-const OUStringLiteral gsSpeed( "Speed" );
-const OUStringLiteral gsStarBasic( "StarBasic" );
+const OUStringLiteral gsZIndex( u"ZOrder" );
+const OUStringLiteral gsPrintable( u"Printable" );
+const OUStringLiteral gsVisible( u"Visible" );
+const OUStringLiteral gsModel( u"Model" );
+const OUStringLiteral gsStartShape( u"StartShape" );
+const OUStringLiteral gsEndShape( u"EndShape" );
+const OUStringLiteral gsOnClick( u"OnClick" );
+const OUStringLiteral gsEventType( u"EventType" );
+const OUStringLiteral gsPresentation( u"Presentation" );
+const OUStringLiteral gsMacroName( u"MacroName" );
+const OUStringLiteral gsScript( u"Script" );
+const OUStringLiteral gsLibrary( u"Library" );
+const OUStringLiteral gsClickAction( u"ClickAction" );
+const OUStringLiteral gsBookmark( u"Bookmark" );
+const OUStringLiteral gsEffect( u"Effect" );
+const OUStringLiteral gsPlayFull( u"PlayFull" );
+const OUStringLiteral gsVerb( u"Verb" );
+const OUStringLiteral gsSoundURL( u"SoundURL" );
+const OUStringLiteral gsSpeed( u"Speed" );
+const OUStringLiteral gsStarBasic( u"StarBasic" );
 
 XMLShapeExport::XMLShapeExport(SvXMLExport& rExp,
                                 SvXMLExportPropertyMapper *pExtMapper )
diff --git a/xmloff/source/draw/shapeimport.cxx b/xmloff/source/draw/shapeimport.cxx
index fc4deec1a801..8797425eb8c7 100644
--- a/xmloff/source/draw/shapeimport.cxx
+++ b/xmloff/source/draw/shapeimport.cxx
@@ -110,10 +110,10 @@ struct XMLShapeImportHelperImpl
     bool                        mbIsPresentationShapesSupported;
 };
 
-const OUStringLiteral gsStartShape("StartShape");
-const OUStringLiteral gsEndShape("EndShape");
-const OUStringLiteral gsStartGluePointIndex("StartGluePointIndex");
-const OUStringLiteral gsEndGluePointIndex("EndGluePointIndex");
+const OUStringLiteral gsStartShape(u"StartShape");
+const OUStringLiteral gsEndShape(u"EndShape");
+const OUStringLiteral gsStartGluePointIndex(u"StartGluePointIndex");
+const OUStringLiteral gsEndGluePointIndex(u"EndGluePointIndex");
 
 XMLShapeImportHelper::XMLShapeImportHelper(
         SvXMLImport& rImporter,
diff --git a/xmloff/source/forms/elementexport.cxx b/xmloff/source/forms/elementexport.cxx
index 788ce72b4616..7398ecee2a3c 100644
--- a/xmloff/source/forms/elementexport.cxx
+++ b/xmloff/source/forms/elementexport.cxx
@@ -1124,7 +1124,7 @@ namespace xmloff
             };
             static const OUStringLiteral pStringPropertyNames[] =
             {   // property names
-                PROPERTY_GROUP_NAME
+                u"" PROPERTY_GROUP_NAME
             };
 
             static const sal_Int32 nIdCount = SAL_N_ELEMENTS( nStringPropertyAttributeIds );
diff --git a/xmloff/source/script/XMLEventExport.cxx b/xmloff/source/script/XMLEventExport.cxx
index f8c4cf9b24be..7d45be7fffd8 100644
--- a/xmloff/source/script/XMLEventExport.cxx
+++ b/xmloff/source/script/XMLEventExport.cxx
@@ -40,7 +40,7 @@ using ::com::sun::star::container::XNameReplace;
 using ::com::sun::star::container::XNameAccess;
 using ::xmloff::token::XML_EVENT_LISTENERS;
 
-const OUStringLiteral gsEventType("EventType");
+const OUStringLiteral gsEventType(u"EventType");
 
 XMLEventExport::XMLEventExport(SvXMLExport& rExp) :
     rExport(rExp),
diff --git a/xmloff/source/script/XMLScriptContextFactory.cxx b/xmloff/source/script/XMLScriptContextFactory.cxx
index 730ab2dae810..9dfb704c71f1 100644
--- a/xmloff/source/script/XMLScriptContextFactory.cxx
+++ b/xmloff/source/script/XMLScriptContextFactory.cxx
@@ -32,9 +32,9 @@ using ::com::sun::star::beans::PropertyValue;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
 
-const OUStringLiteral gsEventType("EventType");
-const OUStringLiteral gsScript("Script");
-const OUStringLiteral gsURL("Script");
+const OUStringLiteral gsEventType(u"EventType");
+const OUStringLiteral gsScript(u"Script");
+const OUStringLiteral gsURL(u"Script");
 
 XMLScriptContextFactory::XMLScriptContextFactory()
 {
diff --git a/xmloff/source/script/XMLScriptExportHandler.cxx b/xmloff/source/script/XMLScriptExportHandler.cxx
index 1255b937576e..af7cb2ec976b 100644
--- a/xmloff/source/script/XMLScriptExportHandler.cxx
+++ b/xmloff/source/script/XMLScriptExportHandler.cxx
@@ -31,7 +31,7 @@ using namespace ::xmloff::token;
 
 using ::com::sun::star::beans::PropertyValue;
 
-const OUStringLiteral gsURL("Script");
+const OUStringLiteral gsURL(u"Script");
 
 XMLScriptExportHandler::XMLScriptExportHandler()
 {
diff --git a/xmloff/source/script/XMLStarBasicContextFactory.cxx b/xmloff/source/script/XMLStarBasicContextFactory.cxx
index 00bcd9f62eb1..739fe5afad52 100644
--- a/xmloff/source/script/XMLStarBasicContextFactory.cxx
+++ b/xmloff/source/script/XMLStarBasicContextFactory.cxx
@@ -33,10 +33,10 @@ using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
 
 
-const OUStringLiteral gsEventType("EventType");
-const OUStringLiteral gsLibrary("Library");
-const OUStringLiteral gsMacroName("MacroName");
-const OUStringLiteral gsStarBasic("StarBasic");
+const OUStringLiteral gsEventType(u"EventType");
+const OUStringLiteral gsLibrary(u"Library");
+const OUStringLiteral gsMacroName(u"MacroName");
+const OUStringLiteral gsStarBasic(u"StarBasic");
 
 XMLStarBasicContextFactory::XMLStarBasicContextFactory()
 {
diff --git a/xmloff/source/script/XMLStarBasicExportHandler.cxx b/xmloff/source/script/XMLStarBasicExportHandler.cxx
index 86cc5494e148..e61b3f8f8ebb 100644
--- a/xmloff/source/script/XMLStarBasicExportHandler.cxx
+++ b/xmloff/source/script/XMLStarBasicExportHandler.cxx
@@ -32,11 +32,11 @@ using namespace ::xmloff::token;
 using ::com::sun::star::beans::PropertyValue;
 
 
-const OUStringLiteral gsStarBasic("StarBasic");
-const OUStringLiteral gsLibrary("Library");
-const OUStringLiteral gsMacroName("MacroName");
-const OUStringLiteral gsStarOffice("StarOffice");
-const OUStringLiteral gsApplication("application");
+const OUStringLiteral gsStarBasic(u"StarBasic");
+const OUStringLiteral gsLibrary(u"Library");
+const OUStringLiteral gsMacroName(u"MacroName");
+const OUStringLiteral gsStarOffice(u"StarOffice");
+const OUStringLiteral gsApplication(u"application");
 
 XMLStarBasicExportHandler::XMLStarBasicExportHandler()
 {
diff --git a/xmloff/source/style/XMLPageExport.cxx b/xmloff/source/style/XMLPageExport.cxx
index ea67dff753a8..27bbfbb942f5 100644
--- a/xmloff/source/style/XMLPageExport.cxx
+++ b/xmloff/source/style/XMLPageExport.cxx
@@ -41,8 +41,8 @@ using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::beans;
 using namespace ::xmloff::token;
 
-const OUStringLiteral gsIsPhysical( "IsPhysical" );
-const OUStringLiteral gsFollowStyle( "FollowStyle" );
+const OUStringLiteral gsIsPhysical( u"IsPhysical" );
+const OUStringLiteral gsFollowStyle( u"FollowStyle" );
 
 namespace {
 
diff --git a/xmloff/source/style/numehelp.cxx b/xmloff/source/style/numehelp.cxx
index 3264b71b530f..d1479cf0c4cc 100644
--- a/xmloff/source/style/numehelp.cxx
+++ b/xmloff/source/style/numehelp.cxx
@@ -38,10 +38,10 @@
 using namespace com::sun::star;
 using namespace xmloff::token;
 
-const OUStringLiteral gsStandardFormat("StandardFormat");
-const OUStringLiteral gsType("Type");
-const OUStringLiteral gsCurrencySymbol("CurrencySymbol");
-const OUStringLiteral gsCurrencyAbbreviation("CurrencyAbbreviation");
+const OUStringLiteral gsStandardFormat(u"StandardFormat");
+const OUStringLiteral gsType(u"Type");
+const OUStringLiteral gsCurrencySymbol(u"CurrencySymbol");
+const OUStringLiteral gsCurrencyAbbreviation(u"CurrencyAbbreviation");
 
 XMLNumberFormatAttributesExportHelper::XMLNumberFormatAttributesExportHelper(
             css::uno::Reference< css::util::XNumberFormatsSupplier > const & xTempNumberFormatsSupplier)
diff --git a/xmloff/source/style/prstylei.cxx b/xmloff/source/style/prstylei.cxx
index 412db9a75417..38c648e414de 100644
--- a/xmloff/source/style/prstylei.cxx
+++ b/xmloff/source/style/prstylei.cxx
@@ -143,8 +143,8 @@ namespace
 
 
 
-const OUStringLiteral gsIsPhysical(  "IsPhysical"  );
-const OUStringLiteral gsFollowStyle(  "FollowStyle"  );
+const OUStringLiteral gsIsPhysical(  u"IsPhysical"  );
+const OUStringLiteral gsFollowStyle(  u"FollowStyle"  );
 
 XMLPropStyleContext::XMLPropStyleContext( SvXMLImport& rImport,
         sal_Int32 nElement,
@@ -337,8 +337,8 @@ void XMLPropStyleContext::CreateAndInsert( bool bOverwrite )
                 {
                     Sequence< OUString > aPropNames(1);
                     aPropNames[0] = GetFamily() == XmlStyleFamily::TEXT_PARAGRAPH ?
-                        OUStringLiteral("ParaAutoStyleName") :
-                        OUStringLiteral("CharAutoStyleName");
+                        OUStringLiteral(u"ParaAutoStyleName") :
+                        OUStringLiteral(u"CharAutoStyleName");
                     Sequence< Any > aAny = xAutoStyle->getPropertyValues( aPropNames );
                     if( aAny.hasElements() )
                     {
diff --git a/xmloff/source/style/styleexp.cxx b/xmloff/source/style/styleexp.cxx
index c3dc6b6742c7..66cab27c9d19 100644
--- a/xmloff/source/style/styleexp.cxx
+++ b/xmloff/source/style/styleexp.cxx
@@ -52,11 +52,11 @@ using namespace ::xmloff::token;
 
 using ::com::sun::star::document::XEventsSupplier;
 
-const OUStringLiteral gsIsPhysical( "IsPhysical" );
-const OUStringLiteral gsIsAutoUpdate( "IsAutoUpdate" );
-const OUStringLiteral gsFollowStyle( "FollowStyle" );
-const OUStringLiteral gsNumberingStyleName( "NumberingStyleName" );
-const OUStringLiteral gsOutlineLevel( "OutlineLevel" );
+const OUStringLiteral gsIsPhysical( u"IsPhysical" );
+const OUStringLiteral gsIsAutoUpdate( u"IsAutoUpdate" );
+const OUStringLiteral gsFollowStyle( u"FollowStyle" );
+const OUStringLiteral gsNumberingStyleName( u"NumberingStyleName" );
+const OUStringLiteral gsOutlineLevel( u"OutlineLevel" );
 
 XMLStyleExport::XMLStyleExport(
         SvXMLExport& rExp,
diff --git a/xmloff/source/style/xmlnume.cxx b/xmloff/source/style/xmlnume.cxx
index 4728ed8da4d7..3eca9cda1bc1 100644
--- a/xmloff/source/style/xmlnume.cxx
+++ b/xmloff/source/style/xmlnume.cxx
@@ -605,9 +605,9 @@ void SvxXMLNumRuleExport::exportLevelStyle( sal_Int32 nLevel,
 }
 
 
-const OUStringLiteral gsNumberingRules( "NumberingRules" );
-const OUStringLiteral gsIsPhysical( "IsPhysical" );
-const OUStringLiteral gsIsContinuousNumbering( "IsContinuousNumbering" );
+const OUStringLiteral gsNumberingRules( u"NumberingRules" );
+const OUStringLiteral gsIsPhysical( u"IsPhysical" );
+const OUStringLiteral gsIsContinuousNumbering( u"IsContinuousNumbering" );
 
 SvxXMLNumRuleExport::SvxXMLNumRuleExport( SvXMLExport& rExp ) :
     rExport( rExp ),
diff --git a/xmloff/source/style/xmlnumi.cxx b/xmloff/source/style/xmlnumi.cxx
index 0cd3c1c21d80..eb500be374a5 100644
--- a/xmloff/source/style/xmlnumi.cxx
+++ b/xmloff/source/style/xmlnumi.cxx
@@ -249,8 +249,8 @@ public:
     }
 };
 
-const OUStringLiteral gsStarBats( "StarBats"  );
-const OUStringLiteral gsStarMath( "StarMath"  );
+const OUStringLiteral gsStarBats( u"StarBats"  );
+const OUStringLiteral gsStarMath( u"StarMath"  );
 
 SvxXMLListLevelStyleContext_Impl::SvxXMLListLevelStyleContext_Impl(
         SvXMLImport& rImport, sal_uInt16 nPrfx,
@@ -1013,9 +1013,9 @@ void SvxXMLListStyleContext::SetAttribute( sal_uInt16 nPrefixKey,
     }
 }
 
-const OUStringLiteral sIsPhysical( "IsPhysical"  );
-const OUStringLiteral sNumberingRules( "NumberingRules"  );
-const OUStringLiteral sIsContinuousNumbering( "IsContinuousNumbering"  );
+const OUStringLiteral sIsPhysical( u"IsPhysical"  );
+const OUStringLiteral sNumberingRules( u"NumberingRules"  );
+const OUStringLiteral sIsContinuousNumbering( u"IsContinuousNumbering"  );
 
 SvxXMLListStyleContext::SvxXMLListStyleContext( SvXMLImport& rImport,
         sal_uInt16 nPrfx,
diff --git a/xmloff/source/style/xmlstyle.cxx b/xmloff/source/style/xmlstyle.cxx
index 0c4c708352a8..458dda8030e8 100644
--- a/xmloff/source/style/xmlstyle.cxx
+++ b/xmloff/source/style/xmlstyle.cxx
@@ -79,8 +79,8 @@ const SvXMLTokenMapEntry aStyleStylesElemTokenMap[] =
     XML_TOKEN_MAP_END
 };
 
-const OUStringLiteral gsParaStyleServiceName( "com.sun.star.style.ParagraphStyle" );
-const OUStringLiteral gsTextStyleServiceName( "com.sun.star.style.CharacterStyle" );
+const OUStringLiteral gsParaStyleServiceName( u"com.sun.star.style.ParagraphStyle" );
+const OUStringLiteral gsTextStyleServiceName( u"com.sun.star.style.CharacterStyle" );
 
 const SvXMLTokenMap& SvXMLStylesContext::GetStyleStylesElemTokenMap()
 {
@@ -698,7 +698,7 @@ Reference < XAutoStyleFamily > SvXMLStylesContext::GetAutoStyles( XmlStyleFamily
             xAutoStyles = mxParaAutoStyles;
         else
         {
-            sName = bPara ? OUStringLiteral( "ParagraphStyles" ): OUStringLiteral( "CharacterStyles" );
+            sName = bPara ? OUStringLiteral( u"ParagraphStyles" ): OUStringLiteral( u"CharacterStyles" );
             Reference< XAutoStylesSupplier > xAutoStylesSupp(   GetImport().GetModel(), UNO_QUERY );
             Reference< XAutoStyles > xAutoStyleFamilies = xAutoStylesSupp->getAutoStyles();
             if (xAutoStyleFamilies->hasByName(sName))
diff --git a/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx b/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx
index ad96aee7976d..f3b6f4af110e 100644
--- a/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx
+++ b/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx
@@ -109,18 +109,18 @@ void XMLFootnoteConfigHelper::characters( const OUString& rChars )
 
 // XMLFootnoteConfigurationImportContext
 
-const OUStringLiteral gsPropertyAnchorCharStyleName("AnchorCharStyleName");
-const OUStringLiteral gsPropertyCharStyleName("CharStyleName");
-const OUStringLiteral gsPropertyNumberingType("NumberingType");
-const OUStringLiteral gsPropertyPageStyleName("PageStyleName");
-const OUStringLiteral gsPropertyParagraphStyleName("ParaStyleName");
-const OUStringLiteral gsPropertyPrefix("Prefix");
-const OUStringLiteral gsPropertyStartAt("StartAt");
-const OUStringLiteral gsPropertySuffix("Suffix");
-const OUStringLiteral gsPropertyPositionEndOfDoc("PositionEndOfDoc");
-const OUStringLiteral gsPropertyFootnoteCounting("FootnoteCounting");
-const OUStringLiteral gsPropertyEndNotice("EndNotice");
-const OUStringLiteral gsPropertyBeginNotice("BeginNotice");
+const OUStringLiteral gsPropertyAnchorCharStyleName(u"AnchorCharStyleName");
+const OUStringLiteral gsPropertyCharStyleName(u"CharStyleName");
+const OUStringLiteral gsPropertyNumberingType(u"NumberingType");
+const OUStringLiteral gsPropertyPageStyleName(u"PageStyleName");
+const OUStringLiteral gsPropertyParagraphStyleName(u"ParaStyleName");
+const OUStringLiteral gsPropertyPrefix(u"Prefix");
+const OUStringLiteral gsPropertyStartAt(u"StartAt");
+const OUStringLiteral gsPropertySuffix(u"Suffix");
+const OUStringLiteral gsPropertyPositionEndOfDoc(u"PositionEndOfDoc");
+const OUStringLiteral gsPropertyFootnoteCounting(u"FootnoteCounting");
+const OUStringLiteral gsPropertyEndNotice(u"EndNotice");
+const OUStringLiteral gsPropertyBeginNotice(u"BeginNotice");
 
 XMLFootnoteConfigurationImportContext::XMLFootnoteConfigurationImportContext(
     SvXMLImport& rImport,
diff --git a/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx b/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx
index c9937f562e6a..cdbba6bd863c 100644
--- a/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx
+++ b/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx
@@ -45,16 +45,16 @@ using ::com::sun::star::beans::XPropertySet;
 using ::com::sun::star::lang::XMultiServiceFactory;
 
 
-const OUStringLiteral gsFieldMaster_Bibliography("com.sun.star.text.FieldMaster.Bibliography");
-const OUStringLiteral gsBracketBefore("BracketBefore");
-const OUStringLiteral gsBracketAfter("BracketAfter");
-const OUStringLiteral gsIsNumberEntries("IsNumberEntries");
-const OUStringLiteral gsIsSortByPosition("IsSortByPosition");
-const OUStringLiteral gsSortKeys("SortKeys");
-const OUStringLiteral gsSortKey("SortKey");
-const OUStringLiteral gsIsSortAscending("IsSortAscending");
-const OUStringLiteral gsSortAlgorithm("SortAlgorithm");
-const OUStringLiteral gsLocale("Locale");
+const OUStringLiteral gsFieldMaster_Bibliography(u"com.sun.star.text.FieldMaster.Bibliography");
+const OUStringLiteral gsBracketBefore(u"BracketBefore");
+const OUStringLiteral gsBracketAfter(u"BracketAfter");
+const OUStringLiteral gsIsNumberEntries(u"IsNumberEntries");
+const OUStringLiteral gsIsSortByPosition(u"IsSortByPosition");
+const OUStringLiteral gsSortKeys(u"SortKeys");
+const OUStringLiteral gsSortKey(u"SortKey");
+const OUStringLiteral gsIsSortAscending(u"IsSortAscending");
+const OUStringLiteral gsSortAlgorithm(u"SortAlgorithm");
+const OUStringLiteral gsLocale(u"Locale");
 
 XMLIndexBibliographyConfigurationContext::XMLIndexBibliographyConfigurationContext(
     SvXMLImport& rImport,
diff --git a/xmloff/source/text/XMLIndexMarkExport.hxx b/xmloff/source/text/XMLIndexMarkExport.hxx
index 05cd150518e2..fa234c5d1c0c 100644
--- a/xmloff/source/text/XMLIndexMarkExport.hxx
+++ b/xmloff/source/text/XMLIndexMarkExport.hxx
@@ -38,18 +38,18 @@ namespace com::sun::star {
  */
 class XMLIndexMarkExport
 {
-    static constexpr OUStringLiteral gsLevel = "Level";
-    static constexpr OUStringLiteral gsUserIndexName = "UserIndexName";
-    static constexpr OUStringLiteral gsPrimaryKey = "PrimaryKey";
-    static constexpr OUStringLiteral gsSecondaryKey = "SecondaryKey";
-    static constexpr OUStringLiteral gsDocumentIndexMark = "DocumentIndexMark";
-    static constexpr OUStringLiteral gsIsStart = "IsStart";
-    static constexpr OUStringLiteral gsIsCollapsed = "IsCollapsed";
-    static constexpr OUStringLiteral gsAlternativeText = "AlternativeText";
-    static constexpr OUStringLiteral gsTextReading = "TextReading";
-    static constexpr OUStringLiteral gsPrimaryKeyReading = "PrimaryKeyReading";
-    static constexpr OUStringLiteral gsSecondaryKeyReading = "SecondaryKeyReading";
-    static constexpr OUStringLiteral gsMainEntry = "IsMainEntry";
+    static constexpr OUStringLiteral gsLevel = u"Level";
+    static constexpr OUStringLiteral gsUserIndexName = u"UserIndexName";
+    static constexpr OUStringLiteral gsPrimaryKey = u"PrimaryKey";
+    static constexpr OUStringLiteral gsSecondaryKey = u"SecondaryKey";
+    static constexpr OUStringLiteral gsDocumentIndexMark = u"DocumentIndexMark";
+    static constexpr OUStringLiteral gsIsStart = u"IsStart";
+    static constexpr OUStringLiteral gsIsCollapsed = u"IsCollapsed";
+    static constexpr OUStringLiteral gsAlternativeText = u"AlternativeText";
+    static constexpr OUStringLiteral gsTextReading = u"TextReading";
+    static constexpr OUStringLiteral gsPrimaryKeyReading = u"PrimaryKeyReading";
+    static constexpr OUStringLiteral gsSecondaryKeyReading = u"SecondaryKeyReading";
+    static constexpr OUStringLiteral gsMainEntry = u"IsMainEntry";
 
     SvXMLExport& rExport;
 
diff --git a/xmloff/source/text/XMLLineNumberingImportContext.cxx b/xmloff/source/text/XMLLineNumberingImportContext.cxx
index 09de0382b780..43ff3ddbe00f 100644
--- a/xmloff/source/text/XMLLineNumberingImportContext.cxx
+++ b/xmloff/source/text/XMLLineNumberingImportContext.cxx
@@ -44,17 +44,17 @@ using ::com::sun::star::xml::sax::XFastAttributeList;
 using ::com::sun::star::text::XLineNumberingProperties;
 
 
-const OUStringLiteral gsCharStyleName("CharStyleName");
-const OUStringLiteral gsCountEmptyLines("CountEmptyLines");
-const OUStringLiteral gsCountLinesInFrames("CountLinesInFrames");
-const OUStringLiteral gsDistance("Distance");
-const OUStringLiteral gsInterval("Interval");
-const OUStringLiteral gsSeparatorText("SeparatorText");
-const OUStringLiteral gsNumberPosition("NumberPosition");
-const OUStringLiteral gsNumberingType("NumberingType");
-const OUStringLiteral gsIsOn("IsOn");
-const OUStringLiteral gsRestartAtEachPage("RestartAtEachPage");
-const OUStringLiteral gsSeparatorInterval("SeparatorInterval");
+const OUStringLiteral gsCharStyleName(u"CharStyleName");
+const OUStringLiteral gsCountEmptyLines(u"CountEmptyLines");
+const OUStringLiteral gsCountLinesInFrames(u"CountLinesInFrames");
+const OUStringLiteral gsDistance(u"Distance");
+const OUStringLiteral gsInterval(u"Interval");
+const OUStringLiteral gsSeparatorText(u"SeparatorText");
+const OUStringLiteral gsNumberPosition(u"NumberPosition");
+const OUStringLiteral gsNumberingType(u"NumberingType");
+const OUStringLiteral gsIsOn(u"IsOn");
+const OUStringLiteral gsRestartAtEachPage(u"RestartAtEachPage");
+const OUStringLiteral gsSeparatorInterval(u"SeparatorInterval");
 
 XMLLineNumberingImportContext::XMLLineNumberingImportContext(
     SvXMLImport& rImport,
diff --git a/xmloff/source/text/XMLTextColumnsContext.cxx b/xmloff/source/text/XMLTextColumnsContext.cxx
index 80135f944fd2..a94da52f4deb 100644
--- a/xmloff/source/text/XMLTextColumnsContext.cxx
+++ b/xmloff/source/text/XMLTextColumnsContext.cxx
@@ -244,13 +244,13 @@ XMLTextColumnSepContext_Impl::XMLTextColumnSepContext_Impl(
     }
 }
 
-const OUStringLiteral gsSeparatorLineIsOn("SeparatorLineIsOn");
-const OUStringLiteral gsSeparatorLineWidth("SeparatorLineWidth");
-const OUStringLiteral gsSeparatorLineColor("SeparatorLineColor");
-const OUStringLiteral gsSeparatorLineRelativeHeight("SeparatorLineRelativeHeight");
-const OUStringLiteral gsSeparatorLineVerticalAlignment("SeparatorLineVerticalAlignment");
-const OUStringLiteral gsAutomaticDistance("AutomaticDistance");
-const OUStringLiteral gsSeparatorLineStyle("SeparatorLineStyle");
+const OUStringLiteral gsSeparatorLineIsOn(u"SeparatorLineIsOn");
+const OUStringLiteral gsSeparatorLineWidth(u"SeparatorLineWidth");
+const OUStringLiteral gsSeparatorLineColor(u"SeparatorLineColor");
+const OUStringLiteral gsSeparatorLineRelativeHeight(u"SeparatorLineRelativeHeight");
+const OUStringLiteral gsSeparatorLineVerticalAlignment(u"SeparatorLineVerticalAlignment");
+const OUStringLiteral gsAutomaticDistance(u"AutomaticDistance");
+const OUStringLiteral gsSeparatorLineStyle(u"SeparatorLineStyle");
 
 XMLTextColumnsContext::XMLTextColumnsContext(
                                 SvXMLImport& rImport, sal_uInt16 nPrfx,
diff --git a/xmloff/source/text/XMLTextColumnsExport.cxx b/xmloff/source/text/XMLTextColumnsExport.cxx
index 6405b25765c0..85f0009a9639 100644
--- a/xmloff/source/text/XMLTextColumnsExport.cxx
+++ b/xmloff/source/text/XMLTextColumnsExport.cxx
@@ -43,14 +43,14 @@ using namespace ::com::sun::star::beans;
 using namespace ::xmloff::token;
 
 
-const OUStringLiteral gsSeparatorLineIsOn("SeparatorLineIsOn");
-const OUStringLiteral gsSeparatorLineWidth("SeparatorLineWidth");
-const OUStringLiteral gsSeparatorLineColor("SeparatorLineColor");
-const OUStringLiteral gsSeparatorLineRelativeHeight("SeparatorLineRelativeHeight");
-const OUStringLiteral gsSeparatorLineVerticalAlignment("SeparatorLineVerticalAlignment");
-const OUStringLiteral gsIsAutomatic("IsAutomatic");
-const OUStringLiteral gsAutomaticDistance("AutomaticDistance");
-const OUStringLiteral gsSeparatorLineStyle("SeparatorLineStyle");
+const OUStringLiteral gsSeparatorLineIsOn(u"SeparatorLineIsOn");
+const OUStringLiteral gsSeparatorLineWidth(u"SeparatorLineWidth");
+const OUStringLiteral gsSeparatorLineColor(u"SeparatorLineColor");
+const OUStringLiteral gsSeparatorLineRelativeHeight(u"SeparatorLineRelativeHeight");
+const OUStringLiteral gsSeparatorLineVerticalAlignment(u"SeparatorLineVerticalAlignment");
+const OUStringLiteral gsIsAutomatic(u"IsAutomatic");
+const OUStringLiteral gsAutomaticDistance(u"AutomaticDistance");
+const OUStringLiteral gsSeparatorLineStyle(u"SeparatorLineStyle");
 
 XMLTextColumnsExport::XMLTextColumnsExport( SvXMLExport& rExp ) :
     rExport( rExp )
diff --git a/xmloff/source/text/XMLTextMasterPageContext.cxx b/xmloff/source/text/XMLTextMasterPageContext.cxx
index ff005f65c5ab..6acd6a68e9dd 100644
--- a/xmloff/source/text/XMLTextMasterPageContext.cxx
+++ b/xmloff/source/text/XMLTextMasterPageContext.cxx
@@ -65,7 +65,7 @@ Reference < XStyle > XMLTextMasterPageContext::Create()
     return xNewStyle;
 }
 
-const OUStringLiteral gsFollowStyle( "FollowStyle" );
+const OUStringLiteral gsFollowStyle( u"FollowStyle" );
 
 XMLTextMasterPageContext::XMLTextMasterPageContext( SvXMLImport& rImport,
         sal_Int32 nElement,
diff --git a/xmloff/source/text/XMLTextMasterPageExport.cxx b/xmloff/source/text/XMLTextMasterPageExport.cxx
index 3f4eb2c6c7a3..13851617d8a7 100644
--- a/xmloff/source/text/XMLTextMasterPageExport.cxx
+++ b/xmloff/source/text/XMLTextMasterPageExport.cxx
@@ -32,17 +32,17 @@ using namespace ::com::sun::star::text;
 using namespace ::com::sun::star::beans;
 using namespace ::xmloff::token;
 
-const OUStringLiteral gsHeaderText( "HeaderText" );
-const OUStringLiteral gsHeaderOn( "HeaderIsOn" );
-const OUStringLiteral gsHeaderShareContent( "HeaderIsShared" );
-const OUStringLiteral gsHeaderTextFirst( "HeaderTextFirst" );
-const OUStringLiteral gsHeaderTextLeft( "HeaderTextLeft" );
-const OUStringLiteral gsFirstShareContent( "FirstIsShared" );
-const OUStringLiteral gsFooterText( "FooterText" );
-const OUStringLiteral gsFooterOn( "FooterIsOn" );
-const OUStringLiteral gsFooterShareContent( "FooterIsShared" );
-const OUStringLiteral gsFooterTextFirst( "FooterTextFirst" );
-const OUStringLiteral gsFooterTextLeft( "FooterTextLeft" );
+const OUStringLiteral gsHeaderText( u"HeaderText" );
+const OUStringLiteral gsHeaderOn( u"HeaderIsOn" );
+const OUStringLiteral gsHeaderShareContent( u"HeaderIsShared" );
+const OUStringLiteral gsHeaderTextFirst( u"HeaderTextFirst" );
+const OUStringLiteral gsHeaderTextLeft( u"HeaderTextLeft" );
+const OUStringLiteral gsFirstShareContent( u"FirstIsShared" );
+const OUStringLiteral gsFooterText( u"FooterText" );
+const OUStringLiteral gsFooterOn( u"FooterIsOn" );
+const OUStringLiteral gsFooterShareContent( u"FooterIsShared" );
+const OUStringLiteral gsFooterTextFirst( u"FooterTextFirst" );
+const OUStringLiteral gsFooterTextLeft( u"FooterTextLeft" );
 
 XMLTextMasterPageExport::XMLTextMasterPageExport( SvXMLExport& rExp ) :
     XMLPageExport( rExp )
diff --git a/xmloff/source/text/XMLTextShapeImportHelper.cxx b/xmloff/source/text/XMLTextShapeImportHelper.cxx
index e423aaba22c6..78488da2099b 100644
--- a/xmloff/source/text/XMLTextShapeImportHelper.cxx
+++ b/xmloff/source/text/XMLTextShapeImportHelper.cxx
@@ -41,9 +41,9 @@ using namespace ::com::sun::star::text;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::xml::sax;
 
-const OUStringLiteral gsAnchorType("AnchorType");
-const OUStringLiteral gsAnchorPageNo("AnchorPageNo");
-const OUStringLiteral gsVertOrientPosition("VertOrientPosition");
+const OUStringLiteral gsAnchorType(u"AnchorType");
+const OUStringLiteral gsAnchorPageNo(u"AnchorPageNo");
+const OUStringLiteral gsVertOrientPosition(u"VertOrientPosition");
 
 XMLTextShapeImportHelper::XMLTextShapeImportHelper(
         SvXMLImport& rImp ) :
diff --git a/xmloff/source/text/XMLTextShapeStyleContext.cxx b/xmloff/source/text/XMLTextShapeStyleContext.cxx
index 610cf98e18f4..72660d060156 100644
--- a/xmloff/source/text/XMLTextShapeStyleContext.cxx
+++ b/xmloff/source/text/XMLTextShapeStyleContext.cxx
@@ -138,7 +138,7 @@ void XMLTextShapeStyleContext::SetAttribute( sal_uInt16 nPrefixKey,
 }
 
 
-const OUStringLiteral gsIsAutoUpdate( "IsAutoUpdate" );
+const OUStringLiteral gsIsAutoUpdate( u"IsAutoUpdate" );
 
 XMLTextShapeStyleContext::XMLTextShapeStyleContext( SvXMLImport& rImport,
         sal_Int32 nElement,
diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx
index f340cadd2eb5..fa4c6541d00a 100644
--- a/xmloff/source/text/txtflde.cxx
+++ b/xmloff/source/text/txtflde.cxx
@@ -295,78 +295,78 @@ static Sequence<OUString> GetStringSequenceProperty(
 
 
     // service names
-const OUStringLiteral gsServicePrefix("com.sun.star.text.textfield.");
-const OUStringLiteral gsFieldMasterPrefix("com.sun.star.text.FieldMaster.");
-const OUStringLiteral gsPresentationServicePrefix("com.sun.star.presentation.TextField.");
+const OUStringLiteral gsServicePrefix(u"com.sun.star.text.textfield.");
+const OUStringLiteral gsFieldMasterPrefix(u"com.sun.star.text.FieldMaster.");
+const OUStringLiteral gsPresentationServicePrefix(u"com.sun.star.presentation.TextField.");
 
     // property names
-const OUStringLiteral gsPropertyAdjust("Adjust");
-const OUStringLiteral gsPropertyAuthor("Author");
-const OUStringLiteral gsPropertyChapterFormat("ChapterFormat");
-const OUStringLiteral gsPropertyChapterNumberingLevel("ChapterNumberingLevel");
-const OUStringLiteral gsPropertyCharStyleNames("CharStyleNames");
-const OUStringLiteral gsPropertyCondition("Condition");
-const OUStringLiteral gsPropertyContent("Content");
-const OUStringLiteral gsPropertyDataBaseName("DataBaseName");
-const OUStringLiteral gsPropertyDataBaseURL("DataBaseURL");
-const OUStringLiteral gsPropertyDataColumnName("DataColumnName");
-const OUStringLiteral gsPropertyDataCommandType("DataCommandType");
-const OUStringLiteral gsPropertyDataTableName("DataTableName");
-const OUStringLiteral gsPropertyDateTime("DateTime");
-const OUStringLiteral gsPropertyDateTimeValue("DateTimeValue");
-const OUStringLiteral gsPropertyDDECommandElement("DDECommandElement");
-const OUStringLiteral gsPropertyDDECommandFile("DDECommandFile");
-const OUStringLiteral gsPropertyDDECommandType("DDECommandType");
-const OUStringLiteral gsPropertyDependentTextFields("DependentTextFields");
-const OUStringLiteral gsPropertyFalseContent("FalseContent");
-const OUStringLiteral gsPropertyFields("Fields");
-const OUStringLiteral gsPropertyFieldSubType("UserDataType");
-const OUStringLiteral gsPropertyFileFormat("FileFormat");
-const OUStringLiteral gsPropertyFullName("FullName");
-const OUStringLiteral gsPropertyHint("Hint");
-const OUStringLiteral gsPropertyInitials("Initials");
-const OUStringLiteral gsPropertyInstanceName("InstanceName");
-const OUStringLiteral gsPropertyIsAutomaticUpdate("IsAutomaticUpdate");
-const OUStringLiteral gsPropertyIsConditionTrue("IsConditionTrue");
-const OUStringLiteral gsPropertyIsDataBaseFormat("DataBaseFormat");
-const OUStringLiteral gsPropertyIsDate("IsDate");
-const OUStringLiteral gsPropertyIsExpression("IsExpression");
-const OUStringLiteral gsPropertyIsFixed("IsFixed");
-const OUStringLiteral gsPropertyIsFixedLanguage("IsFixedLanguage");
-const OUStringLiteral gsPropertyIsHidden("IsHidden");
-const OUStringLiteral gsPropertyIsInput("Input");
-const OUStringLiteral gsPropertyIsShowFormula("IsShowFormula");
-const OUStringLiteral gsPropertyIsVisible("IsVisible");
-const OUStringLiteral gsPropertyItems("Items");
-const OUStringLiteral gsPropertyLevel("Level");
-const OUStringLiteral gsPropertyMeasureKind("Kind");
-const OUStringLiteral gsPropertyName("Name");
-const OUStringLiteral gsPropertyNumberFormat("NumberFormat");
-const OUStringLiteral gsPropertyNumberingSeparator("NumberingSeparator");
-const OUStringLiteral gsPropertyNumberingType("NumberingType");
-const OUStringLiteral gsPropertyOffset("Offset");
-const OUStringLiteral gsPropertyOn("On");
-const OUStringLiteral gsPropertyPlaceholderType("PlaceHolderType");
-const OUStringLiteral gsPropertyReferenceFieldPart("ReferenceFieldPart");
-const OUStringLiteral gsPropertyReferenceFieldSource("ReferenceFieldSource");
-const OUStringLiteral gsPropertyReferenceFieldLanguage("ReferenceFieldLanguage");
-const OUStringLiteral gsPropertyScriptType("ScriptType");
-const OUStringLiteral gsPropertySelectedItem("SelectedItem");
-const OUStringLiteral gsPropertySequenceNumber("SequenceNumber");
-const OUStringLiteral gsPropertySequenceValue("SequenceValue");
-const OUStringLiteral gsPropertySetNumber("SetNumber");
-const OUStringLiteral gsPropertySourceName("SourceName");
-const OUStringLiteral gsPropertySubType("SubType");
-const OUStringLiteral gsPropertyTargetFrame("TargetFrame");
-const OUStringLiteral gsPropertyTrueContent("TrueContent");
-const OUStringLiteral gsPropertyURL("URL");
-const OUStringLiteral gsPropertyURLContent("URLContent");
-const OUStringLiteral gsPropertyUserText("UserText");
-const OUStringLiteral gsPropertyValue("Value");
-const OUStringLiteral gsPropertyVariableName("VariableName");
-const OUStringLiteral gsPropertyHelp("Help");
-const OUStringLiteral gsPropertyTooltip("Tooltip");
-const OUStringLiteral gsPropertyTextRange("TextRange");
+const OUStringLiteral gsPropertyAdjust(u"Adjust");
+const OUStringLiteral gsPropertyAuthor(u"Author");
+const OUStringLiteral gsPropertyChapterFormat(u"ChapterFormat");
+const OUStringLiteral gsPropertyChapterNumberingLevel(u"ChapterNumberingLevel");
+const OUStringLiteral gsPropertyCharStyleNames(u"CharStyleNames");
+const OUStringLiteral gsPropertyCondition(u"Condition");
+const OUStringLiteral gsPropertyContent(u"Content");
+const OUStringLiteral gsPropertyDataBaseName(u"DataBaseName");
+const OUStringLiteral gsPropertyDataBaseURL(u"DataBaseURL");
+const OUStringLiteral gsPropertyDataColumnName(u"DataColumnName");
+const OUStringLiteral gsPropertyDataCommandType(u"DataCommandType");
+const OUStringLiteral gsPropertyDataTableName(u"DataTableName");
+const OUStringLiteral gsPropertyDateTime(u"DateTime");
+const OUStringLiteral gsPropertyDateTimeValue(u"DateTimeValue");
+const OUStringLiteral gsPropertyDDECommandElement(u"DDECommandElement");
+const OUStringLiteral gsPropertyDDECommandFile(u"DDECommandFile");
+const OUStringLiteral gsPropertyDDECommandType(u"DDECommandType");
+const OUStringLiteral gsPropertyDependentTextFields(u"DependentTextFields");
+const OUStringLiteral gsPropertyFalseContent(u"FalseContent");
+const OUStringLiteral gsPropertyFields(u"Fields");
+const OUStringLiteral gsPropertyFieldSubType(u"UserDataType");
+const OUStringLiteral gsPropertyFileFormat(u"FileFormat");
+const OUStringLiteral gsPropertyFullName(u"FullName");
+const OUStringLiteral gsPropertyHint(u"Hint");
+const OUStringLiteral gsPropertyInitials(u"Initials");
+const OUStringLiteral gsPropertyInstanceName(u"InstanceName");
+const OUStringLiteral gsPropertyIsAutomaticUpdate(u"IsAutomaticUpdate");
+const OUStringLiteral gsPropertyIsConditionTrue(u"IsConditionTrue");
+const OUStringLiteral gsPropertyIsDataBaseFormat(u"DataBaseFormat");
+const OUStringLiteral gsPropertyIsDate(u"IsDate");
+const OUStringLiteral gsPropertyIsExpression(u"IsExpression");
+const OUStringLiteral gsPropertyIsFixed(u"IsFixed");
+const OUStringLiteral gsPropertyIsFixedLanguage(u"IsFixedLanguage");
+const OUStringLiteral gsPropertyIsHidden(u"IsHidden");
+const OUStringLiteral gsPropertyIsInput(u"Input");
+const OUStringLiteral gsPropertyIsShowFormula(u"IsShowFormula");
+const OUStringLiteral gsPropertyIsVisible(u"IsVisible");
+const OUStringLiteral gsPropertyItems(u"Items");
+const OUStringLiteral gsPropertyLevel(u"Level");
+const OUStringLiteral gsPropertyMeasureKind(u"Kind");
+const OUStringLiteral gsPropertyName(u"Name");
+const OUStringLiteral gsPropertyNumberFormat(u"NumberFormat");
+const OUStringLiteral gsPropertyNumberingSeparator(u"NumberingSeparator");
+const OUStringLiteral gsPropertyNumberingType(u"NumberingType");
+const OUStringLiteral gsPropertyOffset(u"Offset");
+const OUStringLiteral gsPropertyOn(u"On");
+const OUStringLiteral gsPropertyPlaceholderType(u"PlaceHolderType");
+const OUStringLiteral gsPropertyReferenceFieldPart(u"ReferenceFieldPart");
+const OUStringLiteral gsPropertyReferenceFieldSource(u"ReferenceFieldSource");
+const OUStringLiteral gsPropertyReferenceFieldLanguage(u"ReferenceFieldLanguage");
+const OUStringLiteral gsPropertyScriptType(u"ScriptType");
+const OUStringLiteral gsPropertySelectedItem(u"SelectedItem");
+const OUStringLiteral gsPropertySequenceNumber(u"SequenceNumber");
+const OUStringLiteral gsPropertySequenceValue(u"SequenceValue");
+const OUStringLiteral gsPropertySetNumber(u"SetNumber");
+const OUStringLiteral gsPropertySourceName(u"SourceName");
+const OUStringLiteral gsPropertySubType(u"SubType");
+const OUStringLiteral gsPropertyTargetFrame(u"TargetFrame");
+const OUStringLiteral gsPropertyTrueContent(u"TrueContent");
+const OUStringLiteral gsPropertyURL(u"URL");
+const OUStringLiteral gsPropertyURLContent(u"URLContent");
+const OUStringLiteral gsPropertyUserText(u"UserText");
+const OUStringLiteral gsPropertyValue(u"Value");
+const OUStringLiteral gsPropertyVariableName(u"VariableName");
+const OUStringLiteral gsPropertyHelp(u"Help");
+const OUStringLiteral gsPropertyTooltip(u"Tooltip");
+const OUStringLiteral gsPropertyTextRange(u"TextRange");
 
 XMLTextFieldExport::XMLTextFieldExport( SvXMLExport& rExp,
                                         std::unique_ptr<XMLPropertyState> pCombinedCharState)
diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx
index d975ef082632..31a331f20504 100644
--- a/xmloff/source/text/txtfldi.cxx
+++ b/xmloff/source/text/txtfldi.cxx
@@ -81,8 +81,8 @@ using namespace ::xmloff::token;
 
 
 // service prefix and service names
-const char sAPI_textfield_prefix[]  = "com.sun.star.text.TextField.";
-const char sAPI_fieldmaster_prefix[] = "com.sun.star.text.FieldMaster.";
+const char16_t sAPI_textfield_prefix[]  = u"com.sun.star.text.TextField.";
+const char16_t sAPI_fieldmaster_prefix[] = u"com.sun.star.text.FieldMaster.";
 const char sAPI_presentation_prefix[] = "com.sun.star.presentation.TextField.";
 
 const char sAPI_date_time[]                 = "DateTime";
@@ -535,7 +535,7 @@ void XMLTextFieldImportContext::ForceUpdate(
 // XMLSenderFieldImportContext
 
 
-const OUStringLiteral gsPropertyFieldSubType("UserDataType");
+const OUStringLiteral gsPropertyFieldSubType(u"UserDataType");
 
 XMLSenderFieldImportContext::XMLSenderFieldImportContext(
     SvXMLImport& rImport, XMLTextImportHelper& rHlp,
@@ -654,7 +654,7 @@ void XMLSenderFieldImportContext::PrepareField(
 
 // XMLAuthorFieldImportContext
 
-const OUStringLiteral gsPropertyAuthorFullName("FullName");
+const OUStringLiteral gsPropertyAuthorFullName(u"FullName");
 
 XMLAuthorFieldImportContext::XMLAuthorFieldImportContext(
     SvXMLImport& rImport, XMLTextImportHelper& rHlp,
@@ -727,7 +727,7 @@ SvXMLEnumMapEntry<PageNumberType> const lcl_aSelectPageAttrMap[] =
     { XML_TOKEN_INVALID, PageNumberType(0) },
 };
 
-const OUStringLiteral gsPropertyUserText("UserText");
+const OUStringLiteral gsPropertyUserText(u"UserText");
 
 XMLPageContinuationImportContext::XMLPageContinuationImportContext(
     SvXMLImport& rImport, XMLTextImportHelper& rHlp, sal_uInt16 nPrfx,
@@ -878,8 +878,8 @@ void XMLPageNumberImportContext::PrepareField(
 // Placeholder
 
 
-const OUStringLiteral gsPropertyPlaceholderType("PlaceHolderType");
-const OUStringLiteral gsPropertyPlaceholder("PlaceHolder");
+const OUStringLiteral gsPropertyPlaceholderType(u"PlaceHolderType");
+const OUStringLiteral gsPropertyPlaceholder(u"PlaceHolder");
 
 XMLPlaceholderFieldImportContext::XMLPlaceholderFieldImportContext(
     SvXMLImport& rImport, XMLTextImportHelper& rHlp,
@@ -960,7 +960,7 @@ void XMLPlaceholderFieldImportContext::PrepareField(
 
 // time field
 
-const OUStringLiteral gsPropertyAdjust("Adjust");
+const OUStringLiteral gsPropertyAdjust(u"Adjust");
 
 XMLTimeFieldImportContext::XMLTimeFieldImportContext(
     SvXMLImport& rImport, XMLTextImportHelper& rHlp,
@@ -1136,11 +1136,11 @@ void XMLDateFieldImportContext::ProcessAttribute(
 // database field superclass
 
 
-const OUStringLiteral gsPropertyDataBaseName("DataBaseName");
-const OUStringLiteral gsPropertyDataBaseURL("DataBaseURL");
-const OUStringLiteral gsPropertyTableName("DataTableName");
-const OUStringLiteral gsPropertyDataCommandType("DataCommandType");
-const OUStringLiteral gsPropertyIsVisible("IsVisible");
+const OUStringLiteral gsPropertyDataBaseName(u"DataBaseName");
+const OUStringLiteral gsPropertyDataBaseURL(u"DataBaseURL");
+const OUStringLiteral gsPropertyTableName(u"DataTableName");
+const OUStringLiteral gsPropertyDataCommandType(u"DataCommandType");
+const OUStringLiteral gsPropertyIsVisible(u"IsVisible");
 
 XMLDatabaseFieldImportContext::XMLDatabaseFieldImportContext(
     SvXMLImport& rImport, XMLTextImportHelper& rHlp,
@@ -1604,7 +1604,7 @@ const char* XMLSimpleDocInfoImportContext::MapTokenToServiceName(
 
 // revision field
 
-const OUStringLiteral sPropertyRevision("Revision");
+const OUStringLiteral sPropertyRevision(u"Revision");
 
 XMLRevisionDocInfoImportContext::XMLRevisionDocInfoImportContext(
     SvXMLImport& rImport, XMLTextImportHelper& rHlp, sal_uInt16 nPrfx,
@@ -1874,9 +1874,9 @@ void XMLHiddenParagraphImportContext::PrepareField(
 
 // import conditional text (<text:conditional-text>)
 
-const OUStringLiteral gsPropertyTrueContent("TrueContent");
-const OUStringLiteral gsPropertyFalseContent("FalseContent");
-const OUStringLiteral gsPropertyIsConditionTrue("IsConditionTrue");
+const OUStringLiteral gsPropertyTrueContent(u"TrueContent");
+const OUStringLiteral gsPropertyFalseContent(u"FalseContent");
+const OUStringLiteral gsPropertyIsConditionTrue(u"IsConditionTrue");
 
 XMLConditionalTextImportContext::XMLConditionalTextImportContext(
     SvXMLImport& rImport, XMLTextImportHelper& rHlp,
@@ -2159,8 +2159,8 @@ const SvXMLEnumMapEntry<sal_uInt16> aChapterDisplayMap[] =
     { XML_TOKEN_INVALID, 0 }
 };
 
-const OUStringLiteral gsPropertyChapterFormat("ChapterFormat");
-const OUStringLiteral gsPropertyLevel("Level");
+const OUStringLiteral gsPropertyChapterFormat(u"ChapterFormat");
+const OUStringLiteral gsPropertyLevel(u"Level");
 
 XMLChapterImportContext::XMLChapterImportContext(
     SvXMLImport& rImport, XMLTextImportHelper& rHlp,
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index eead9e4f55e7..70d0d6ef11c1 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -126,82 +126,82 @@ using namespace ::xmloff;
 using namespace ::xmloff::token;
 
 // Implement Title/Description Elements UI (#i73249#)
-const OUStringLiteral gsTitle("Title");
-const OUStringLiteral gsDescription("Description");
-const OUStringLiteral XMLTextParagraphExport::gsAnchorCharStyleName("AnchorCharStyleName");
-const OUStringLiteral gsAnchorPageNo("AnchorPageNo");
-const OUStringLiteral gsAnchorType("AnchorType");
-const OUStringLiteral XMLTextParagraphExport::gsBeginNotice("BeginNotice");
-const OUStringLiteral gsBookmark("Bookmark");
-const OUStringLiteral XMLTextParagraphExport::gsCategory("Category");
-const OUStringLiteral gsChainNextName("ChainNextName");
-const OUStringLiteral XMLTextParagraphExport::gsCharStyleName("CharStyleName");
-const OUStringLiteral XMLTextParagraphExport::gsCharStyleNames("CharStyleNames");
-const OUStringLiteral gsContourPolyPolygon("ContourPolyPolygon");
-const OUStringLiteral gsDocumentIndexMark("DocumentIndexMark");
-const OUStringLiteral XMLTextParagraphExport::gsEndNotice("EndNotice");
-const OUStringLiteral XMLTextParagraphExport::gsFootnote("Footnote");
-const OUStringLiteral XMLTextParagraphExport::gsFootnoteCounting("FootnoteCounting");
-const OUStringLiteral gsFrame("Frame");
-const OUStringLiteral gsGraphicFilter("GraphicFilter");
-const OUStringLiteral gsGraphicRotation("GraphicRotation");
-const OUStringLiteral gsHeight("Height");
-const OUStringLiteral gsHoriOrient("HoriOrient");
-const OUStringLiteral gsHoriOrientPosition("HoriOrientPosition");
-const OUStringLiteral gsHyperLinkName("HyperLinkName");
-const OUStringLiteral gsHyperLinkTarget("HyperLinkTarget");
-const OUStringLiteral gsHyperLinkURL("HyperLinkURL");
-const OUStringLiteral gsIsAutomaticContour("IsAutomaticContour");
-const OUStringLiteral gsIsCollapsed("IsCollapsed");
-const OUStringLiteral gsIsPixelContour("IsPixelContour");
-const OUStringLiteral gsIsStart("IsStart");
-const OUStringLiteral gsIsSyncHeightToWidth("IsSyncHeightToWidth");
-const OUStringLiteral gsIsSyncWidthToHeight("IsSyncWidthToHeight");
-const OUStringLiteral gsNumberingRules("NumberingRules");
-const OUStringLiteral XMLTextParagraphExport::gsNumberingType("NumberingType");
-const OUStringLiteral XMLTextParagraphExport::gsPageDescName("PageDescName");
-const OUStringLiteral XMLTextParagraphExport::gsPageStyleName("PageStyleName");
-const OUStringLiteral gsParaConditionalStyleName("ParaConditionalStyleName");
-const OUStringLiteral gsParagraphService("com.sun.star.text.Paragraph");
-const OUStringLiteral XMLTextParagraphExport::gsParaStyleName("ParaStyleName");
-const OUStringLiteral XMLTextParagraphExport::gsPositionEndOfDoc("PositionEndOfDoc");
-const OUStringLiteral XMLTextParagraphExport::gsPrefix("Prefix");
-const OUStringLiteral gsRedline("Redline");
-const OUStringLiteral XMLTextParagraphExport::gsReferenceId("ReferenceId");
-const OUStringLiteral gsReferenceMark("ReferenceMark");
-const OUStringLiteral gsRelativeHeight("RelativeHeight");
-const OUStringLiteral gsRelativeWidth("RelativeWidth");
-const OUStringLiteral gsRuby("Ruby");
-const OUStringLiteral gsRubyCharStyleName("RubyCharStyleName");
-const OUStringLiteral gsRubyText("RubyText");
-const OUStringLiteral gsServerMap("ServerMap");
-const OUStringLiteral gsShapeService("com.sun.star.drawing.Shape");
-const OUStringLiteral gsSizeType("SizeType");
-const OUStringLiteral gsSoftPageBreak( "SoftPageBreak"  );
-const OUStringLiteral XMLTextParagraphExport::gsStartAt("StartAt");
-const OUStringLiteral XMLTextParagraphExport::gsSuffix("Suffix");
-const OUStringLiteral gsTableService("com.sun.star.text.TextTable");
-const OUStringLiteral gsText("Text");
-const OUStringLiteral gsTextContentService("com.sun.star.text.TextContent");
-const OUStringLiteral gsTextEmbeddedService("com.sun.star.text.TextEmbeddedObject");
-const OUStringLiteral XMLTextParagraphExport::gsTextEndnoteService("com.sun.star.text.Endnote");
-const OUStringLiteral gsTextField("TextField");
-const OUStringLiteral gsTextFieldService("com.sun.star.text.TextField");
-const OUStringLiteral gsTextFrameService("com.sun.star.text.TextFrame");
-const OUStringLiteral gsTextGraphicService("com.sun.star.text.TextGraphicObject");
-const OUStringLiteral gsTextPortionType("TextPortionType");
-const OUStringLiteral XMLTextParagraphExport::gsTextSection("TextSection");
-const OUStringLiteral gsUnvisitedCharStyleName("UnvisitedCharStyleName");
-const OUStringLiteral gsVertOrient("VertOrient");
-const OUStringLiteral gsVertOrientPosition("VertOrientPosition");
-const OUStringLiteral gsVisitedCharStyleName("VisitedCharStyleName");
-const OUStringLiteral gsWidth("Width");
-const OUStringLiteral gsWidthType( "WidthType"  );
-const OUStringLiteral gsTextFieldStart( "TextFieldStart"  );
-const OUStringLiteral gsTextFieldEnd( "TextFieldEnd"  );
-const OUStringLiteral gsTextFieldStartEnd( "TextFieldStartEnd"  );
-
-const OUStringLiteral XMLTextParagraphExport::gsFrameStyleName("FrameStyleName");
+const OUStringLiteral gsTitle(u"Title");
+const OUStringLiteral gsDescription(u"Description");
+const OUStringLiteral XMLTextParagraphExport::gsAnchorCharStyleName(u"AnchorCharStyleName");
+const OUStringLiteral gsAnchorPageNo(u"AnchorPageNo");
+const OUStringLiteral gsAnchorType(u"AnchorType");
+const OUStringLiteral XMLTextParagraphExport::gsBeginNotice(u"BeginNotice");
+const OUStringLiteral gsBookmark(u"Bookmark");
+const OUStringLiteral XMLTextParagraphExport::gsCategory(u"Category");
+const OUStringLiteral gsChainNextName(u"ChainNextName");
+const OUStringLiteral XMLTextParagraphExport::gsCharStyleName(u"CharStyleName");
+const OUStringLiteral XMLTextParagraphExport::gsCharStyleNames(u"CharStyleNames");
+const OUStringLiteral gsContourPolyPolygon(u"ContourPolyPolygon");
+const OUStringLiteral gsDocumentIndexMark(u"DocumentIndexMark");
+const OUStringLiteral XMLTextParagraphExport::gsEndNotice(u"EndNotice");
+const OUStringLiteral XMLTextParagraphExport::gsFootnote(u"Footnote");
+const OUStringLiteral XMLTextParagraphExport::gsFootnoteCounting(u"FootnoteCounting");
+const OUStringLiteral gsFrame(u"Frame");
+const OUStringLiteral gsGraphicFilter(u"GraphicFilter");
+const OUStringLiteral gsGraphicRotation(u"GraphicRotation");
+const OUStringLiteral gsHeight(u"Height");
+const OUStringLiteral gsHoriOrient(u"HoriOrient");
+const OUStringLiteral gsHoriOrientPosition(u"HoriOrientPosition");
+const OUStringLiteral gsHyperLinkName(u"HyperLinkName");
+const OUStringLiteral gsHyperLinkTarget(u"HyperLinkTarget");
+const OUStringLiteral gsHyperLinkURL(u"HyperLinkURL");
+const OUStringLiteral gsIsAutomaticContour(u"IsAutomaticContour");
+const OUStringLiteral gsIsCollapsed(u"IsCollapsed");
+const OUStringLiteral gsIsPixelContour(u"IsPixelContour");
+const OUStringLiteral gsIsStart(u"IsStart");
+const OUStringLiteral gsIsSyncHeightToWidth(u"IsSyncHeightToWidth");
+const OUStringLiteral gsIsSyncWidthToHeight(u"IsSyncWidthToHeight");
+const OUStringLiteral gsNumberingRules(u"NumberingRules");
+const OUStringLiteral XMLTextParagraphExport::gsNumberingType(u"NumberingType");
+const OUStringLiteral XMLTextParagraphExport::gsPageDescName(u"PageDescName");
+const OUStringLiteral XMLTextParagraphExport::gsPageStyleName(u"PageStyleName");
+const OUStringLiteral gsParaConditionalStyleName(u"ParaConditionalStyleName");
+const OUStringLiteral gsParagraphService(u"com.sun.star.text.Paragraph");
+const OUStringLiteral XMLTextParagraphExport::gsParaStyleName(u"ParaStyleName");
+const OUStringLiteral XMLTextParagraphExport::gsPositionEndOfDoc(u"PositionEndOfDoc");
+const OUStringLiteral XMLTextParagraphExport::gsPrefix(u"Prefix");
+const OUStringLiteral gsRedline(u"Redline");
+const OUStringLiteral XMLTextParagraphExport::gsReferenceId(u"ReferenceId");
+const OUStringLiteral gsReferenceMark(u"ReferenceMark");
+const OUStringLiteral gsRelativeHeight(u"RelativeHeight");
+const OUStringLiteral gsRelativeWidth(u"RelativeWidth");
+const OUStringLiteral gsRuby(u"Ruby");
+const OUStringLiteral gsRubyCharStyleName(u"RubyCharStyleName");
+const OUStringLiteral gsRubyText(u"RubyText");
+const OUStringLiteral gsServerMap(u"ServerMap");
+const OUStringLiteral gsShapeService(u"com.sun.star.drawing.Shape");
+const OUStringLiteral gsSizeType(u"SizeType");
+const OUStringLiteral gsSoftPageBreak( u"SoftPageBreak"  );
+const OUStringLiteral XMLTextParagraphExport::gsStartAt(u"StartAt");
+const OUStringLiteral XMLTextParagraphExport::gsSuffix(u"Suffix");
+const OUStringLiteral gsTableService(u"com.sun.star.text.TextTable");
+const OUStringLiteral gsText(u"Text");
+const OUStringLiteral gsTextContentService(u"com.sun.star.text.TextContent");
+const OUStringLiteral gsTextEmbeddedService(u"com.sun.star.text.TextEmbeddedObject");
+const OUStringLiteral XMLTextParagraphExport::gsTextEndnoteService(u"com.sun.star.text.Endnote");
+const OUStringLiteral gsTextField(u"TextField");
+const OUStringLiteral gsTextFieldService(u"com.sun.star.text.TextField");
+const OUStringLiteral gsTextFrameService(u"com.sun.star.text.TextFrame");
+const OUStringLiteral gsTextGraphicService(u"com.sun.star.text.TextGraphicObject");
+const OUStringLiteral gsTextPortionType(u"TextPortionType");
+const OUStringLiteral XMLTextParagraphExport::gsTextSection(u"TextSection");
+const OUStringLiteral gsUnvisitedCharStyleName(u"UnvisitedCharStyleName");
+const OUStringLiteral gsVertOrient(u"VertOrient");
+const OUStringLiteral gsVertOrientPosition(u"VertOrientPosition");
+const OUStringLiteral gsVisitedCharStyleName(u"VisitedCharStyleName");
+const OUStringLiteral gsWidth(u"Width");
+const OUStringLiteral gsWidthType( u"WidthType"  );
+const OUStringLiteral gsTextFieldStart( u"TextFieldStart"  );
+const OUStringLiteral gsTextFieldEnd( u"TextFieldEnd"  );
+const OUStringLiteral gsTextFieldStartEnd( u"TextFieldStartEnd"  );
+
+const OUStringLiteral XMLTextParagraphExport::gsFrameStyleName(u"FrameStyleName");
 
 namespace
 {
diff --git a/xmloff/source/text/txtvfldi.cxx b/xmloff/source/text/txtvfldi.cxx
index 608701482f3f..0cff25fedbb7 100644
--- a/xmloff/source/text/txtvfldi.cxx
+++ b/xmloff/source/text/txtvfldi.cxx
@@ -52,7 +52,7 @@
 
 
 // service names
-const char sAPI_fieldmaster_prefix[] = "com.sun.star.text.FieldMaster.";
+const char16_t sAPI_fieldmaster_prefix[] = u"com.sun.star.text.FieldMaster.";
 const char sAPI_get_expression[]     = "GetExpression";
 const char sAPI_set_expression[]     = "SetExpression";
 const char sAPI_user[]               = "User";