7 files changed, 23 insertions, 23 deletions
diff --git a/xmloff/source/style/XMLPageExport.cxx b/xmloff/source/style/XMLPageExport.cxx
index 27bbfbb942f5..640e11b7094d 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( u"IsPhysical" );
-const OUStringLiteral gsFollowStyle( u"FollowStyle" );
+constexpr OUStringLiteral gsIsPhysical( u"IsPhysical" );
+constexpr OUStringLiteral gsFollowStyle( u"FollowStyle" );
 
 namespace {
 
diff --git a/xmloff/source/style/numehelp.cxx b/xmloff/source/style/numehelp.cxx
index d1479cf0c4cc..3d46adcb575e 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(u"StandardFormat");
-const OUStringLiteral gsType(u"Type");
-const OUStringLiteral gsCurrencySymbol(u"CurrencySymbol");
-const OUStringLiteral gsCurrencyAbbreviation(u"CurrencyAbbreviation");
+constexpr OUStringLiteral gsStandardFormat(u"StandardFormat");
+constexpr OUStringLiteral gsType(u"Type");
+constexpr OUStringLiteral gsCurrencySymbol(u"CurrencySymbol");
+constexpr 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 48cbeca9edad..2d2ef1b4b047 100644
--- a/xmloff/source/style/prstylei.cxx
+++ b/xmloff/source/style/prstylei.cxx
@@ -143,8 +143,8 @@ namespace
 
 
 
-const OUStringLiteral gsIsPhysical(  u"IsPhysical"  );
-const OUStringLiteral gsFollowStyle(  u"FollowStyle"  );
+constexpr OUStringLiteral gsIsPhysical(  u"IsPhysical"  );
+constexpr OUStringLiteral gsFollowStyle(  u"FollowStyle"  );
 
 XMLPropStyleContext::XMLPropStyleContext( SvXMLImport& rImport,
         SvXMLStylesContext& rStyles, XmlStyleFamily nFamily,
diff --git a/xmloff/source/style/styleexp.cxx b/xmloff/source/style/styleexp.cxx
index 66cab27c9d19..c87d3e3edff6 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( u"IsPhysical" );
-const OUStringLiteral gsIsAutoUpdate( u"IsAutoUpdate" );
-const OUStringLiteral gsFollowStyle( u"FollowStyle" );
-const OUStringLiteral gsNumberingStyleName( u"NumberingStyleName" );
-const OUStringLiteral gsOutlineLevel( u"OutlineLevel" );
+constexpr OUStringLiteral gsIsPhysical( u"IsPhysical" );
+constexpr OUStringLiteral gsIsAutoUpdate( u"IsAutoUpdate" );
+constexpr OUStringLiteral gsFollowStyle( u"FollowStyle" );
+constexpr OUStringLiteral gsNumberingStyleName( u"NumberingStyleName" );
+constexpr OUStringLiteral gsOutlineLevel( u"OutlineLevel" );
 
 XMLStyleExport::XMLStyleExport(
         SvXMLExport& rExp,
diff --git a/xmloff/source/style/xmlnume.cxx b/xmloff/source/style/xmlnume.cxx
index 9dd157122b1a..2aac21253218 100644
--- a/xmloff/source/style/xmlnume.cxx
+++ b/xmloff/source/style/xmlnume.cxx
@@ -606,9 +606,9 @@ void SvxXMLNumRuleExport::exportLevelStyle( sal_Int32 nLevel,
 }
 
 
-const OUStringLiteral gsNumberingRules( u"NumberingRules" );
-const OUStringLiteral gsIsPhysical( u"IsPhysical" );
-const OUStringLiteral gsIsContinuousNumbering( u"IsContinuousNumbering" );
+constexpr OUStringLiteral gsNumberingRules( u"NumberingRules" );
+constexpr OUStringLiteral gsIsPhysical( u"IsPhysical" );
+constexpr 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 bed36cb693da..73e3d1e2b3c5 100644
--- a/xmloff/source/style/xmlnumi.cxx
+++ b/xmloff/source/style/xmlnumi.cxx
@@ -228,8 +228,8 @@ public:
     }
 };
 
-const OUStringLiteral gsStarBats( u"StarBats"  );
-const OUStringLiteral gsStarMath( u"StarMath"  );
+constexpr OUStringLiteral gsStarBats( u"StarBats"  );
+constexpr OUStringLiteral gsStarMath( u"StarMath"  );
 
 SvxXMLListLevelStyleContext_Impl::SvxXMLListLevelStyleContext_Impl(
         SvXMLImport& rImport, sal_Int32 nElement,
@@ -918,9 +918,9 @@ void SvxXMLListStyleContext::SetAttribute( sal_uInt16 nPrefixKey,
     }
 }
 
-const OUStringLiteral sIsPhysical( u"IsPhysical"  );
-const OUStringLiteral sNumberingRules( u"NumberingRules"  );
-const OUStringLiteral sIsContinuousNumbering( u"IsContinuousNumbering"  );
+constexpr OUStringLiteral sIsPhysical( u"IsPhysical"  );
+constexpr OUStringLiteral sNumberingRules( u"NumberingRules"  );
+constexpr OUStringLiteral sIsContinuousNumbering( u"IsContinuousNumbering"  );
 
 SvxXMLListStyleContext::SvxXMLListStyleContext( SvXMLImport& rImport,
         bool bOutl )
diff --git a/xmloff/source/style/xmlstyle.cxx b/xmloff/source/style/xmlstyle.cxx
index 67909f15fb96..2a8e44b21285 100644
--- a/xmloff/source/style/xmlstyle.cxx
+++ b/xmloff/source/style/xmlstyle.cxx
@@ -59,8 +59,8 @@ using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::style;
 using namespace ::xmloff::token;
 
-const OUStringLiteral gsParaStyleServiceName( u"com.sun.star.style.ParagraphStyle" );
-const OUStringLiteral gsTextStyleServiceName( u"com.sun.star.style.CharacterStyle" );
+constexpr OUStringLiteral gsParaStyleServiceName( u"com.sun.star.style.ParagraphStyle" );
+constexpr OUStringLiteral gsTextStyleServiceName( u"com.sun.star.style.CharacterStyle" );
 
 void SvXMLStyleContext::SetAttribute( sal_uInt16 nPrefixKey,
                                       const OUString& rLocalName,