18 files changed, 39 insertions, 39 deletions
diff --git a/sw/source/core/access/acccell.cxx b/sw/source/core/access/acccell.cxx
index 154f4d0fe85f..9d2aa207cfc8 100644
--- a/sw/source/core/access/acccell.cxx
+++ b/sw/source/core/access/acccell.cxx
@@ -50,7 +50,7 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::accessibility;
 using namespace sw::access;
 
-const OUStringLiteral sImplementationName = u"com.sun.star.comp.Writer.SwAccessibleCellView";
+constexpr OUStringLiteral sImplementationName = u"com.sun.star.comp.Writer.SwAccessibleCellView";
 
 bool SwAccessibleCell::IsSelected()
 {
diff --git a/sw/source/core/access/acccontext.hxx b/sw/source/core/access/acccontext.hxx
index 59c4df3962b3..137726a43ed0 100644
--- a/sw/source/core/access/acccontext.hxx
+++ b/sw/source/core/access/acccontext.hxx
@@ -40,7 +40,7 @@ namespace accessibility {
     class AccessibleShape;
 }
 
-inline const OUStringLiteral sAccessibleServiceName = u"com.sun.star.accessibility.Accessible";
+inline constexpr OUStringLiteral sAccessibleServiceName = u"com.sun.star.accessibility.Accessible";
 
 class SwAccessibleContext :
     public ::cppu::WeakImplHelper<
diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx
index 852e537da3ad..a1661bb468d5 100644
--- a/sw/source/core/access/accdoc.cxx
+++ b/sw/source/core/access/accdoc.cxx
@@ -52,8 +52,8 @@
 #include <dview.hxx>
 #include <dcontact.hxx>
 #include <svx/svdmark.hxx>
-const OUStringLiteral sServiceName = u"com.sun.star.text.AccessibleTextDocumentView";
-const OUStringLiteral sImplementationName = u"com.sun.star.comp.Writer.SwAccessibleDocumentView";
+constexpr OUStringLiteral sServiceName = u"com.sun.star.text.AccessibleTextDocumentView";
+constexpr OUStringLiteral sImplementationName = u"com.sun.star.comp.Writer.SwAccessibleDocumentView";
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::accessibility;
diff --git a/sw/source/core/access/accembedded.cxx b/sw/source/core/access/accembedded.cxx
index 6ec441bcef05..7f1b59ffc6c6 100644
--- a/sw/source/core/access/accembedded.cxx
+++ b/sw/source/core/access/accembedded.cxx
@@ -31,7 +31,7 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::accessibility;
 
-const OUStringLiteral sImplementationName = u"com.sun.star.comp.Writer.SwAccessibleEmbeddedObject";
+constexpr OUStringLiteral sImplementationName = u"com.sun.star.comp.Writer.SwAccessibleEmbeddedObject";
 
 SwAccessibleEmbeddedObject::SwAccessibleEmbeddedObject(
         std::shared_ptr<SwAccessibleMap> const& pInitMap,
diff --git a/sw/source/core/access/accfootnote.cxx b/sw/source/core/access/accfootnote.cxx
index 815f26899140..43d8a2b6e10c 100644
--- a/sw/source/core/access/accfootnote.cxx
+++ b/sw/source/core/access/accfootnote.cxx
@@ -33,9 +33,9 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::accessibility;
 
-const OUStringLiteral sImplementationNameFootnote
+constexpr OUStringLiteral sImplementationNameFootnote
     = u"com.sun.star.comp.Writer.SwAccessibleFootnoteView";
-const OUStringLiteral sImplementationNameEndnote
+constexpr OUStringLiteral sImplementationNameEndnote
     = u"com.sun.star.comp.Writer.SwAccessibleEndnoteView";
 
 SwAccessibleFootnote::SwAccessibleFootnote(
diff --git a/sw/source/core/access/accheaderfooter.cxx b/sw/source/core/access/accheaderfooter.cxx
index aa41ac4bd795..bf1f8bf6d2ad 100644
--- a/sw/source/core/access/accheaderfooter.cxx
+++ b/sw/source/core/access/accheaderfooter.cxx
@@ -29,9 +29,9 @@ using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::accessibility;
 
-const OUStringLiteral sImplementationNameHeader
+constexpr OUStringLiteral sImplementationNameHeader
     = u"com.sun.star.comp.Writer.SwAccessibleHeaderView";
-const OUStringLiteral sImplementationNameFooter
+constexpr OUStringLiteral sImplementationNameFooter
     = u"com.sun.star.comp.Writer.SwAccessibleFooterView";
 
 SwAccessibleHeaderFooter::SwAccessibleHeaderFooter(
diff --git a/sw/source/core/access/accpage.cxx b/sw/source/core/access/accpage.cxx
index a01f44ec4f60..2c5d1513a05d 100644
--- a/sw/source/core/access/accpage.cxx
+++ b/sw/source/core/access/accpage.cxx
@@ -32,7 +32,7 @@ using namespace ::com::sun::star::accessibility;
 
 using uno::Sequence;
 
-const OUStringLiteral sImplementationName = u"com.sun.star.comp.Writer.SwAccessiblePageView";
+constexpr OUStringLiteral sImplementationName = u"com.sun.star.comp.Writer.SwAccessiblePageView";
 
 bool SwAccessiblePage::IsSelected()
 {
diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx
index 49291ed0c44a..29bd4be8a1e0 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -111,8 +111,8 @@ namespace com::sun::star::text {
     class XText;
 }
 
-const OUStringLiteral sServiceName = u"com.sun.star.text.AccessibleParagraphView";
-const OUStringLiteral sImplementationName = u"com.sun.star.comp.Writer.SwAccessibleParagraphView";
+constexpr OUStringLiteral sServiceName = u"com.sun.star.text.AccessibleParagraphView";
+constexpr OUStringLiteral sImplementationName = u"com.sun.star.comp.Writer.SwAccessibleParagraphView";
 
 OUString const & SwAccessibleParagraph::GetString()
 {
diff --git a/sw/source/core/access/accpreview.cxx b/sw/source/core/access/accpreview.cxx
index 75ad890d590a..503cc543ece9 100644
--- a/sw/source/core/access/accpreview.cxx
+++ b/sw/source/core/access/accpreview.cxx
@@ -22,7 +22,7 @@
 #include <strings.hrc>
 #include "accpreview.hxx"
 
-const OUStringLiteral sImplementationName
+constexpr OUStringLiteral sImplementationName
     = u"com.sun.star.comp.Writer.SwAccessibleDocumentPageView";
 
 using ::com::sun::star::uno::Sequence;
diff --git a/sw/source/core/access/acctable.cxx b/sw/source/core/access/acctable.cxx
index 1c731d684b29..c9de6594f484 100644
--- a/sw/source/core/access/acctable.cxx
+++ b/sw/source/core/access/acctable.cxx
@@ -1731,7 +1731,7 @@ uno::Reference< XAccessibleTable >
 
 OUString SAL_CALL SwAccessibleTableColHeaders::getImplementationName()
 {
-    static const OUStringLiteral sImplName
+    static constexpr OUStringLiteral sImplName
         = u"com.sun.star.comp.Writer.SwAccessibleTableColumnHeadersView";
     return sImplName;
 }
diff --git a/sw/source/core/crsr/crossrefbookmark.cxx b/sw/source/core/crsr/crossrefbookmark.cxx
index 5090f2024d0a..55b77bf4ccb3 100644
--- a/sw/source/core/crsr/crossrefbookmark.cxx
+++ b/sw/source/core/crsr/crossrefbookmark.cxx
@@ -27,7 +27,7 @@
 
 namespace
 {
-    const OUStringLiteral CrossRefNumItemBookmark_NamePrefix = u"__RefNumPara__";
+    constexpr OUStringLiteral CrossRefNumItemBookmark_NamePrefix = u"__RefNumPara__";
 }
 
 namespace sw::mark
diff --git a/sw/source/core/swg/SwXMLTextBlocks1.cxx b/sw/source/core/swg/SwXMLTextBlocks1.cxx
index be9f13410419..75786448d64b 100644
--- a/sw/source/core/swg/SwXMLTextBlocks1.cxx
+++ b/sw/source/core/swg/SwXMLTextBlocks1.cxx
@@ -44,7 +44,7 @@
 #include <sfx2/event.hxx>
 #include <swerror.h>
 
-const OUStringLiteral XMLN_BLOCKLIST = u"BlockList.xml";
+constexpr OUStringLiteral XMLN_BLOCKLIST = u"BlockList.xml";
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx b/sw/source/core/text/EnhancedPDFExportHelper.cxx
index 048fcd0e8e37..a908e63326d5 100644
--- a/sw/source/core/text/EnhancedPDFExportHelper.cxx
+++ b/sw/source/core/text/EnhancedPDFExportHelper.cxx
@@ -145,14 +145,14 @@ const char aH3String[] = "H3";
 const char aH4String[] = "H4";
 const char aH5String[] = "H5";
 const char aH6String[] = "H6";
-const OUStringLiteral aListString = u"L";
-const OUStringLiteral aListItemString = u"LI";
-const OUStringLiteral aListBodyString = u"LBody";
+constexpr OUStringLiteral aListString = u"L";
+constexpr OUStringLiteral aListItemString = u"LI";
+constexpr OUStringLiteral aListBodyString = u"LBody";
 const char aBlockQuoteString[] = "BlockQuote";
 const char aCaptionString[] = "Caption";
 const char aIndexString[] = "Index";
 const char aTOCString[] = "TOC";
-const OUStringLiteral aTOCIString = u"TOCI";
+constexpr OUStringLiteral aTOCIString = u"TOCI";
 const char aTableString[] = "Table";
 const char aTRString[] = "TR";
 const char aTDString[] = "TD";
diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx
index 7165aa9749f2..187bd0b513f3 100644
--- a/sw/source/filter/ww8/ww8scan.hxx
+++ b/sw/source/filter/ww8/ww8scan.hxx
@@ -41,14 +41,14 @@ class SvStream;
 //Commonly used string literals for stream and storage names in word docs
 namespace SL
 {
-    inline const OUStringLiteral aObjectPool = u"ObjectPool";
-    inline const OUStringLiteral a1Table = u"1Table";
-    inline const OUStringLiteral a0Table = u"0Table";
-    inline const OUStringLiteral aData = u"Data";
-    inline const OUStringLiteral aCheckBox = u"CheckBox";
-    inline const OUStringLiteral aListBox = u"ListBox";
-    inline const OUStringLiteral aTextField = u"TextField";
-    inline const OUStringLiteral aMSMacroCmds = u"MSMacroCmds";
+    inline constexpr OUStringLiteral aObjectPool = u"ObjectPool";
+    inline constexpr OUStringLiteral a1Table = u"1Table";
+    inline constexpr OUStringLiteral a0Table = u"0Table";
+    inline constexpr OUStringLiteral aData = u"Data";
+    inline constexpr OUStringLiteral aCheckBox = u"CheckBox";
+    inline constexpr OUStringLiteral aListBox = u"ListBox";
+    inline constexpr OUStringLiteral aTextField = u"TextField";
+    inline constexpr OUStringLiteral aMSMacroCmds = u"MSMacroCmds";
 }
 
 struct SprmInfo
diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.cxx b/sw/source/filter/xml/XMLRedlineImportHelper.cxx
index 9568b1b681a1..34cf4ac4b6d0 100644
--- a/sw/source/filter/xml/XMLRedlineImportHelper.cxx
+++ b/sw/source/filter/xml/XMLRedlineImportHelper.cxx
@@ -231,9 +231,9 @@ RedlineInfo::~RedlineInfo()
     delete pNextRedline;
 }
 
-const OUStringLiteral g_sShowChanges = u"ShowChanges";
-const OUStringLiteral g_sRecordChanges = u"RecordChanges";
-const OUStringLiteral g_sRedlineProtectionKey = u"RedlineProtectionKey";
+constexpr OUStringLiteral g_sShowChanges = u"ShowChanges";
+constexpr OUStringLiteral g_sRecordChanges = u"RecordChanges";
+constexpr OUStringLiteral g_sRedlineProtectionKey = u"RedlineProtectionKey";
 
 XMLRedlineImportHelper::XMLRedlineImportHelper(
     SvXMLImport & rImport,
diff --git a/sw/source/ui/vba/vbalisthelper.cxx b/sw/source/ui/vba/vbalisthelper.cxx
index 4e863236931f..a6597a539145 100644
--- a/sw/source/ui/vba/vbalisthelper.cxx
+++ b/sw/source/ui/vba/vbalisthelper.cxx
@@ -31,12 +31,12 @@ using namespace ::com::sun::star;
 
 const sal_Int32 LIST_LEVEL_COUNT = 9;
 
-const OUStringLiteral UNO_NAME_PARENT_NUMBERING = u"ParentNumbering";
-const OUStringLiteral UNO_NAME_PREFIX = u"Prefix";
-const OUStringLiteral UNO_NAME_SUFFIX = u"Suffix";
-const OUStringLiteral UNO_NAME_CHAR_STYLE_NAME = u"CharStyleName";
-const OUStringLiteral UNO_NAME_NUMBERING_TYPE = u"NumberingType";
-const OUStringLiteral UNO_NAME_BULLET_CHAR = u"BulletChar";
+constexpr OUStringLiteral UNO_NAME_PARENT_NUMBERING = u"ParentNumbering";
+constexpr OUStringLiteral UNO_NAME_PREFIX = u"Prefix";
+constexpr OUStringLiteral UNO_NAME_SUFFIX = u"Suffix";
+constexpr OUStringLiteral UNO_NAME_CHAR_STYLE_NAME = u"CharStyleName";
+constexpr OUStringLiteral UNO_NAME_NUMBERING_TYPE = u"NumberingType";
+constexpr OUStringLiteral UNO_NAME_BULLET_CHAR = u"BulletChar";
 
 const sal_Unicode CHAR_CLOSED_DOT[] = u"\u2022";
 const char CHAR_EMPTY_DOT[] = "o";
diff --git a/sw/source/uibase/app/applab.cxx b/sw/source/uibase/app/applab.cxx
index 4c3a8c1a4b56..1bd34c590ede 100644
--- a/sw/source/uibase/app/applab.cxx
+++ b/sw/source/uibase/app/applab.cxx
@@ -61,7 +61,7 @@
 
 using namespace ::com::sun::star;
 
-const OUStringLiteral MASTER_LABEL = u"MasterLabel";
+constexpr OUStringLiteral MASTER_LABEL = u"MasterLabel";
 
 static const SwFrameFormat *lcl_InsertBCText( SwWrtShell& rSh, const SwLabItem& rItem,
                         SwFrameFormat &rFormat,
diff --git a/sw/source/uibase/utlui/unotools.cxx b/sw/source/uibase/utlui/unotools.cxx
index f1f41ecb4bd2..166ec51aaadb 100644
--- a/sw/source/uibase/utlui/unotools.cxx
+++ b/sw/source/uibase/utlui/unotools.cxx
@@ -52,7 +52,7 @@
 
 using namespace ::com::sun::star;
 
-const OUStringLiteral cFactory = u"private:factory/swriter";
+constexpr OUStringLiteral cFactory = u"private:factory/swriter";
 
 static void disableScrollBars(uno::Reference< beans::XPropertySet > const & xViewProps,
     bool bEnableOnlineMode)