Improved loplugin:stringconstant (now that GCC 7 supports it): sw

Change-Id: I135d01abc52ab5e97b4b360763c8a7e3ddaf0d2d Reviewed-on: https://gerrit.libreoffice.org/76639 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
author: Stephan Bergmann <sbergman@redhat.com> 2019-07-30 17:47:50 +0200
committer: Stephan Bergmann <sbergman@redhat.com> 2019-07-31 12:54:02 +0200
commit: 39642d415cd70165574f91500801d3b49c65d646 (patch)
tree: ac78afa2a06066dc9a7c2b53853694eef56926a5
parent: 0f11e746c8ab74f7495c29a9287da361e469689c (diff)
132 files changed, 276 insertions, 279 deletions
diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx b/sw/qa/extras/inc/swmodeltestbase.hxx
index fd42a91936ba..a9542ae116fb 100644
--- a/sw/qa/extras/inc/swmodeltestbase.hxx
+++ b/sw/qa/extras/inc/swmodeltestbase.hxx
@@ -65,7 +65,7 @@ using namespace css;
 #define DECLARE_SW_ROUNDTRIP_TEST(TestName, filename, password, BaseClass) \
     class TestName : public BaseClass { \
         protected:\
-    virtual OUString getTestName() override { return OUString(#TestName); } \
+    virtual OUString getTestName() override { return #TestName; } \
         public:\
     CPPUNIT_TEST_SUITE(TestName); \
     CPPUNIT_TEST(Import); \
@@ -86,7 +86,7 @@ using namespace css;
 #define DECLARE_SW_EXPORTONLY_TEST(TestName, filename, password, BaseClass) \
     class TestName : public BaseClass { \
         protected:\
-    virtual OUString getTestName() override { return OUString(#TestName); } \
+    virtual OUString getTestName() override { return #TestName; } \
         public:\
     CPPUNIT_TEST_SUITE(TestName); \
     CPPUNIT_TEST(Import_Export_Import); \
@@ -113,7 +113,7 @@ using namespace css;
 #define DECLARE_SW_IMPORT_TEST(TestName, filename, password, BaseClass) \
     class TestName : public BaseClass { \
         protected:\
-    virtual OUString getTestName() override { return OUString(#TestName); } \
+    virtual OUString getTestName() override { return #TestName; } \
         public:\
     CPPUNIT_TEST_SUITE(TestName); \
     CPPUNIT_TEST(Import); \
@@ -130,7 +130,7 @@ using namespace css;
 #define DECLARE_SW_EXPORT_TEST(TestName, filename, password, BaseClass) \
     class TestName : public BaseClass { \
         protected:\
-    virtual OUString getTestName() override { return OUString(#TestName); } \
+    virtual OUString getTestName() override { return #TestName; } \
         public:\
     CPPUNIT_TEST_SUITE(TestName); \
     CPPUNIT_TEST(Import_Export); \
diff --git a/sw/qa/extras/mailmerge/mailmerge.cxx b/sw/qa/extras/mailmerge/mailmerge.cxx
index 139a13a24dd7..51d80cea19ca 100644
--- a/sw/qa/extras/mailmerge/mailmerge.cxx
+++ b/sw/qa/extras/mailmerge/mailmerge.cxx
@@ -297,7 +297,7 @@ protected:
 #define DECLARE_MAILMERGE_TEST(TestName, filename, datasource, tablename, file, BaseClass, selection, column) \
     class TestName : public BaseClass { \
     protected: \
-        virtual OUString getTestName() override { return OUString(#TestName); } \
+        virtual OUString getTestName() override { return #TestName; } \
     public: \
         CPPUNIT_TEST_SUITE(TestName); \
         CPPUNIT_TEST(MailMerge); \
diff --git a/sw/qa/extras/ooxmlexport/ooxmllinks.cxx b/sw/qa/extras/ooxmlexport/ooxmllinks.cxx
index c08b6f194feb..dc5deaf30df4 100644
--- a/sw/qa/extras/ooxmlexport/ooxmllinks.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmllinks.cxx
@@ -26,7 +26,7 @@
     class TestName : public Test                                                                   \
     {                                                                                              \
     protected:                                                                                     \
-        virtual OUString getTestName() override { return OUString(#TestName); }                    \
+        virtual OUString getTestName() override { return #TestName; }                    \
         virtual void postLoad(const char*) override                                                \
         {                                                                                          \
             if (!bUseTempDir)                                                                      \
@@ -90,7 +90,7 @@
     class TestName : public Test                                                                   \
     {                                                                                              \
     protected:                                                                                     \
-        virtual OUString getTestName() override { return OUString(#TestName); }                    \
+        virtual OUString getTestName() override { return #TestName; }                    \
                                                                                                    \
     public:                                                                                        \
         CPPUNIT_TEST_SUITE(TestName);                                                              \
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx
index 316cfc06f7d5..3155cf9f0a73 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -757,10 +757,7 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf105511)
 {
     struct DefaultLocale : public comphelper::ConfigurationProperty<DefaultLocale, OUString>
     {
-        static OUString path()
-        {
-            return OUString("/org.openoffice.Office.Linguistic/General/DefaultLocale");
-        }
+        static OUString path() { return "/org.openoffice.Office.Linguistic/General/DefaultLocale"; }
         ~DefaultLocale() = delete;
     };
     auto batch = comphelper::ConfigurationChanges::create();
diff --git a/sw/source/core/access/acccell.cxx b/sw/source/core/access/acccell.cxx
index b229b466ff78..d979723a4894 100644
--- a/sw/source/core/access/acccell.cxx
+++ b/sw/source/core/access/acccell.cxx
@@ -240,7 +240,7 @@ OUString SAL_CALL SwAccessibleCell::getAccessibleDescription()
 
 OUString SAL_CALL SwAccessibleCell::getImplementationName()
 {
-    return OUString(sImplementationName);
+    return sImplementationName;
 }
 
 sal_Bool SAL_CALL SwAccessibleCell::supportsService(const OUString& sTestServiceName)
diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx
index bd180490d608..78b5c2757141 100644
--- a/sw/source/core/access/accdoc.cxx
+++ b/sw/source/core/access/accdoc.cxx
@@ -425,7 +425,7 @@ IMPL_LINK( SwAccessibleDocument, WindowChildEventListener, VclWindowEvent&, rEve
 
 OUString SAL_CALL SwAccessibleDocument::getImplementationName()
 {
-    return OUString(sImplementationName);
+    return sImplementationName;
 }
 
 sal_Bool SAL_CALL SwAccessibleDocument::supportsService(const OUString& sTestServiceName)
diff --git a/sw/source/core/access/accembedded.cxx b/sw/source/core/access/accembedded.cxx
index a9ee92d26531..dccad7083e86 100644
--- a/sw/source/core/access/accembedded.cxx
+++ b/sw/source/core/access/accembedded.cxx
@@ -74,7 +74,7 @@ void SAL_CALL
 
 OUString SAL_CALL SwAccessibleEmbeddedObject::getImplementationName()
 {
-    return OUString(sImplementationName);
+    return sImplementationName;
 }
 
 sal_Bool SAL_CALL SwAccessibleEmbeddedObject::supportsService(const OUString& sTestServiceName)
diff --git a/sw/source/core/access/accfootnote.cxx b/sw/source/core/access/accfootnote.cxx
index 14ff4d43f889..14fb78525736 100644
--- a/sw/source/core/access/accfootnote.cxx
+++ b/sw/source/core/access/accfootnote.cxx
@@ -89,9 +89,9 @@ OUString SAL_CALL SwAccessibleFootnote::getAccessibleDescription()
 OUString SAL_CALL SwAccessibleFootnote::getImplementationName()
 {
     if( AccessibleRole::END_NOTE == GetRole() )
-        return OUString(sImplementationNameEndnote);
+        return sImplementationNameEndnote;
     else
-        return OUString(sImplementationNameFootnote);
+        return sImplementationNameFootnote;
 }
 
 sal_Bool SAL_CALL SwAccessibleFootnote::supportsService(const OUString& sTestServiceName)
diff --git a/sw/source/core/access/accgraphic.cxx b/sw/source/core/access/accgraphic.cxx
index f7a87f3423de..01a6c1ca2338 100644
--- a/sw/source/core/access/accgraphic.cxx
+++ b/sw/source/core/access/accgraphic.cxx
@@ -43,7 +43,7 @@ SwAccessibleGraphic::~SwAccessibleGraphic()
 
 OUString SAL_CALL SwAccessibleGraphic::getImplementationName()
 {
-    return OUString("com.sun.star.comp.Writer.SwAccessibleGraphic");
+    return "com.sun.star.comp.Writer.SwAccessibleGraphic";
 }
 
 sal_Bool SAL_CALL SwAccessibleGraphic::supportsService(const OUString& sTestServiceName)
diff --git a/sw/source/core/access/accheaderfooter.cxx b/sw/source/core/access/accheaderfooter.cxx
index 46508ef60eb6..b20027d2e5a0 100644
--- a/sw/source/core/access/accheaderfooter.cxx
+++ b/sw/source/core/access/accheaderfooter.cxx
@@ -73,9 +73,9 @@ OUString SAL_CALL SwAccessibleHeaderFooter::getAccessibleDescription()
 OUString SAL_CALL SwAccessibleHeaderFooter::getImplementationName()
 {
     if( AccessibleRole::HEADER == GetRole() )
-        return OUString(sImplementationNameHeader);
+        return sImplementationNameHeader;
     else
-        return OUString(sImplementationNameFooter);
+        return sImplementationNameFooter;
 }
 
 sal_Bool SAL_CALL SwAccessibleHeaderFooter::supportsService(const OUString& sTestServiceName)
diff --git a/sw/source/core/access/accpage.cxx b/sw/source/core/access/accpage.cxx
index 03810cc3bba1..a3022f9e5d5c 100644
--- a/sw/source/core/access/accpage.cxx
+++ b/sw/source/core/access/accpage.cxx
@@ -133,7 +133,7 @@ bool SwAccessiblePage::HasCursor()
 
 OUString SwAccessiblePage::getImplementationName( )
 {
-    return OUString(sImplementationName);
+    return sImplementationName;
 }
 
 sal_Bool SwAccessiblePage::supportsService( const OUString& rServiceName)
diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx
index 9574855492e8..e6c038924705 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -879,7 +879,7 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::getBackground()
 
 OUString SAL_CALL SwAccessibleParagraph::getImplementationName()
 {
-    return OUString(sImplementationName);
+    return sImplementationName;
 }
 
 sal_Bool SAL_CALL SwAccessibleParagraph::supportsService(
diff --git a/sw/source/core/access/accpreview.cxx b/sw/source/core/access/accpreview.cxx
index aca49e10284e..0bb2131e15d4 100644
--- a/sw/source/core/access/accpreview.cxx
+++ b/sw/source/core/access/accpreview.cxx
@@ -40,7 +40,7 @@ SwAccessiblePreview::~SwAccessiblePreview()
 
 OUString SwAccessiblePreview::getImplementationName( )
 {
-    return OUString( sImplementationName );
+    return sImplementationName;
 }
 
 sal_Bool SwAccessiblePreview::supportsService( const OUString& rServiceName )
diff --git a/sw/source/core/access/acctable.cxx b/sw/source/core/access/acctable.cxx
index b9c80cbe5aa7..63e0c406765b 100644
--- a/sw/source/core/access/acctable.cxx
+++ b/sw/source/core/access/acctable.cxx
@@ -1230,7 +1230,7 @@ sal_Int32 SAL_CALL SwAccessibleTable::getAccessibleColumn(
 
 OUString SAL_CALL SwAccessibleTable::getImplementationName()
 {
-    return OUString("com.sun.star.comp.Writer.SwAccessibleTableView");
+    return "com.sun.star.comp.Writer.SwAccessibleTableView";
 }
 
 sal_Bool SAL_CALL SwAccessibleTable::supportsService(
@@ -1807,7 +1807,7 @@ uno::Reference< XAccessibleTable >
 OUString SAL_CALL SwAccessibleTableColHeaders::getImplementationName()
 {
     static const sal_Char sImplName[] = "com.sun.star.comp.Writer.SwAccessibleTableColumnHeadersView";
-    return OUString(sImplName);
+    return sImplName;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/access/acctextframe.cxx b/sw/source/core/access/acctextframe.cxx
index 024a8861c114..b5732d1d2b72 100644
--- a/sw/source/core/access/acctextframe.cxx
+++ b/sw/source/core/access/acctextframe.cxx
@@ -264,7 +264,7 @@ OUString SAL_CALL SwAccessibleTextFrame::getAccessibleDescription()
 
 OUString SAL_CALL SwAccessibleTextFrame::getImplementationName()
 {
-    return OUString("com.sun.star.comp.Writer.SwAccessibleTextFrameView");
+    return "com.sun.star.comp.Writer.SwAccessibleTextFrameView";
 }
 
 sal_Bool SAL_CALL SwAccessibleTextFrame::supportsService(const OUString& sTestServiceName)
diff --git a/sw/source/core/doc/dbgoutsw.cxx b/sw/source/core/doc/dbgoutsw.cxx
index 7f5339a7206d..2d8ea2516fa7 100644
--- a/sw/source/core/doc/dbgoutsw.cxx
+++ b/sw/source/core/doc/dbgoutsw.cxx
@@ -806,30 +806,30 @@ static OUString lcl_TokenType2Str(FormTokenType nType)
     switch(nType)
     {
     case TOKEN_ENTRY_NO:
-        return OUString("NO");
+        return "NO";
     case TOKEN_ENTRY_TEXT:
-        return OUString("ENTRY_TEXT");
+        return "ENTRY_TEXT";
     case TOKEN_ENTRY:
-        return OUString("ENTRY");
+        return "ENTRY";
     case TOKEN_TAB_STOP:
-        return OUString("TAB_STOP");
+        return "TAB_STOP";
     case TOKEN_TEXT:
-        return OUString("TOKEN_TEXT");
+        return "TOKEN_TEXT";
     case TOKEN_PAGE_NUMS:
-        return OUString("NUMS");
+        return "NUMS";
     case TOKEN_CHAPTER_INFO:
-        return OUString("CHAPTER_INFO");
+        return "CHAPTER_INFO";
     case TOKEN_LINK_START:
-        return OUString("LINK_START");
+        return "LINK_START";
     case TOKEN_LINK_END:
-        return OUString("LINK_END");
+        return "LINK_END";
     case TOKEN_AUTHORITY:
-        return OUString("AUTHORITY");
+        return "AUTHORITY";
     case TOKEN_END:
-        return OUString("END");
+        return "END";
     default:
         OSL_FAIL("should not be reached");
-        return OUString("??");
+        return "??";
     }
 }
 
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index 7828fba9e62c..6bd6ee148427 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -1789,7 +1789,7 @@ OUString SwDoc::GetPaMDescr(const SwPaM & rPam)
         return SwResId(STR_PARAGRAPHS);
     }
 
-    return OUString("??");
+    return "??";
 }
 
 bool SwDoc::ContainsHiddenChars() const
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index ecd9b2774937..571c219faec9 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -516,7 +516,7 @@ IDocumentMarkAccess::MarkType IDocumentMarkAccess::GetType(const IMark& rBkmk)
 
 OUString IDocumentMarkAccess::GetCrossRefHeadingBookmarkNamePrefix()
 {
-    return OUString("__RefHeading__");
+    return "__RefHeading__";
 }
 
 bool IDocumentMarkAccess::IsLegalPaMForCrossRefHeadingBookmark( const SwPaM& rPaM )
diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx
index ac882f6f2a9e..dc438629e487 100644
--- a/sw/source/core/doc/number.cxx
+++ b/sw/source/core/doc/number.cxx
@@ -77,7 +77,7 @@ const sal_uInt16 SwNumRule::maDefNumIndents[ MAXLEVEL ] = {
 
 OUString SwNumRule::GetOutlineRuleName()
 {
-    return OUString("Outline");
+    return "Outline";
 }
 
 const SwNumFormat& SwNumRule::Get( sal_uInt16 i ) const
diff --git a/sw/source/core/docnode/finalthreadmanager.cxx b/sw/source/core/docnode/finalthreadmanager.cxx
index 495c1b1041a3..3d9eb3859acd 100644
--- a/sw/source/core/docnode/finalthreadmanager.cxx
+++ b/sw/source/core/docnode/finalthreadmanager.cxx
@@ -274,7 +274,7 @@ FinalThreadManager::~FinalThreadManager()
 // com.sun.star.uno.XServiceInfo:
 OUString SAL_CALL FinalThreadManager::getImplementationName()
 {
-    return OUString("com.sun.star.util.comp.FinalThreadManager");
+    return "com.sun.star.util.comp.FinalThreadManager";
 }
 
 sal_Bool SAL_CALL FinalThreadManager::supportsService(OUString const & serviceName)
diff --git a/sw/source/core/layout/dumpfilter.cxx b/sw/source/core/layout/dumpfilter.cxx
index 37fcded5e262..4078784fef11 100644
--- a/sw/source/core/layout/dumpfilter.cxx
+++ b/sw/source/core/layout/dumpfilter.cxx
@@ -139,7 +139,7 @@ namespace sw
     // XServiceInfo
     OUString LayoutDumpFilter::getImplementationName(  )
     {
-        return OUString( "com.sun.star.comp.Writer.LayoutDump" );
+        return "com.sun.star.comp.Writer.LayoutDump";
     }
 
     sal_Bool LayoutDumpFilter::supportsService( const OUString& rServiceName )
diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx
index f72bcc964567..8591b3fb7a89 100644
--- a/sw/source/core/tox/tox.cxx
+++ b/sw/source/core/tox/tox.cxx
@@ -499,16 +499,16 @@ void SwForm::AdjustTabStops( SwDoc const & rDoc ) // #i21237#
     }
 }
 
-OUString SwForm::GetFormEntry()       {return OUString("<E>");}
-OUString SwForm::GetFormTab()         {return OUString("<T>");}
-OUString SwForm::GetFormPageNums()    {return OUString("<#>");}
-OUString SwForm::GetFormLinkStt()     {return OUString("<LS>");}
-OUString SwForm::GetFormLinkEnd()     {return OUString("<LE>");}
-OUString SwForm::GetFormEntryNum()    {return OUString("<E#>");}
-OUString SwForm::GetFormEntryText()    {return OUString("<ET>");}
-OUString SwForm::GetFormChapterMark() {return OUString("<C>");}
-OUString SwForm::GetFormText()        {return OUString("<X>");}
-OUString SwForm::GetFormAuth()        {return OUString("<A>");}
+OUString SwForm::GetFormEntry()       {return "<E>";}
+OUString SwForm::GetFormTab()         {return "<T>";}
+OUString SwForm::GetFormPageNums()    {return "<#>";}
+OUString SwForm::GetFormLinkStt()     {return "<LS>";}
+OUString SwForm::GetFormLinkEnd()     {return "<LE>";}
+OUString SwForm::GetFormEntryNum()    {return "<E#>";}
+OUString SwForm::GetFormEntryText()    {return "<ET>";}
+OUString SwForm::GetFormChapterMark() {return "<C>";}
+OUString SwForm::GetFormText()        {return "<X>";}
+OUString SwForm::GetFormAuth()        {return "<A>";}
 
 SwTOXBase::SwTOXBase(const SwTOXType* pTyp, const SwForm& rForm,
                      SwTOXElement nCreaType, const OUString& rTitle )
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index cced7186d49e..d7a80654ff11 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -4517,17 +4517,17 @@ OUString SwTextNode::GetLabelFollowedBy() const
             {
                 case SvxNumberFormat::LISTTAB:
                 {
-                    return OUString("\t");
+                    return "\t";
                 }
                 break;
                 case SvxNumberFormat::SPACE:
                 {
-                    return OUString(" ");
+                    return " ";
                 }
                 break;
                 case SvxNumberFormat::NEWLINE:
                 {
-                    return OUString("\n");
+                    return "\n";
                 }
                 break;
                 case SvxNumberFormat::NOTHING:
diff --git a/sw/source/core/undo/SwRewriter.cxx b/sw/source/core/undo/SwRewriter.cxx
index da3df123c41f..05566a1bd2f3 100644
--- a/sw/source/core/undo/SwRewriter.cxx
+++ b/sw/source/core/undo/SwRewriter.cxx
@@ -57,15 +57,15 @@ OUString SwRewriter::GetPlaceHolder(SwUndoArg eId)
     switch (eId)
     {
         case UndoArg1:
-            return OUString("$1");
+            return "$1";
         case UndoArg2:
-            return OUString("$2");
+            return "$2";
         case UndoArg3:
-            return OUString("$3");
+            return "$3";
         default:
             break;
     }
-    return OUString("$1");
+    return "$1";
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx
index 612ca3500bc3..fccab47e8f27 100644
--- a/sw/source/core/undo/undobj.cxx
+++ b/sw/source/core/undo/undobj.cxx
@@ -362,7 +362,7 @@ OUString GetUndoComment(SwUndoId eId)
             break;
         case SwUndoId::REDLINE:
             SAL_INFO("sw.core", "Should NEVER be used/translated");
-            return OUString("$1");
+            return "$1";
         case SwUndoId::ACCEPT_REDLINE:
             pId = STR_ACCEPT_REDLINE;
             break;
diff --git a/sw/source/core/unocore/SwXTextDefaults.cxx b/sw/source/core/unocore/SwXTextDefaults.cxx
index 41c094d6fb96..0403a2b9cb58 100644
--- a/sw/source/core/unocore/SwXTextDefaults.cxx
+++ b/sw/source/core/unocore/SwXTextDefaults.cxx
@@ -214,7 +214,7 @@ Any SAL_CALL SwXTextDefaults::getPropertyDefault( const OUString& rPropertyName
 
 OUString SAL_CALL SwXTextDefaults::getImplementationName(  )
 {
-    return OUString("SwXTextDefaults");
+    return "SwXTextDefaults";
 }
 
 sal_Bool SAL_CALL SwXTextDefaults::supportsService( const OUString& rServiceName )
diff --git a/sw/source/core/unocore/unobkm.cxx b/sw/source/core/unocore/unobkm.cxx
index 85596ca25611..51d303b43102 100644
--- a/sw/source/core/unocore/unobkm.cxx
+++ b/sw/source/core/unocore/unobkm.cxx
@@ -358,7 +358,7 @@ void SAL_CALL SwXBookmark::setName(const OUString& rName)
 OUString SAL_CALL
 SwXBookmark::getImplementationName()
 {
-    return OUString("SwXBookmark");
+    return "SwXBookmark";
 }
 
 sal_Bool SAL_CALL SwXBookmark::supportsService(const OUString& rServiceName)
diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx
index b8b4cf4a7148..49d6a9b72c0a 100644
--- a/sw/source/core/unocore/unochart.cxx
+++ b/sw/source/core/unocore/unochart.cxx
@@ -1409,7 +1409,7 @@ void SAL_CALL SwChartDataProvider::removeEventListener(
 
 OUString SAL_CALL SwChartDataProvider::getImplementationName(  )
 {
-    return OUString("SwChartDataProvider");
+    return "SwChartDataProvider";
 }
 
 sal_Bool SAL_CALL SwChartDataProvider::supportsService(const OUString& rServiceName )
@@ -1775,7 +1775,7 @@ uno::Sequence< uno::Reference< chart2::data::XLabeledDataSequence > > SAL_CALL S
 
 OUString SAL_CALL SwChartDataSource::getImplementationName(  )
 {
-    return OUString("SwChartDataSource");
+    return "SwChartDataSource";
 }
 
 sal_Bool SAL_CALL SwChartDataSource::supportsService(const OUString& rServiceName )
@@ -2172,7 +2172,7 @@ void SAL_CALL SwChartDataSequence::removeVetoableChangeListener(
 
 OUString SAL_CALL SwChartDataSequence::getImplementationName(  )
 {
-    return OUString("SwChartDataSequence");
+    return "SwChartDataSequence";
 }
 
 sal_Bool SAL_CALL SwChartDataSequence::supportsService(const OUString& rServiceName )
@@ -2646,7 +2646,7 @@ uno::Reference< util::XCloneable > SAL_CALL SwChartLabeledDataSequence::createCl
 
 OUString SAL_CALL SwChartLabeledDataSequence::getImplementationName(  )
 {
-    return OUString("SwChartLabeledDataSequence");
+    return "SwChartLabeledDataSequence";
 }
 
 sal_Bool SAL_CALL SwChartLabeledDataSequence::supportsService(
diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx
index e9c1a8ba7c27..787f38918915 100644
--- a/sw/source/core/unocore/unocoll.cxx
+++ b/sw/source/core/unocore/unocoll.cxx
@@ -966,7 +966,7 @@ sal_Bool SwXTextTables::hasElements()
 
 OUString SwXTextTables::getImplementationName()
 {
-    return OUString("SwXTextTables");
+    return "SwXTextTables";
 }
 
 sal_Bool SwXTextTables::supportsService(const OUString& rServiceName)
@@ -1119,7 +1119,7 @@ Any SwXFrameEnumeration<T>::nextElement()
 template<FlyCntType T>
 OUString SwXFrameEnumeration<T>::getImplementationName()
 {
-    return OUString("SwXFrameEnumeration");
+    return "SwXFrameEnumeration";
 }
 
 template<FlyCntType T>
@@ -1136,7 +1136,7 @@ Sequence< OUString > SwXFrameEnumeration<T>::getSupportedServiceNames()
 
 OUString SwXFrames::getImplementationName()
 {
-    return OUString("SwXFrames");
+    return "SwXFrames";
 }
 
 sal_Bool SwXFrames::supportsService(const OUString& rServiceName)
@@ -1284,7 +1284,7 @@ sal_Bool SwXFrames::hasElements()
 
 OUString SwXTextFrames::getImplementationName()
 {
-    return OUString("SwXTextFrames");
+    return "SwXTextFrames";
 }
 
 sal_Bool SwXTextFrames::supportsService(const OUString& rServiceName)
@@ -1309,7 +1309,7 @@ SwXTextFrames::~SwXTextFrames()
 
 OUString SwXTextGraphicObjects::getImplementationName()
 {
-    return OUString("SwXTextGraphicObjects");
+    return "SwXTextGraphicObjects";
 }
 
 sal_Bool SwXTextGraphicObjects::supportsService(const OUString& rServiceName)
@@ -1334,7 +1334,7 @@ SwXTextGraphicObjects::~SwXTextGraphicObjects()
 
 OUString SwXTextEmbeddedObjects::getImplementationName()
 {
-    return OUString("SwXTextEmbeddedObjects");
+    return "SwXTextEmbeddedObjects";
 }
 
 sal_Bool SwXTextEmbeddedObjects::supportsService(const OUString& rServiceName)
@@ -1359,7 +1359,7 @@ SwXTextEmbeddedObjects::~SwXTextEmbeddedObjects()
 
 OUString SwXTextSections::getImplementationName()
 {
-    return OUString("SwXTextSections");
+    return "SwXTextSections";
 }
 
 sal_Bool SwXTextSections::supportsService(const OUString& rServiceName)
@@ -1535,7 +1535,7 @@ uno::Reference< XTextSection >  SwXTextSections::GetObject( SwSectionFormat& rFo
 
 OUString SwXBookmarks::getImplementationName()
 {
-    return OUString("SwXBookmarks");
+    return "SwXBookmarks";
 }
 
 sal_Bool SwXBookmarks::supportsService(const OUString& rServiceName)
@@ -1734,7 +1734,7 @@ sal_Bool SwXNumberingRulesCollection::hasElements()
 
 OUString SwXFootnotes::getImplementationName()
 {
-    return OUString("SwXFootnotes");
+    return "SwXFootnotes";
 }
 
 sal_Bool SwXFootnotes::supportsService(const OUString& rServiceName)
@@ -1830,7 +1830,7 @@ Reference<XFootnote>    SwXFootnotes::GetObject( SwDoc& rDoc, const SwFormatFoot
 
 OUString SwXReferenceMarks::getImplementationName()
 {
-    return OUString("SwXReferenceMarks");
+    return "SwXReferenceMarks";
 }
 
 sal_Bool SwXReferenceMarks::supportsService(const OUString& rServiceName)
diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx
index cc7b7e79ea5d..f3f4dfbf4115 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -440,7 +440,7 @@ uno::Any SwXShapesEnumeration::nextElement()
 
 OUString SwXShapesEnumeration::getImplementationName()
 {
-    return OUString("SwXShapeEnumeration");
+    return "SwXShapeEnumeration";
 }
 
 sal_Bool SwXShapesEnumeration::supportsService(const OUString& ServiceName)
@@ -462,7 +462,7 @@ uno::Reference< container::XEnumeration > SwXDrawPage::createEnumeration()
 
 OUString SwXDrawPage::getImplementationName()
 {
-    return OUString("SwXDrawPage");
+    return "SwXDrawPage";
 }
 
 sal_Bool SwXDrawPage::supportsService(const OUString& rServiceName)
@@ -2146,7 +2146,7 @@ void SwXShape::removeEventListener(
 
 OUString SwXShape::getImplementationName()
 {
-    return OUString("SwXShape");
+    return "SwXShape";
 }
 
 sal_Bool SwXShape::supportsService(const OUString& rServiceName)
diff --git a/sw/source/core/unocore/unoevent.cxx b/sw/source/core/unocore/unoevent.cxx
index d3ddb75ed719..9ba8268f7fbe 100644
--- a/sw/source/core/unocore/unoevent.cxx
+++ b/sw/source/core/unocore/unoevent.cxx
@@ -106,7 +106,7 @@ SwHyperlinkEventDescriptor::~SwHyperlinkEventDescriptor()
 
 OUString SwHyperlinkEventDescriptor::getImplementationName()
 {
-    return OUString("SwHyperlinkEventDescriptor");
+    return "SwHyperlinkEventDescriptor";
 }
 
 void SwHyperlinkEventDescriptor::copyMacrosFromINetFormat(
@@ -227,7 +227,7 @@ const SvxMacroItem& SwFrameStyleEventDescriptor::getMacroItem()
 
 OUString SwFrameStyleEventDescriptor::getImplementationName()
 {
-    return OUString("SwFrameStyleEventDescriptor");
+    return "SwFrameStyleEventDescriptor";
 }
 
 sal_uInt16 SwFrameStyleEventDescriptor::getMacroItemWhich() const
diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx
index dbfb80be713b..9f4c674438dd 100644
--- a/sw/source/core/unocore/unofield.cxx
+++ b/sw/source/core/unocore/unofield.cxx
@@ -489,7 +489,7 @@ SwXFieldMaster::getSomething(const uno::Sequence< sal_Int8 >& rId)
 OUString SAL_CALL
 SwXFieldMaster::getImplementationName()
 {
-    return OUString("SwXFieldMaster");
+    return "SwXFieldMaster";
 }
 
 namespace
@@ -2612,7 +2612,7 @@ void SAL_CALL SwXTextField::update()
 
 OUString SAL_CALL SwXTextField::getImplementationName()
 {
-    return OUString("SwXTextField");
+    return "SwXTextField";
 }
 
 static OUString OldNameToNewName_Impl( const OUString &rOld )
@@ -2691,7 +2691,7 @@ const SwField* SwXTextField::Impl::GetField() const
 
 OUString SwXTextFieldMasters::getImplementationName()
 {
-    return OUString("SwXTextFieldMasters");
+    return "SwXTextFieldMasters";
 }
 
 sal_Bool SwXTextFieldMasters::supportsService(const OUString& rServiceName)
@@ -2890,7 +2890,7 @@ public:
 
 OUString SwXTextFieldTypes::getImplementationName()
 {
-    return OUString("SwXTextFieldTypes");
+    return "SwXTextFieldTypes";
 }
 
 sal_Bool SwXTextFieldTypes::supportsService(const OUString& rServiceName)
@@ -2997,7 +2997,7 @@ public:
 OUString SAL_CALL
 SwXFieldEnumeration::getImplementationName()
 {
-    return OUString("SwXFieldEnumeration");
+    return "SwXFieldEnumeration";
 }
 
 sal_Bool SAL_CALL SwXFieldEnumeration::supportsService(const OUString& rServiceName)
diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx
index 68a305f40dc8..7ddce70a4793 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -1186,7 +1186,7 @@ sal_Int64 SAL_CALL SwXFrame::getSomething( const ::uno::Sequence< sal_Int8 >& rI
 
 OUString SwXFrame::getImplementationName()
 {
-    return OUString("SwXFrame");
+    return "SwXFrame";
 }
 
 sal_Bool SwXFrame::supportsService(const OUString& rServiceName)
@@ -3130,7 +3130,7 @@ void SwXFrame::setSize(const awt::Size& aSize)
 
 OUString SwXFrame::getShapeType()
 {
-    return OUString("FrameShape");
+    return "FrameShape";
 }
 
 SwXTextFrame::SwXTextFrame( SwDoc *_pDoc ) :
@@ -3331,7 +3331,7 @@ void SwXTextFrame::removeEventListener(const uno::Reference< lang::XEventListene
 
 OUString SwXTextFrame::getImplementationName()
 {
-    return OUString("SwXTextFrame");
+    return "SwXTextFrame";
 }
 
 sal_Bool SwXTextFrame::supportsService(const OUString& rServiceName)
@@ -3403,7 +3403,7 @@ SwXTextGraphicObject::CreateXTextGraphicObject(SwDoc & rDoc, SwFrameFormat *cons
 
 OUString SwXTextGraphicObject::getImplementationName()
 {
-    return OUString("SwXTextGraphicObject");
+    return "SwXTextGraphicObject";
 }
 
 sal_Bool SwXTextGraphicObject::supportsService(const OUString& rServiceName)
@@ -3541,7 +3541,7 @@ uno::Reference< graphic::XGraphic > SAL_CALL SwXTextEmbeddedObject::getReplaceme
 
 OUString SwXTextEmbeddedObject::getImplementationName()
 {
-    return OUString("SwXTextEmbeddedObject");
+    return "SwXTextEmbeddedObject";
 }
 
 sal_Bool SwXTextEmbeddedObject::supportsService(const OUString& rServiceName)
diff --git a/sw/source/core/unocore/unoftn.cxx b/sw/source/core/unocore/unoftn.cxx
index 3318bcce85a0..d8bf523b3a42 100644
--- a/sw/source/core/unocore/unoftn.cxx
+++ b/sw/source/core/unocore/unoftn.cxx
@@ -191,7 +191,7 @@ SwXFootnote::getSomething(const uno::Sequence< sal_Int8 >& rId)
 OUString SAL_CALL
 SwXFootnote::getImplementationName()
 {
-    return OUString("SwXFootnote");
+    return "SwXFootnote";
 }
 
 static char const*const g_ServicesFootnote[] =
diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx
index d8c0f3a538c2..83a521bd03e6 100644
--- a/sw/source/core/unocore/unoidx.cxx
+++ b/sw/source/core/unocore/unoidx.cxx
@@ -444,7 +444,7 @@ SwXDocumentIndex::getSomething(const uno::Sequence< sal_Int8 >& rId)
 OUString SAL_CALL
 SwXDocumentIndex::getImplementationName()
 {
-    return OUString("SwXDocumentIndex");
+    return "SwXDocumentIndex";
 }
 
 sal_Bool SAL_CALL
@@ -1672,7 +1672,7 @@ SwXDocumentIndexMark::getSomething(const uno::Sequence< sal_Int8 >& rId)
 OUString SAL_CALL
 SwXDocumentIndexMark::getImplementationName()
 {
-    return OUString("SwXDocumentIndexMark");
+    return "SwXDocumentIndexMark";
 }
 
 sal_Bool SAL_CALL SwXDocumentIndexMark::supportsService(const OUString& rServiceName)
@@ -2331,7 +2331,7 @@ SwXDocumentIndexes::~SwXDocumentIndexes()
 OUString SAL_CALL
 SwXDocumentIndexes::getImplementationName()
 {
-    return OUString("SwXDocumentIndexes");
+    return "SwXDocumentIndexes";
 }
 
 sal_Bool SAL_CALL SwXDocumentIndexes::supportsService(const OUString& rServiceName)
@@ -2510,7 +2510,7 @@ SwXDocumentIndex::StyleAccess_Impl::~StyleAccess_Impl()
 OUString SAL_CALL
 SwXDocumentIndex::StyleAccess_Impl::getImplementationName()
 {
-    return OUString("SwXDocumentIndex::StyleAccess_Impl");
+    return "SwXDocumentIndex::StyleAccess_Impl";
 }
 
 sal_Bool SAL_CALL
@@ -2623,7 +2623,7 @@ SwXDocumentIndex::TokenAccess_Impl::~TokenAccess_Impl()
 OUString SAL_CALL
 SwXDocumentIndex::TokenAccess_Impl::getImplementationName()
 {
-    return OUString("SwXDocumentIndex::TokenAccess_Impl");
+    return "SwXDocumentIndex::TokenAccess_Impl";
 }
 
 sal_Bool SAL_CALL SwXDocumentIndex::TokenAccess_Impl::supportsService(
diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx
index cc13a87a6767..7da731df197a 100644
--- a/sw/source/core/unocore/unoobj.cxx
+++ b/sw/source/core/unocore/unoobj.cxx
@@ -832,7 +832,7 @@ bool SwXTextCursor::IsAtEndOfMeta() const
 
 OUString SwXTextCursor::getImplementationName()
 {
-    return OUString("SwXTextCursor");
+    return "SwXTextCursor";
 }
 
 sal_Bool SAL_CALL SwXTextCursor::supportsService(const OUString& rServiceName)
diff --git a/sw/source/core/unocore/unoobj2.cxx b/sw/source/core/unocore/unoobj2.cxx
index ade11e8a1e0b..0ab716c8bd27 100644
--- a/sw/source/core/unocore/unoobj2.cxx
+++ b/sw/source/core/unocore/unoobj2.cxx
@@ -480,7 +480,7 @@ struct SwXParagraphEnumerationImpl final : public SwXParagraphEnumeration
 
     // XServiceInfo
     virtual OUString SAL_CALL getImplementationName() override
-        { return OUString("SwXParagraphEnumeration"); }
+        { return "SwXParagraphEnumeration"; }
     virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName) override
         { return cppu::supportsService(this, rServiceName); };
     virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override
@@ -863,7 +863,7 @@ SwXTextRange::getSomething(const uno::Sequence< sal_Int8 >& rId)
 OUString SAL_CALL
 SwXTextRange::getImplementationName()
 {
-    return OUString("SwXTextRange");
+    return "SwXTextRange";
 }
 
 sal_Bool SAL_CALL SwXTextRange::supportsService(const OUString& rServiceName)
@@ -1448,7 +1448,7 @@ struct SwXTextRangesImpl final : public SwXTextRanges
 
     // XServiceInfo
     virtual OUString SAL_CALL getImplementationName() override
-        { return OUString("SwXTextRanges"); };
+        { return "SwXTextRanges"; };
     virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName) override
         { return cppu::supportsService(this, rServiceName); };
     virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override
@@ -1566,7 +1566,7 @@ struct SwXParaFrameEnumerationImpl final : public SwXParaFrameEnumeration
 {
     // XServiceInfo
     virtual OUString SAL_CALL getImplementationName() override
-        { return OUString("SwXParaFrameEnumeration"); };
+        { return "SwXParaFrameEnumeration"; };
     virtual sal_Bool SAL_CALL supportsService(const OUString& rServiceName) override
         { return cppu::supportsService(this, rServiceName); };
     virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override
diff --git a/sw/source/core/unocore/unoparagraph.cxx b/sw/source/core/unocore/unoparagraph.cxx
index f7c7949b1e34..c88dc6850400 100644
--- a/sw/source/core/unocore/unoparagraph.cxx
+++ b/sw/source/core/unocore/unoparagraph.cxx
@@ -300,7 +300,7 @@ SwXParagraph::getSomething(const uno::Sequence< sal_Int8 >& rId)
 OUString SAL_CALL
 SwXParagraph::getImplementationName()
 {
-    return OUString("SwXParagraph");
+    return "SwXParagraph";
 }
 
 sal_Bool SAL_CALL
diff --git a/sw/source/core/unocore/unoportenum.cxx b/sw/source/core/unocore/unoportenum.cxx
index 2152029a3972..b80c9d5dd8ac 100644
--- a/sw/source/core/unocore/unoportenum.cxx
+++ b/sw/source/core/unocore/unoportenum.cxx
@@ -321,7 +321,7 @@ sal_Int64 SAL_CALL SwXTextPortionEnumeration::getSomething(
 
 OUString SwXTextPortionEnumeration::getImplementationName()
 {
-    return OUString("SwXTextPortionEnumeration");
+    return "SwXTextPortionEnumeration";
 }
 
 sal_Bool
diff --git a/sw/source/core/unocore/unoredlines.cxx b/sw/source/core/unocore/unoredlines.cxx
index 5776064cd7a9..1f44b26c02dd 100644
--- a/sw/source/core/unocore/unoredlines.cxx
+++ b/sw/source/core/unocore/unoredlines.cxx
@@ -91,7 +91,7 @@ sal_Bool SwXRedlines::hasElements(  )
 
 OUString SwXRedlines::getImplementationName()
 {
-    return OUString("SwXRedlines");
+    return "SwXRedlines";
 }
 
 sal_Bool SwXRedlines::supportsService(const OUString& ServiceName)
@@ -146,7 +146,7 @@ uno::Any SwXRedlineEnumeration::nextElement()
 
 OUString SwXRedlineEnumeration::getImplementationName()
 {
-    return OUString("SwXRedlineEnumeration");
+    return "SwXRedlineEnumeration";
 }
 
 sal_Bool SwXRedlineEnumeration::supportsService(const OUString& ServiceName)
diff --git a/sw/source/core/unocore/unorefmk.cxx b/sw/source/core/unocore/unorefmk.cxx
index fe3b7f207bfb..24cb9c5213bc 100644
--- a/sw/source/core/unocore/unorefmk.cxx
+++ b/sw/source/core/unocore/unorefmk.cxx
@@ -169,7 +169,7 @@ SwXReferenceMark::getSomething(const uno::Sequence< sal_Int8 >& rId)
 
 OUString SAL_CALL SwXReferenceMark::getImplementationName()
 {
-    return OUString("SwXReferenceMark");
+    return "SwXReferenceMark";
 }
 
 sal_Bool SAL_CALL
@@ -860,7 +860,7 @@ SwXMeta::getSomething( const uno::Sequence< sal_Int8 > & i_rId )
 OUString SAL_CALL
 SwXMeta::getImplementationName()
 {
-    return OUString("SwXMeta");
+    return "SwXMeta";
 }
 
 sal_Bool SAL_CALL
@@ -1266,7 +1266,7 @@ SwXMetaField::~SwXMetaField()
 OUString SAL_CALL
 SwXMetaField::getImplementationName()
 {
-    return OUString("SwXMetaField");
+    return "SwXMetaField";
 }
 
 sal_Bool SAL_CALL
diff --git a/sw/source/core/unocore/unosect.cxx b/sw/source/core/unocore/unosect.cxx
index ca2c3968165c..142c1e475881 100644
--- a/sw/source/core/unocore/unosect.cxx
+++ b/sw/source/core/unocore/unosect.cxx
@@ -1694,7 +1694,7 @@ void SAL_CALL SwXTextSection::setName(const OUString& rName)
 OUString SAL_CALL
 SwXTextSection::getImplementationName()
 {
-    return OUString("SwXTextSection");
+    return "SwXTextSection";
 }
 
 sal_Bool SAL_CALL SwXTextSection::supportsService(const OUString& rServiceName)
diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx
index 8a8a798dd0fd..44ff7e1268d2 100644
--- a/sw/source/core/unocore/unosett.cxx
+++ b/sw/source/core/unocore/unosett.cxx
@@ -278,7 +278,7 @@ const unsigned short aUnoToSvxAdjust[] =
 
 OUString SwXFootnoteProperties::getImplementationName()
 {
-    return OUString("SwXFootnoteProperties");
+    return "SwXFootnoteProperties";
 }
 
 sal_Bool SwXFootnoteProperties::supportsService(const OUString& rServiceName)
@@ -558,7 +558,7 @@ void SwXFootnoteProperties::removeVetoableChangeListener(
 
 OUString SwXEndnoteProperties::getImplementationName()
 {
-    return OUString("SwXEndnoteProperties");
+    return "SwXEndnoteProperties";
 }
 
 sal_Bool SwXEndnoteProperties::supportsService(const OUString& rServiceName)
@@ -761,7 +761,7 @@ void SwXEndnoteProperties::removeVetoableChangeListener(const OUString& /*Proper
 
 OUString SwXLineNumberingProperties::getImplementationName()
 {
-    return OUString("SwXLineNumberingProperties");
+    return "SwXLineNumberingProperties";
 }
 
 sal_Bool SwXLineNumberingProperties::supportsService(const OUString& rServiceName)
@@ -1051,7 +1051,7 @@ sal_Int64 SwXNumberingRules::getSomething( const uno::Sequence< sal_Int8 > & rId
 
 OUString SwXNumberingRules::getImplementationName()
 {
-    return OUString("SwXNumberingRules");
+    return "SwXNumberingRules";
 }
 
 sal_Bool SwXNumberingRules::supportsService(const OUString& rServiceName)
@@ -2254,7 +2254,7 @@ void SwXNumberingRules::Impl::Notify(const SfxHint& rHint)
 
 OUString SwXChapterNumbering::getImplementationName()
 {
-    return OUString("SwXChapterNumbering");
+    return "SwXChapterNumbering";
 }
 
 sal_Bool SwXChapterNumbering::supportsService(const OUString& rServiceName)
@@ -2282,7 +2282,7 @@ SwXChapterNumbering::~SwXChapterNumbering()
 
 OUString SwXTextColumns::getImplementationName()
 {
-    return OUString("SwXTextColumns");
+    return "SwXTextColumns";
 }
 
 sal_Bool SwXTextColumns::supportsService(const OUString& rServiceName)
diff --git a/sw/source/core/unocore/unosrch.cxx b/sw/source/core/unocore/unosrch.cxx
index 93dee1364529..43774ff58ba6 100644
--- a/sw/source/core/unocore/unosrch.cxx
+++ b/sw/source/core/unocore/unosrch.cxx
@@ -642,7 +642,7 @@ bool    SwXTextSearch::HasReplaceAttributes() const
 
 OUString SwXTextSearch::getImplementationName()
 {
-    return OUString("SwXTextSearch");
+    return "SwXTextSearch";
 }
 
 sal_Bool SwXTextSearch::supportsService(const OUString& rServiceName)
diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index b5e79f67a4dd..c8c7782fecea 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -1268,7 +1268,7 @@ uno::Any SwXCell::GetAny() const
 }
 
 OUString SwXCell::getImplementationName()
-    { return OUString("SwXCell"); }
+    { return "SwXCell"; }
 
 sal_Bool SwXCell::supportsService(const OUString& rServiceName)
     { return cppu::supportsService(this, rServiceName); }
@@ -1277,7 +1277,7 @@ uno::Sequence< OUString > SwXCell::getSupportedServiceNames()
     { return {"com.sun.star.text.CellProperties"}; }
 
 OUString SwXTextTableRow::getImplementationName()
-    { return OUString("SwXTextTableRow"); }
+    { return "SwXTextTableRow"; }
 
 sal_Bool SwXTextTableRow::supportsService(const OUString& rServiceName)
     { return cppu::supportsService(this, rServiceName); }
@@ -1463,7 +1463,7 @@ SwTableLine* SwXTextTableRow::FindLine(SwTable* pTable, SwTableLine const * pLin
 // SwXTextTableCursor
 
 OUString SwXTextTableCursor::getImplementationName()
-    { return OUString("SwXTextTableCursor"); }
+    { return "SwXTextTableCursor"; }
 
 sal_Bool SwXTextTableCursor::supportsService(const OUString& rServiceName)
     { return cppu::supportsService(this, rServiceName); }
@@ -3144,7 +3144,7 @@ void SwXTextTable::Impl::Notify(const SfxHint& rHint)
 }
 
 OUString SAL_CALL SwXTextTable::getImplementationName()
-    { return OUString("SwXTextTable"); }
+    { return "SwXTextTable"; }
 
 sal_Bool SwXTextTable::supportsService(const OUString& rServiceName)
     { return cppu::supportsService(this, rServiceName); }
@@ -3233,7 +3233,7 @@ sal_Int64 SAL_CALL SwXCellRange::getSomething( const uno::Sequence< sal_Int8 >&
 
 
 OUString SwXCellRange::getImplementationName()
-    { return OUString("SwXCellRange"); }
+    { return "SwXCellRange"; }
 
 sal_Bool SwXCellRange::supportsService(const OUString& rServiceName)
     { return cppu::supportsService(this, rServiceName); }
@@ -3906,7 +3906,7 @@ public:
 //  SwXTableRows
 
 OUString SwXTableRows::getImplementationName()
-    { return OUString("SwXTableRows"); }
+    { return "SwXTableRows"; }
 
 sal_Bool SwXTableRows::supportsService(const OUString& rServiceName)
     { return cppu::supportsService(this, rServiceName); }
@@ -4074,7 +4074,7 @@ class SwXTableColumns::Impl : public SvtListener
 };
 
 OUString SwXTableColumns::getImplementationName()
-    { return OUString("SwXTableColumns"); }
+    { return "SwXTableColumns"; }
 
 sal_Bool SwXTableColumns::supportsService(const OUString& rServiceName)
     { return cppu::supportsService(this, rServiceName); }
diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx
index 040291d51652..a9dd85aed58a 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -2237,7 +2237,7 @@ SwXBodyText::~SwXBodyText()
 OUString SAL_CALL
 SwXBodyText::getImplementationName()
 {
-    return OUString("SwXBodyText");
+    return "SwXBodyText";
 }
 
 sal_Bool SAL_CALL SwXBodyText::supportsService(const OUString& rServiceName)
diff --git a/sw/source/filter/basflt/iodetect.cxx b/sw/source/filter/basflt/iodetect.cxx
index 738c56f57769..741f4b4d4240 100644
--- a/sw/source/filter/basflt/iodetect.cxx
+++ b/sw/source/filter/basflt/iodetect.cxx
@@ -59,9 +59,9 @@ const OUString SwIoSystem::GetSubStorageName( const SfxFilter& rFltr )
     if (rUserData == FILTER_XML ||
         rUserData == FILTER_XMLV ||
         rUserData == FILTER_XMLVW)
-        return OUString("content.xml");
+        return "content.xml";
     if (rUserData == sWW6 || rUserData == FILTER_WW8)
-        return OUString("WordDocument");
+        return "WordDocument";
     return OUString();
 }
 
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index fab97d156c78..1672cc95e557 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -487,15 +487,15 @@ static OString convertToOOXMLVertOrient(sal_Int16 nOrient)
     {
         case text::VertOrientation::CENTER:
         case text::VertOrientation::LINE_CENTER:
-            return OString( "center" );
+            return "center";
         case text::VertOrientation::BOTTOM:
-            return OString( "bottom" );
+            return "bottom";
         case text::VertOrientation::LINE_BOTTOM:
-            return OString( "outside" );
+            return "outside";
         case text::VertOrientation::TOP:
-            return OString( "top" );
+            return "top";
         case text::VertOrientation::LINE_TOP:
-            return OString( "inside" );
+            return "inside";
         default:
             return OString();
     }
@@ -506,16 +506,16 @@ static OString convertToOOXMLHoriOrient(sal_Int16 nOrient, bool bIsPosToggle)
     switch( nOrient )
     {
         case text::HoriOrientation::LEFT:
-            return OString( bIsPosToggle ? "inside" : "left" );
+            return bIsPosToggle ? "inside" : "left";
         case text::HoriOrientation::INSIDE:
-            return OString( "inside" );
+            return "inside";
         case text::HoriOrientation::RIGHT:
-            return OString( bIsPosToggle ? "outside" : "right" );
+            return bIsPosToggle ? "outside" : "right";
         case text::HoriOrientation::OUTSIDE:
-            return OString( "outside" );
+            return "outside";
         case text::HoriOrientation::CENTER:
         case text::HoriOrientation::FULL:
-            return OString( "center" );
+            return "center";
         default:
             return OString();
     }
@@ -526,13 +526,13 @@ static OString convertToOOXMLVertOrientRel(sal_Int16 nOrientRel)
     switch (nOrientRel)
     {
         case text::RelOrientation::PAGE_PRINT_AREA:
-            return OString("margin");
+            return "margin";
         case text::RelOrientation::PAGE_FRAME:
-            return OString("page");
+            return "page";
         case text::RelOrientation::FRAME:
         case text::RelOrientation::TEXT_LINE:
         default:
-            return OString("text");
+            return "text";
     }
 }
 
@@ -541,14 +541,14 @@ static OString convertToOOXMLHoriOrientRel(sal_Int16 nOrientRel)
     switch (nOrientRel)
     {
         case text::RelOrientation::PAGE_PRINT_AREA:
-            return OString("margin");
+            return "margin";
         case text::RelOrientation::PAGE_FRAME:
-            return OString("page");
+            return "page";
         case text::RelOrientation::CHAR:
         case text::RelOrientation::PAGE_RIGHT:
         case text::RelOrientation::FRAME:
         default:
-            return OString("text");
+            return "text";
     }
 }
 
@@ -6510,22 +6510,22 @@ OString DocxAttributeOutput::TransHighlightColor( sal_uInt8 nIco )
 {
     switch (nIco)
     {
-        case 1: return OString("black"); break;
-        case 2: return OString("blue"); break;
-        case 3: return OString("cyan"); break;
-        case 4: return OString("green"); break;
-        case 5: return OString("magenta"); break;
-        case 6: return OString("red"); break;
-        case 7: return OString("yellow"); break;
-        case 8: return OString("white"); break;
-        case 9: return OString("darkBlue"); break;
-        case 10: return OString("darkCyan"); break;
-        case 11: return OString("darkGreen"); break;
-        case 12: return OString("darkMagenta"); break;
-        case 13: return OString("darkRed"); break;
-        case 14: return OString("darkYellow"); break;
-        case 15: return OString("darkGray"); break;
-        case 16: return OString("lightGray"); break;
+        case 1: return "black"; break;
+        case 2: return "blue"; break;
+        case 3: return "cyan"; break;
+        case 4: return "green"; break;
+        case 5: return "magenta"; break;
+        case 6: return "red"; break;
+        case 7: return "yellow"; break;
+        case 8: return "white"; break;
+        case 9: return "darkBlue"; break;
+        case 10: return "darkCyan"; break;
+        case 11: return "darkGreen"; break;
+        case 12: return "darkMagenta"; break;
+        case 13: return "darkRed"; break;
+        case 14: return "darkYellow"; break;
+        case 15: return "darkGray"; break;
+        case 16: return "lightGray"; break;
         default: return OString(); break;
     }
 }
diff --git a/sw/source/filter/ww8/docxexportfilter.cxx b/sw/source/filter/ww8/docxexportfilter.cxx
index cf3163c9f362..6adb879e4e28 100644
--- a/sw/source/filter/ww8/docxexportfilter.cxx
+++ b/sw/source/filter/ww8/docxexportfilter.cxx
@@ -99,7 +99,7 @@ bool DocxExportFilter::exportDocument()
 
 OUString DocxExportFilter::getImplementationName()
 {
-    return OUString("com.sun.star.comp.Writer.DocxExport");
+    return "com.sun.star.comp.Writer.DocxExport";
 }
 
 extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface*
diff --git a/sw/source/filter/ww8/writerwordglue.cxx b/sw/source/filter/ww8/writerwordglue.cxx
index c802760b4cdf..f994ab9c3f2c 100644
--- a/sw/source/filter/ww8/writerwordglue.cxx
+++ b/sw/source/filter/ww8/writerwordglue.cxx
@@ -317,7 +317,7 @@ namespace myImplHelpers
     static OUString FindBestMSSubstituteFont(const OUString &rFont)
     {
         if (IsStarSymbol(rFont))
-            return OUString("Arial Unicode MS");
+            return "Arial Unicode MS";
         return GetSubsFontName(rFont, SubsFontFlags::ONLYONE | SubsFontFlags::MS);
     }
 
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index 2c273be6449d..75ca2b1e01df 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -123,19 +123,19 @@ static OUString lcl_getFieldCode( const IFieldmark* pFieldmark )
     if ( !pFieldmark)
         return OUString();
     if ( pFieldmark->GetFieldname( ) == ODF_FORMTEXT )
-        return OUString(" FORMTEXT ");
+        return " FORMTEXT ";
     if ( pFieldmark->GetFieldname( ) == ODF_FORMDROPDOWN )
-        return OUString(" FORMDROPDOWN ");
+        return " FORMDROPDOWN ";
     if ( pFieldmark->GetFieldname( ) == ODF_FORMCHECKBOX )
-        return OUString(" FORMCHECKBOX ");
+        return " FORMCHECKBOX ";
     if ( pFieldmark->GetFieldname( ) == ODF_FORMDATE )
-        return OUString(" ODFFORMDATE ");
+        return " ODFFORMDATE ";
     if ( pFieldmark->GetFieldname( ) == ODF_TOC )
-        return OUString(" TOC ");
+        return " TOC ";
     if ( pFieldmark->GetFieldname( ) == ODF_HYPERLINK )
-        return OUString(" HYPERLINK ");
+        return " HYPERLINK ";
     if ( pFieldmark->GetFieldname( ) == ODF_PAGEREF )
-        return OUString(" PAGEREF ");
+        return " PAGEREF ";
     return pFieldmark->GetFieldname();
 }
 
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 05b42b9a0478..ee87bc0e81e1 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -2581,7 +2581,7 @@ OUString FieldString(ww::eField eIndex)
 {
     if (const char *pField = ww::GetEnglishFieldName(eIndex))
         return " " + OUString::createFromAscii(pField) + " ";
-    return OUString("  ");
+    return "  ";
 }
 
 void WW8AttributeOutput::HiddenField( const SwField& rField )
diff --git a/sw/source/filter/xml/xmlfmt.cxx b/sw/source/filter/xml/xmlfmt.cxx
index 9f9423f04ac7..47676abbacb0 100644
--- a/sw/source/filter/xml/xmlfmt.cxx
+++ b/sw/source/filter/xml/xmlfmt.cxx
@@ -876,9 +876,9 @@ uno::Reference < container::XNameContainer > SwXMLStylesContext_Impl::GetStylesC
 OUString SwXMLStylesContext_Impl::GetServiceName( sal_uInt16 nFamily ) const
 {
     if( XML_STYLE_FAMILY_SD_GRAPHICS_ID == nFamily )
-        return OUString( "com.sun.star.style.FrameStyle" );
+        return "com.sun.star.style.FrameStyle";
     else if( XML_STYLE_FAMILY_TABLE_CELL == nFamily )
-        return OUString( "com.sun.star.style.CellStyle" );
+        return "com.sun.star.style.CellStyle";
 
     return SvXMLStylesContext::GetServiceName( nFamily );
 }
diff --git a/sw/source/ui/uno/swdetect.cxx b/sw/source/ui/uno/swdetect.cxx
index fffceefa2fef..be826eb83f33 100644
--- a/sw/source/ui/uno/swdetect.cxx
+++ b/sw/source/ui/uno/swdetect.cxx
@@ -135,7 +135,7 @@ OUString SAL_CALL SwFilterDetect::detect( Sequence< PropertyValue >& lDescriptor
 /* XServiceInfo */
 OUString SAL_CALL SwFilterDetect::getImplementationName()
 {
-    return OUString("com.sun.star.comp.writer.FormatDetector" );
+    return "com.sun.star.comp.writer.FormatDetector";
 }
 
 /* XServiceInfo */
diff --git a/sw/source/ui/vba/vbaaddin.cxx b/sw/source/ui/vba/vbaaddin.cxx
index 263619fbf539..0d7286631c67 100644
--- a/sw/source/ui/vba/vbaaddin.cxx
+++ b/sw/source/ui/vba/vbaaddin.cxx
@@ -77,7 +77,7 @@ void SAL_CALL SwVbaAddin::setInstalled( sal_Bool _installed )
 OUString
 SwVbaAddin::getServiceImplName()
 {
-    return OUString("SwVbaAddin");
+    return "SwVbaAddin";
 }
 
 uno::Sequence< OUString >
diff --git a/sw/source/ui/vba/vbaaddins.cxx b/sw/source/ui/vba/vbaaddins.cxx
index 8f165461b86e..7f71afcbca59 100644
--- a/sw/source/ui/vba/vbaaddins.cxx
+++ b/sw/source/ui/vba/vbaaddins.cxx
@@ -80,7 +80,7 @@ SwVbaAddins::createCollectionObject( const css::uno::Any& aSource )
 OUString
 SwVbaAddins::getServiceImplName()
 {
-    return OUString("SwVbaAddins");
+    return "SwVbaAddins";
 }
 
 css::uno::Sequence<OUString>
diff --git a/sw/source/ui/vba/vbaapplication.cxx b/sw/source/ui/vba/vbaapplication.cxx
index 857ca1231f89..1c5891ac4d63 100644
--- a/sw/source/ui/vba/vbaapplication.cxx
+++ b/sw/source/ui/vba/vbaapplication.cxx
@@ -165,7 +165,7 @@ SwVbaApplication::RemoveSink( sal_uInt32 nNumber )
 OUString SAL_CALL
 SwVbaApplication::getName()
 {
-    return OUString("Microsoft Word" );
+    return "Microsoft Word";
 }
 
 uno::Reference< word::XDocument > SAL_CALL
@@ -372,7 +372,7 @@ void SAL_CALL SwVbaApplication::setTop( sal_Int32 _top )
 
 OUString SAL_CALL SwVbaApplication::getStatusBar()
 {
-    return OUString("");
+    return "";
 }
 
 uno::Any SAL_CALL SwVbaApplication::getCustomizationContext()
@@ -443,7 +443,7 @@ void SAL_CALL SwVbaApplication::Move( sal_Int32 Left, sal_Int32 Top )
 OUString SAL_CALL
 SwVbaApplication::getIID()
 {
-    return OUString("{82154421-0FBF-11d4-8313-005004526AB4}");
+    return "{82154421-0FBF-11d4-8313-005004526AB4}";
 }
 
 // XConnectable
@@ -451,7 +451,7 @@ SwVbaApplication::getIID()
 OUString SAL_CALL
 SwVbaApplication::GetIIDForClassItselfNotCoclass()
 {
-    return OUString("{82154423-0FBF-11D4-8313-005004526AB4}");
+    return "{82154423-0FBF-11D4-8313-005004526AB4}";
 }
 
 TypeAndIID SAL_CALL
@@ -475,7 +475,7 @@ SwVbaApplication::FindConnectionPoint()
 OUString
 SwVbaApplication::getServiceImplName()
 {
-    return OUString("SwVbaApplication");
+    return "SwVbaApplication";
 }
 
 uno::Sequence< OUString >
diff --git a/sw/source/ui/vba/vbaautotextentry.cxx b/sw/source/ui/vba/vbaautotextentry.cxx
index b379f6b98e35..808742570178 100644
--- a/sw/source/ui/vba/vbaautotextentry.cxx
+++ b/sw/source/ui/vba/vbaautotextentry.cxx
@@ -78,7 +78,7 @@ uno::Reference< word::XRange > SAL_CALL SwVbaAutoTextEntry::Insert( const uno::R
 OUString
 SwVbaAutoTextEntry::getServiceImplName()
 {
-    return OUString("SwVbaAutoTextEntry");
+    return "SwVbaAutoTextEntry";
 }
 
 uno::Sequence< OUString >
@@ -117,7 +117,7 @@ SwVbaAutoTextEntries::createCollectionObject( const css::uno::Any& aSource )
 OUString
 SwVbaAutoTextEntries::getServiceImplName()
 {
-    return OUString("SwVbaAutoTextEntries");
+    return "SwVbaAutoTextEntries";
 }
 
 css::uno::Sequence<OUString>
diff --git a/sw/source/ui/vba/vbabookmark.cxx b/sw/source/ui/vba/vbabookmark.cxx
index 506feea2e46a..ae66a1d9f060 100644
--- a/sw/source/ui/vba/vbabookmark.cxx
+++ b/sw/source/ui/vba/vbabookmark.cxx
@@ -86,7 +86,7 @@ uno::Any SAL_CALL SwVbaBookmark::Range()
 OUString
 SwVbaBookmark::getServiceImplName()
 {
-    return OUString("SwVbaBookmark");
+    return "SwVbaBookmark";
 }
 
 uno::Sequence< OUString >
diff --git a/sw/source/ui/vba/vbabookmarks.cxx b/sw/source/ui/vba/vbabookmarks.cxx
index 82b813f43bba..ae0eaed5e89a 100644
--- a/sw/source/ui/vba/vbabookmarks.cxx
+++ b/sw/source/ui/vba/vbabookmarks.cxx
@@ -209,7 +209,7 @@ SwVbaBookmarks::Exists( const OUString& rName )
 OUString
 SwVbaBookmarks::getServiceImplName()
 {
-    return OUString("SwVbaBookmarks");
+    return "SwVbaBookmarks";
 }
 
 css::uno::Sequence<OUString>
diff --git a/sw/source/ui/vba/vbaborders.cxx b/sw/source/ui/vba/vbaborders.cxx
index f60dfc7152d6..5d4ad8b9719d 100644
--- a/sw/source/ui/vba/vbaborders.cxx
+++ b/sw/source/ui/vba/vbaborders.cxx
@@ -134,7 +134,7 @@ private:
 protected:
     virtual OUString getServiceImplName() override
     {
-        return OUString("SwVbaBorder");
+        return "SwVbaBorder";
     }
 
     virtual css::uno::Sequence<OUString> getServiceNames() override
@@ -343,7 +343,7 @@ void SAL_CALL SwVbaBorders::setShadow( sal_Bool /*_shadow*/ )
 OUString
 SwVbaBorders::getServiceImplName()
 {
-    return OUString("SwVbaBorders");
+    return "SwVbaBorders";
 }
 
 uno::Sequence< OUString >
diff --git a/sw/source/ui/vba/vbacell.cxx b/sw/source/ui/vba/vbacell.cxx
index 2040e0b82d8d..aa6a8d432f9b 100644
--- a/sw/source/ui/vba/vbacell.cxx
+++ b/sw/source/ui/vba/vbacell.cxx
@@ -91,7 +91,7 @@ void SAL_CALL SwVbaCell::SetHeight( float height, sal_Int32 heightrule )
 OUString
 SwVbaCell::getServiceImplName()
 {
-    return OUString("SwVbaCell");
+    return "SwVbaCell";
 }
 
 uno::Sequence< OUString >
diff --git a/sw/source/ui/vba/vbacells.cxx b/sw/source/ui/vba/vbacells.cxx
index 6cc969d492e7..953abac9148a 100644
--- a/sw/source/ui/vba/vbacells.cxx
+++ b/sw/source/ui/vba/vbacells.cxx
@@ -195,7 +195,7 @@ SwVbaCells::createCollectionObject( const uno::Any& aSource )
 OUString
 SwVbaCells::getServiceImplName()
 {
-    return OUString("SwVbaCells");
+    return "SwVbaCells";
 }
 
 uno::Sequence<OUString>
diff --git a/sw/source/ui/vba/vbacolumn.cxx b/sw/source/ui/vba/vbacolumn.cxx
index 624e4fe12d25..d5c7f949e508 100644
--- a/sw/source/ui/vba/vbacolumn.cxx
+++ b/sw/source/ui/vba/vbacolumn.cxx
@@ -77,7 +77,7 @@ void SwVbaColumn::SelectColumn( const uno::Reference< frame::XModel >& xModel, c
 OUString
 SwVbaColumn::getServiceImplName()
 {
-    return OUString("SwVbaColumn");
+    return "SwVbaColumn";
 }
 
 uno::Sequence< OUString >
diff --git a/sw/source/ui/vba/vbacolumns.cxx b/sw/source/ui/vba/vbacolumns.cxx
index 2fbad7d3dccd..7fda520b6579 100644
--- a/sw/source/ui/vba/vbacolumns.cxx
+++ b/sw/source/ui/vba/vbacolumns.cxx
@@ -132,7 +132,7 @@ SwVbaColumns::createCollectionObject( const uno::Any& aSource )
 OUString
 SwVbaColumns::getServiceImplName()
 {
-    return OUString("SwVbaColumns");
+    return "SwVbaColumns";
 }
 
 uno::Sequence<OUString>
diff --git a/sw/source/ui/vba/vbadialog.cxx b/sw/source/ui/vba/vbadialog.cxx
index dae23e63f353..8ec16e181198 100644
--- a/sw/source/ui/vba/vbadialog.cxx
+++ b/sw/source/ui/vba/vbadialog.cxx
@@ -53,7 +53,7 @@ SwVbaDialog::mapIndexToName( sal_Int32 nIndex )
 OUString
 SwVbaDialog::getServiceImplName()
 {
-    return OUString("SwVbaDialog");
+    return "SwVbaDialog";
 }
 
 uno::Sequence< OUString >
diff --git a/sw/source/ui/vba/vbadialogs.cxx b/sw/source/ui/vba/vbadialogs.cxx
index 22c2c48c6a1d..2b26a4cfaac4 100644
--- a/sw/source/ui/vba/vbadialogs.cxx
+++ b/sw/source/ui/vba/vbadialogs.cxx
@@ -35,7 +35,7 @@ SwVbaDialogs::Item( const uno::Any &aItem )
 OUString
 SwVbaDialogs::getServiceImplName()
 {
-    return OUString("SwVbaDialogs");
+    return "SwVbaDialogs";
 }
 
 uno::Sequence< OUString >
diff --git a/sw/source/ui/vba/vbadocument.cxx b/sw/source/ui/vba/vbadocument.cxx
index 3c078546bdc8..bf5610ca3df5 100644
--- a/sw/source/ui/vba/vbadocument.cxx
+++ b/sw/source/ui/vba/vbadocument.cxx
@@ -287,7 +287,7 @@ SwVbaDocument::PageSetup( )
 OUString
 SwVbaDocument::getServiceImplName()
 {
-    return OUString("SwVbaDocument");
+    return "SwVbaDocument";
 }
 
 uno::Any SAL_CALL
@@ -627,7 +627,7 @@ SwVbaDocument::getFormControls()
 OUString SAL_CALL
 SwVbaDocument::getIID()
 {
-    return OUString("{82154424-0FBF-11d4-8313-005004526AB4}");
+    return "{82154424-0FBF-11d4-8313-005004526AB4}";
 }
 
 // XConnectable
@@ -635,7 +635,7 @@ SwVbaDocument::getIID()
 OUString SAL_CALL
 SwVbaDocument::GetIIDForClassItselfNotCoclass()
 {
-    return OUString("{82154428-0FBF-11D4-8313-005004526AB4}");
+    return "{82154428-0FBF-11D4-8313-005004526AB4}";
 }
 
 TypeAndIID SAL_CALL
diff --git a/sw/source/ui/vba/vbadocumentproperties.cxx b/sw/source/ui/vba/vbadocumentproperties.cxx
index a06d6156932a..5062ebb33117 100644
--- a/sw/source/ui/vba/vbadocumentproperties.cxx
+++ b/sw/source/ui/vba/vbadocumentproperties.cxx
@@ -455,7 +455,7 @@ public:
     virtual OUString SAL_CALL getLinkSource(  ) override;
     virtual void SAL_CALL setLinkSource( const OUString& LinkSource ) override;
     //XDefaultProperty
-    virtual OUString SAL_CALL getDefaultPropertyName(  ) override { return OUString("Value"); }
+    virtual OUString SAL_CALL getDefaultPropertyName(  ) override { return "Value"; }
     // XHelperInterface
     virtual OUString getServiceImplName() override;
     virtual uno::Sequence<OUString> getServiceNames() override;
@@ -612,7 +612,7 @@ SwVbaBuiltInDocumentProperty::setLinkSource( const OUString& /*LinkSource*/ )
 OUString
 SwVbaBuiltInDocumentProperty::getServiceImplName()
 {
-    return OUString("SwVbaBuiltinDocumentProperty");
+    return "SwVbaBuiltinDocumentProperty";
 }
 
 uno::Sequence<OUString>
@@ -762,7 +762,7 @@ SwVbaBuiltinDocumentProperties::createCollectionObject( const uno::Any& aSource
 OUString
 SwVbaBuiltinDocumentProperties::getServiceImplName()
 {
-    return OUString("SwVbaBuiltinDocumentProperties");
+    return "SwVbaBuiltinDocumentProperties";
 }
 
 uno::Sequence<OUString>
@@ -893,7 +893,7 @@ SwVbaCustomDocumentProperties::Add( const OUString& Name, sal_Bool LinkToContent
 OUString
 SwVbaCustomDocumentProperties::getServiceImplName()
 {
-    return OUString("SwVbaCustomDocumentProperties");
+    return "SwVbaCustomDocumentProperties";
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/vba/vbadocuments.cxx b/sw/source/ui/vba/vbadocuments.cxx
index 0609817cc103..4a78cefa63f5 100644
--- a/sw/source/ui/vba/vbadocuments.cxx
+++ b/sw/source/ui/vba/vbadocuments.cxx
@@ -150,7 +150,7 @@ SwVbaDocuments::OpenOld( const OUString& FileName, const uno::Any& ConfirmConver
 OUString
 SwVbaDocuments::getServiceImplName()
 {
-    return OUString("SwVbaDocuments");
+    return "SwVbaDocuments";
 }
 
 uno::Sequence<OUString>
diff --git a/sw/source/ui/vba/vbaeventshelper.cxx b/sw/source/ui/vba/vbaeventshelper.cxx
index 2b2d03e47aed..956bcfc5365f 100644
--- a/sw/source/ui/vba/vbaeventshelper.cxx
+++ b/sw/source/ui/vba/vbaeventshelper.cxx
@@ -79,7 +79,7 @@ OUString SwVbaEventsHelper::implGetDocumentModuleName( const EventHandlerInfo& /
         const uno::Sequence< uno::Any >& /*rArgs*/ ) const
 {
     // TODO: get actual codename from document
-    return OUString( "ThisDocument" );
+    return "ThisDocument";
 }
 
 namespace vbaeventshelper
diff --git a/sw/source/ui/vba/vbafield.cxx b/sw/source/ui/vba/vbafield.cxx
index cbbd3f402876..b7024251267a 100644
--- a/sw/source/ui/vba/vbafield.cxx
+++ b/sw/source/ui/vba/vbafield.cxx
@@ -54,7 +54,7 @@ sal_Bool SAL_CALL SwVbaField::Update()
 OUString
 SwVbaField::getServiceImplName()
 {
-    return OUString("SwVbaField");
+    return "SwVbaField";
 }
 
 uno::Sequence<OUString>
@@ -503,7 +503,7 @@ sal_Int32 SAL_CALL SwVbaFields::Update()
 OUString
 SwVbaFields::getServiceImplName()
 {
-    return OUString("SwVbaFields");
+    return "SwVbaFields";
 }
 
 // XEnumerationAccess
diff --git a/sw/source/ui/vba/vbafind.cxx b/sw/source/ui/vba/vbafind.cxx
index c866c7c64774..db81af2cd064 100644
--- a/sw/source/ui/vba/vbafind.cxx
+++ b/sw/source/ui/vba/vbafind.cxx
@@ -392,7 +392,7 @@ SwVbaFind::ClearFormatting(  )
 OUString
 SwVbaFind::getServiceImplName()
 {
-    return OUString("SwVbaFind");
+    return "SwVbaFind";
 }
 
 uno::Sequence< OUString >
diff --git a/sw/source/ui/vba/vbafont.cxx b/sw/source/ui/vba/vbafont.cxx
index cac6821353e2..de61e8696b31 100644
--- a/sw/source/ui/vba/vbafont.cxx
+++ b/sw/source/ui/vba/vbafont.cxx
@@ -76,7 +76,7 @@ private:
 public:
     static OUString propName()
     {
-        return OUString("CharUnderline");
+        return "CharUnderline";
     }
 
     static UnderLineMapper& instance()
@@ -130,7 +130,7 @@ SwVbaFont::setUnderline( const uno::Any& _underline )
 OUString
 SwVbaFont::getServiceImplName()
 {
-    return OUString("SwVbaFont");
+    return "SwVbaFont";
 }
 
 void SAL_CALL
diff --git a/sw/source/ui/vba/vbaframe.cxx b/sw/source/ui/vba/vbaframe.cxx
index c59994faed16..eb77d5ffa8e6 100644
--- a/sw/source/ui/vba/vbaframe.cxx
+++ b/sw/source/ui/vba/vbaframe.cxx
@@ -46,7 +46,7 @@ void SAL_CALL SwVbaFrame::Select()
 OUString
 SwVbaFrame::getServiceImplName()
 {
-    return OUString("SwVbaFrame");
+    return "SwVbaFrame";
 }
 
 uno::Sequence< OUString >
diff --git a/sw/source/ui/vba/vbaframes.cxx b/sw/source/ui/vba/vbaframes.cxx
index f414fdb8ee5d..3577bfff624e 100644
--- a/sw/source/ui/vba/vbaframes.cxx
+++ b/sw/source/ui/vba/vbaframes.cxx
@@ -82,7 +82,7 @@ SwVbaFrames::createCollectionObject( const css::uno::Any& aSource )
 OUString
 SwVbaFrames::getServiceImplName()
 {
-    return OUString("SwVbaFrames");
+    return "SwVbaFrames";
 }
 
 css::uno::Sequence<OUString>
diff --git a/sw/source/ui/vba/vbaglobals.cxx b/sw/source/ui/vba/vbaglobals.cxx
index 233e77799735..27b33a743d70 100644
--- a/sw/source/ui/vba/vbaglobals.cxx
+++ b/sw/source/ui/vba/vbaglobals.cxx
@@ -138,7 +138,7 @@ float SAL_CALL SwVbaGlobals::CentimetersToPoints( float Centimeters )
 OUString
 SwVbaGlobals::getServiceImplName()
 {
-    return OUString("SwVbaGlobals");
+    return "SwVbaGlobals";
 }
 
 uno::Sequence< OUString >
diff --git a/sw/source/ui/vba/vbaheaderfooter.cxx b/sw/source/ui/vba/vbaheaderfooter.cxx
index e5feadede78f..d33f5a65572b 100644
--- a/sw/source/ui/vba/vbaheaderfooter.cxx
+++ b/sw/source/ui/vba/vbaheaderfooter.cxx
@@ -86,7 +86,7 @@ SwVbaHeaderFooter::Shapes( const uno::Any& index )
 OUString
 SwVbaHeaderFooter::getServiceImplName()
 {
-    return OUString("SwVbaHeaderFooter");
+    return "SwVbaHeaderFooter";
 }
 
 uno::Sequence< OUString >
diff --git a/sw/source/ui/vba/vbaheadersfooters.cxx b/sw/source/ui/vba/vbaheadersfooters.cxx
index e3b67babd090..90fa4cf0fb7b 100644
--- a/sw/source/ui/vba/vbaheadersfooters.cxx
+++ b/sw/source/ui/vba/vbaheadersfooters.cxx
@@ -121,7 +121,7 @@ SwVbaHeadersFooters::createCollectionObject( const uno::Any& aSource )
 OUString
 SwVbaHeadersFooters::getServiceImplName()
 {
-    return OUString("SwVbaHeadersFooters");
+    return "SwVbaHeadersFooters";
 }
 
 uno::Sequence<OUString>
diff --git a/sw/source/ui/vba/vbalistformat.cxx b/sw/source/ui/vba/vbalistformat.cxx
index edecccf159a2..11198df15fb3 100644
--- a/sw/source/ui/vba/vbalistformat.cxx
+++ b/sw/source/ui/vba/vbalistformat.cxx
@@ -95,7 +95,7 @@ void SAL_CALL SwVbaListFormat::ConvertNumbersToText(  )
 OUString
 SwVbaListFormat::getServiceImplName()
 {
-    return OUString("SwVbaListFormat");
+    return "SwVbaListFormat";
 }
 
 uno::Sequence< OUString >
diff --git a/sw/source/ui/vba/vbalistgalleries.cxx b/sw/source/ui/vba/vbalistgalleries.cxx
index 6a2895417a85..bbe554c3900b 100644
--- a/sw/source/ui/vba/vbalistgalleries.cxx
+++ b/sw/source/ui/vba/vbalistgalleries.cxx
@@ -87,7 +87,7 @@ SwVbaListGalleries::createCollectionObject( const css::uno::Any& aSource )
 OUString
 SwVbaListGalleries::getServiceImplName()
 {
-    return OUString("SwVbaListGalleries");
+    return "SwVbaListGalleries";
 }
 
 css::uno::Sequence<OUString>
diff --git a/sw/source/ui/vba/vbalistgallery.cxx b/sw/source/ui/vba/vbalistgallery.cxx
index 0312755f5b04..49bed332064e 100644
--- a/sw/source/ui/vba/vbalistgallery.cxx
+++ b/sw/source/ui/vba/vbalistgallery.cxx
@@ -44,7 +44,7 @@ SwVbaListGallery::ListTemplates( const uno::Any& index )
 OUString
 SwVbaListGallery::getServiceImplName()
 {
-    return OUString("SwVbaListGallery");
+    return "SwVbaListGallery";
 }
 
 uno::Sequence< OUString >
diff --git a/sw/source/ui/vba/vbalistlevel.cxx b/sw/source/ui/vba/vbalistlevel.cxx
index 5754566b7a5f..17e7deaebd8a 100644
--- a/sw/source/ui/vba/vbalistlevel.cxx
+++ b/sw/source/ui/vba/vbalistlevel.cxx
@@ -371,7 +371,7 @@ void SAL_CALL SwVbaListLevel::setTrailingCharacter( ::sal_Int32 _trailingcharact
 OUString
 SwVbaListLevel::getServiceImplName()
 {
-    return OUString("SwVbaListLevel");
+    return "SwVbaListLevel";
 }
 
 uno::Sequence< OUString >
diff --git a/sw/source/ui/vba/vbalistlevels.cxx b/sw/source/ui/vba/vbalistlevels.cxx
index d6cefff1385f..7e49e3ab84ba 100644
--- a/sw/source/ui/vba/vbalistlevels.cxx
+++ b/sw/source/ui/vba/vbalistlevels.cxx
@@ -90,7 +90,7 @@ SwVbaListLevels::createCollectionObject( const css::uno::Any& aSource )
 OUString
 SwVbaListLevels::getServiceImplName()
 {
-    return OUString("SwVbaListLevels");
+    return "SwVbaListLevels";
 }
 
 css::uno::Sequence<OUString>
diff --git a/sw/source/ui/vba/vbalisttemplate.cxx b/sw/source/ui/vba/vbalisttemplate.cxx
index b94a24d43e01..b58ff029c0e5 100644
--- a/sw/source/ui/vba/vbalisttemplate.cxx
+++ b/sw/source/ui/vba/vbalisttemplate.cxx
@@ -52,7 +52,7 @@ void SwVbaListTemplate::applyListTemplate( uno::Reference< beans::XPropertySet >
 OUString
 SwVbaListTemplate::getServiceImplName()
 {
-    return OUString("SwVbaListTemplate");
+    return "SwVbaListTemplate";
 }
 
 uno::Sequence< OUString >
diff --git a/sw/source/ui/vba/vbalisttemplates.cxx b/sw/source/ui/vba/vbalisttemplates.cxx
index 2983a987b798..e4d3416f09a8 100644
--- a/sw/source/ui/vba/vbalisttemplates.cxx
+++ b/sw/source/ui/vba/vbalisttemplates.cxx
@@ -84,7 +84,7 @@ SwVbaListTemplates::createCollectionObject( const css::uno::Any& aSource )
 OUString
 SwVbaListTemplates::getServiceImplName()
 {
-    return OUString("SwVbaListTemplates");
+    return "SwVbaListTemplates";
 }
 
 css::uno::Sequence<OUString>
diff --git a/sw/source/ui/vba/vbamailmerge.cxx b/sw/source/ui/vba/vbamailmerge.cxx
index dfcbad372f76..479f5dfd7d30 100644
--- a/sw/source/ui/vba/vbamailmerge.cxx
+++ b/sw/source/ui/vba/vbamailmerge.cxx
@@ -45,7 +45,7 @@ void SAL_CALL SwVbaMailMerge::OpenDataSource(
 {
 }
 
-OUString SwVbaMailMerge::getServiceImplName() { return OUString("SwVbaMailMerge"); }
+OUString SwVbaMailMerge::getServiceImplName() { return "SwVbaMailMerge"; }
 
 css::uno::Sequence<OUString> SwVbaMailMerge::getServiceNames()
 {
diff --git a/sw/source/ui/vba/vbaoptions.cxx b/sw/source/ui/vba/vbaoptions.cxx
index 3c5ec99192ff..33a03eae4b48 100644
--- a/sw/source/ui/vba/vbaoptions.cxx
+++ b/sw/source/ui/vba/vbaoptions.cxx
@@ -260,7 +260,7 @@ void SAL_CALL SwVbaOptions::setAutoFormatApplyBulletedLists( sal_Bool /*_autofor
 OUString
 SwVbaOptions::getServiceImplName()
 {
-    return OUString("SwVbaOptions");
+    return "SwVbaOptions";
 }
 
 uno::Sequence< OUString >
diff --git a/sw/source/ui/vba/vbapagesetup.cxx b/sw/source/ui/vba/vbapagesetup.cxx
index 95ec53aff8d1..da6ab3e3ec24 100644
--- a/sw/source/ui/vba/vbapagesetup.cxx
+++ b/sw/source/ui/vba/vbapagesetup.cxx
@@ -247,7 +247,7 @@ void SAL_CALL SwVbaPageSetup::setSectionStart( ::sal_Int32 /*_sectionstart*/ )
 OUString
 SwVbaPageSetup::getServiceImplName()
 {
-    return OUString("SwVbaPageSetup");
+    return "SwVbaPageSetup";
 }
 
 uno::Sequence< OUString >
diff --git a/sw/source/ui/vba/vbapane.cxx b/sw/source/ui/vba/vbapane.cxx
index 48b0bb2b16ac..eb0c3274be92 100644
--- a/sw/source/ui/vba/vbapane.cxx
+++ b/sw/source/ui/vba/vbapane.cxx
@@ -50,7 +50,7 @@ SwVbaPane::Close( )
 OUString
 SwVbaPane::getServiceImplName()
 {
-    return OUString("SwVbaPane");
+    return "SwVbaPane";
 }
 
 uno::Sequence< OUString >
diff --git a/sw/source/ui/vba/vbapanes.cxx b/sw/source/ui/vba/vbapanes.cxx
index 3124049890ef..9147111ab36a 100644
--- a/sw/source/ui/vba/vbapanes.cxx
+++ b/sw/source/ui/vba/vbapanes.cxx
@@ -98,7 +98,7 @@ SwVbaPanes::createCollectionObject( const css::uno::Any& aSource )
 OUString
 SwVbaPanes::getServiceImplName()
 {
-    return OUString("SwVbaPanes");
+    return "SwVbaPanes";
 }
 
 css::uno::Sequence<OUString>
diff --git a/sw/source/ui/vba/vbaparagraph.cxx b/sw/source/ui/vba/vbaparagraph.cxx
index ff81be8bb37c..957dd606ff77 100644
--- a/sw/source/ui/vba/vbaparagraph.cxx
+++ b/sw/source/ui/vba/vbaparagraph.cxx
@@ -58,7 +58,7 @@ SwVbaParagraph::setStyle( const uno::Any& style )
 OUString
 SwVbaParagraph::getServiceImplName()
 {
-    return OUString("SwVbaParagraph");
+    return "SwVbaParagraph";
 }
 
 uno::Sequence< OUString >
@@ -160,7 +160,7 @@ SwVbaParagraphs::createCollectionObject( const css::uno::Any& aSource )
 OUString
 SwVbaParagraphs::getServiceImplName()
 {
-    return OUString("SwVbaParagraphs");
+    return "SwVbaParagraphs";
 }
 
 css::uno::Sequence<OUString>
diff --git a/sw/source/ui/vba/vbaparagraphformat.cxx b/sw/source/ui/vba/vbaparagraphformat.cxx
index 6c87d194bb13..f14f9a190499 100644
--- a/sw/source/ui/vba/vbaparagraphformat.cxx
+++ b/sw/source/ui/vba/vbaparagraphformat.cxx
@@ -550,7 +550,7 @@ sal_Int32 SwVbaParagraphFormat::getMSWordAlignment( style::ParagraphAdjust _alig
 OUString
 SwVbaParagraphFormat::getServiceImplName()
 {
-    return OUString("SwVbaParagraphFormat");
+    return "SwVbaParagraphFormat";
 }
 
 uno::Sequence< OUString >
diff --git a/sw/source/ui/vba/vbarange.cxx b/sw/source/ui/vba/vbarange.cxx
index 6b28e12cc550..cc7ad8570204 100644
--- a/sw/source/ui/vba/vbarange.cxx
+++ b/sw/source/ui/vba/vbarange.cxx
@@ -412,7 +412,7 @@ SwVbaRange::Fields( const uno::Any& index )
 OUString
 SwVbaRange::getServiceImplName()
 {
-    return OUString("SwVbaRange");
+    return "SwVbaRange";
 }
 
 uno::Sequence< OUString >
diff --git a/sw/source/ui/vba/vbareplacement.cxx b/sw/source/ui/vba/vbareplacement.cxx
index 4bc8ce98bb9c..b0b1d4d95224 100644
--- a/sw/source/ui/vba/vbareplacement.cxx
+++ b/sw/source/ui/vba/vbareplacement.cxx
@@ -51,7 +51,7 @@ void SAL_CALL SwVbaReplacement::ClearFormatting( )
 OUString
 SwVbaReplacement::getServiceImplName()
 {
-    return OUString("SwVbaReplacement");
+    return "SwVbaReplacement";
 }
 
 uno::Sequence< OUString >
diff --git a/sw/source/ui/vba/vbarevision.cxx b/sw/source/ui/vba/vbarevision.cxx
index dc2fc81b0b4d..aedc7ae0ae45 100644
--- a/sw/source/ui/vba/vbarevision.cxx
+++ b/sw/source/ui/vba/vbarevision.cxx
@@ -78,7 +78,7 @@ SwVbaRevision::Reject( )
 OUString
 SwVbaRevision::getServiceImplName()
 {
-    return OUString("SwVbaRevision");
+    return "SwVbaRevision";
 }
 
 uno::Sequence< OUString >
diff --git a/sw/source/ui/vba/vbarevisions.cxx b/sw/source/ui/vba/vbarevisions.cxx
index 10ddb2c3f90f..a24a155484c2 100644
--- a/sw/source/ui/vba/vbarevisions.cxx
+++ b/sw/source/ui/vba/vbarevisions.cxx
@@ -158,7 +158,7 @@ void SAL_CALL SwVbaRevisions::RejectAll(  )
 OUString
 SwVbaRevisions::getServiceImplName()
 {
-    return OUString("SwVbaRevisions");
+    return "SwVbaRevisions";
 }
 
 css::uno::Sequence<OUString>
diff --git a/sw/source/ui/vba/vbarow.cxx b/sw/source/ui/vba/vbarow.cxx
index 2a0cd0fd8054..7e482b7321a3 100644
--- a/sw/source/ui/vba/vbarow.cxx
+++ b/sw/source/ui/vba/vbarow.cxx
@@ -106,7 +106,7 @@ void SAL_CALL SwVbaRow::SetHeight( float height, sal_Int32 heightrule )
 OUString
 SwVbaRow::getServiceImplName()
 {
-    return OUString("SwVbaRow");
+    return "SwVbaRow";
 }
 
 uno::Sequence< OUString >
diff --git a/sw/source/ui/vba/vbarows.cxx b/sw/source/ui/vba/vbarows.cxx
index 65cdec698ef2..2ed1d4a4b64c 100644
--- a/sw/source/ui/vba/vbarows.cxx
+++ b/sw/source/ui/vba/vbarows.cxx
@@ -349,7 +349,7 @@ SwVbaRows::createCollectionObject( const uno::Any& aSource )
 OUString
 SwVbaRows::getServiceImplName()
 {
-    return OUString("SwVbaRows");
+    return "SwVbaRows";
 }
 
 uno::Sequence<OUString>
diff --git a/sw/source/ui/vba/vbasection.cxx b/sw/source/ui/vba/vbasection.cxx
index 024c51023509..7c6bb712f1cc 100644
--- a/sw/source/ui/vba/vbasection.cxx
+++ b/sw/source/ui/vba/vbasection.cxx
@@ -68,7 +68,7 @@ SwVbaSection::PageSetup( )
 OUString
 SwVbaSection::getServiceImplName()
 {
-    return OUString("SwVbaSection");
+    return "SwVbaSection";
 }
 
 uno::Sequence< OUString >
diff --git a/sw/source/ui/vba/vbasections.cxx b/sw/source/ui/vba/vbasections.cxx
index 3d4e2847395f..3e57eb65430a 100644
--- a/sw/source/ui/vba/vbasections.cxx
+++ b/sw/source/ui/vba/vbasections.cxx
@@ -175,7 +175,7 @@ SwVbaSections::createCollectionObject( const css::uno::Any& aSource )
 OUString
 SwVbaSections::getServiceImplName()
 {
-    return OUString("SwVbaSections");
+    return "SwVbaSections";
 }
 
 css::uno::Sequence<OUString>
diff --git a/sw/source/ui/vba/vbaselection.cxx b/sw/source/ui/vba/vbaselection.cxx
index f8b5206866db..ab608dc4bb69 100644
--- a/sw/source/ui/vba/vbaselection.cxx
+++ b/sw/source/ui/vba/vbaselection.cxx
@@ -1153,7 +1153,7 @@ SwVbaSelection::Paragraphs( const uno::Any& aIndex )
 OUString
 SwVbaSelection::getServiceImplName()
 {
-    return OUString("SwVbaSelection");
+    return "SwVbaSelection";
 }
 
 uno::Sequence< OUString >
diff --git a/sw/source/ui/vba/vbastyle.cxx b/sw/source/ui/vba/vbastyle.cxx
index 6f0c88f7a0a7..cb5951a8a781 100644
--- a/sw/source/ui/vba/vbastyle.cxx
+++ b/sw/source/ui/vba/vbastyle.cxx
@@ -212,7 +212,7 @@ void SAL_CALL SwVbaStyle::setNextParagraphStyle( const uno::Any& _nextparagraphs
 OUString
 SwVbaStyle::getServiceImplName()
 {
-    return OUString("SwVbaStyle");
+    return "SwVbaStyle";
 }
 
 uno::Sequence< OUString >
diff --git a/sw/source/ui/vba/vbastyle.hxx b/sw/source/ui/vba/vbastyle.hxx
index 21d94d3ed3d8..d00ba941a4d1 100644
--- a/sw/source/ui/vba/vbastyle.hxx
+++ b/sw/source/ui/vba/vbastyle.hxx
@@ -68,7 +68,7 @@ public:
     virtual ::sal_Int32 SAL_CALL getListLevelNumber() override;
 
     //XDefaultProperty
-    virtual OUString SAL_CALL getDefaultPropertyName(  ) override { return OUString("Name"); }
+    virtual OUString SAL_CALL getDefaultPropertyName(  ) override { return "Name"; }
 
     // XHelperInterface
     virtual OUString getServiceImplName() override;
diff --git a/sw/source/ui/vba/vbastyles.cxx b/sw/source/ui/vba/vbastyles.cxx
index eac88129162d..2c262a0f7c99 100644
--- a/sw/source/ui/vba/vbastyles.cxx
+++ b/sw/source/ui/vba/vbastyles.cxx
@@ -350,7 +350,7 @@ SwVbaStyles::Item( const uno::Any& Index1, const uno::Any& Index2 )
 OUString
 SwVbaStyles::getServiceImplName()
 {
-    return OUString("SwVbaStyles");
+    return "SwVbaStyles";
 }
 
 uno::Sequence< OUString >
diff --git a/sw/source/ui/vba/vbasystem.cxx b/sw/source/ui/vba/vbasystem.cxx
index 3be9571f239c..5fa92cc4dcdd 100644
--- a/sw/source/ui/vba/vbasystem.cxx
+++ b/sw/source/ui/vba/vbasystem.cxx
@@ -258,7 +258,7 @@ SwVbaSystem::PrivateProfileString( const OUString& rFilename, const OUString& rS
 OUString
 SwVbaSystem::getServiceImplName()
 {
-    return OUString("SwVbaSystem");
+    return "SwVbaSystem";
 }
 
 uno::Sequence< OUString >
diff --git a/sw/source/ui/vba/vbatable.cxx b/sw/source/ui/vba/vbatable.cxx
index e5017d49aeef..822c6c28a2cf 100644
--- a/sw/source/ui/vba/vbatable.cxx
+++ b/sw/source/ui/vba/vbatable.cxx
@@ -112,7 +112,7 @@ SwVbaTable::Columns( const uno::Any& index )
 OUString
 SwVbaTable::getServiceImplName()
 {
-    return OUString("SwVbaTable");
+    return "SwVbaTable";
 }
 
 uno::Sequence<OUString>
diff --git a/sw/source/ui/vba/vbatableofcontents.cxx b/sw/source/ui/vba/vbatableofcontents.cxx
index 1c1e7ff2a9fb..c308e314d42d 100644
--- a/sw/source/ui/vba/vbatableofcontents.cxx
+++ b/sw/source/ui/vba/vbatableofcontents.cxx
@@ -96,7 +96,7 @@ void SAL_CALL SwVbaTableOfContents::Update(  )
 OUString
 SwVbaTableOfContents::getServiceImplName()
 {
-    return OUString("SwVbaTableOfContents");
+    return "SwVbaTableOfContents";
 }
 
 uno::Sequence< OUString >
diff --git a/sw/source/ui/vba/vbatables.cxx b/sw/source/ui/vba/vbatables.cxx
index 25c193e66b5f..2d51a959e76f 100644
--- a/sw/source/ui/vba/vbatables.cxx
+++ b/sw/source/ui/vba/vbatables.cxx
@@ -208,7 +208,7 @@ SwVbaTables::createCollectionObject( const uno::Any& aSource )
 OUString
 SwVbaTables::getServiceImplName()
 {
-    return OUString("SwVbaTables");
+    return "SwVbaTables";
 }
 
 // XEnumerationAccess
diff --git a/sw/source/ui/vba/vbatablesofcontents.cxx b/sw/source/ui/vba/vbatablesofcontents.cxx
index ad35c42104fe..892094bf0664 100644
--- a/sw/source/ui/vba/vbatablesofcontents.cxx
+++ b/sw/source/ui/vba/vbatablesofcontents.cxx
@@ -164,7 +164,7 @@ SwVbaTablesOfContents::createCollectionObject( const uno::Any& aSource )
 OUString
 SwVbaTablesOfContents::getServiceImplName()
 {
-    return OUString("SwVbaTablesOfContents");
+    return "SwVbaTablesOfContents";
 }
 
 uno::Sequence<OUString>
diff --git a/sw/source/ui/vba/vbatabstop.cxx b/sw/source/ui/vba/vbatabstop.cxx
index 38d4cfdba583..6fdf2c811a44 100644
--- a/sw/source/ui/vba/vbatabstop.cxx
+++ b/sw/source/ui/vba/vbatabstop.cxx
@@ -34,7 +34,7 @@ SwVbaTabStop::~SwVbaTabStop()
 OUString
 SwVbaTabStop::getServiceImplName()
 {
-    return OUString("SwVbaTabStop");
+    return "SwVbaTabStop";
 }
 
 uno::Sequence< OUString >
diff --git a/sw/source/ui/vba/vbatabstops.cxx b/sw/source/ui/vba/vbatabstops.cxx
index f1d19dd7c838..e0c71c9e94e4 100644
--- a/sw/source/ui/vba/vbatabstops.cxx
+++ b/sw/source/ui/vba/vbatabstops.cxx
@@ -248,7 +248,7 @@ SwVbaTabStops::createCollectionObject( const css::uno::Any& aSource )
 OUString
 SwVbaTabStops::getServiceImplName()
 {
-    return OUString("SwVbaTabStops");
+    return "SwVbaTabStops";
 }
 
 css::uno::Sequence<OUString>
diff --git a/sw/source/ui/vba/vbatemplate.cxx b/sw/source/ui/vba/vbatemplate.cxx
index 60eb84befbce..985b80608fa6 100644
--- a/sw/source/ui/vba/vbatemplate.cxx
+++ b/sw/source/ui/vba/vbatemplate.cxx
@@ -115,7 +115,7 @@ SwVbaTemplate::AutoTextEntries( const uno::Any& index )
 OUString
 SwVbaTemplate::getServiceImplName()
 {
-    return OUString("SwVbaTemplate");
+    return "SwVbaTemplate";
 }
 
 uno::Sequence< OUString >
diff --git a/sw/source/ui/vba/vbavariable.cxx b/sw/source/ui/vba/vbavariable.cxx
index 2e663f6582b0..5b6425e8c7ef 100644
--- a/sw/source/ui/vba/vbavariable.cxx
+++ b/sw/source/ui/vba/vbavariable.cxx
@@ -77,7 +77,7 @@ SwVbaVariable::getIndex()
 OUString
 SwVbaVariable::getServiceImplName()
 {
-    return OUString("SwVbaVariable");
+    return "SwVbaVariable";
 }
 
 uno::Sequence< OUString >
diff --git a/sw/source/ui/vba/vbavariables.cxx b/sw/source/ui/vba/vbavariables.cxx
index 8663c00719b5..9e786e905028 100644
--- a/sw/source/ui/vba/vbavariables.cxx
+++ b/sw/source/ui/vba/vbavariables.cxx
@@ -79,7 +79,7 @@ SwVbaVariables::Add( const OUString& rName, const uno::Any& rValue )
 OUString
 SwVbaVariables::getServiceImplName()
 {
-    return OUString("SwVbaVariables");
+    return "SwVbaVariables";
 }
 
 css::uno::Sequence<OUString>
diff --git a/sw/source/ui/vba/vbaview.cxx b/sw/source/ui/vba/vbaview.cxx
index 63215e5af360..3fb6c9d71656 100644
--- a/sw/source/ui/vba/vbaview.cxx
+++ b/sw/source/ui/vba/vbaview.cxx
@@ -374,7 +374,7 @@ uno::Reference< text::XTextRange > SwVbaView::getHFTextRange( sal_Int32 nType )
 OUString
 SwVbaView::getServiceImplName()
 {
-    return OUString("SwVbaView");
+    return "SwVbaView";
 }
 
 uno::Sequence< OUString >
diff --git a/sw/source/ui/vba/vbawindow.cxx b/sw/source/ui/vba/vbawindow.cxx
index b958655fafc0..fef92971218d 100644
--- a/sw/source/ui/vba/vbawindow.cxx
+++ b/sw/source/ui/vba/vbawindow.cxx
@@ -118,11 +118,11 @@ SwVbaWindow::getCaption()
 {
     SwView* pView = word::getView( m_xModel );
     if( !pView )
-        return OUString("");
+        return "";
 
     uno::Reference< css::beans::XPropertySet > xFrameProps( pView->GetViewFrame()->GetFrame().GetFrameInterface()->getController()->getFrame(), uno::UNO_QUERY );
     if( !xFrameProps.is() )
-        return OUString("");
+        return "";
 
     OUString sTitle;
     xFrameProps->getPropertyValue( "Title" ) >>= sTitle;
@@ -163,7 +163,7 @@ SwVbaWindow::ActivePane()
 OUString
 SwVbaWindow::getServiceImplName()
 {
-    return OUString("SwVbaWindow");
+    return "SwVbaWindow";
 }
 
 uno::Sequence< OUString >
diff --git a/sw/source/ui/vba/vbawrapformat.cxx b/sw/source/ui/vba/vbawrapformat.cxx
index a0e63b325657..b854027fe3d0 100644
--- a/sw/source/ui/vba/vbawrapformat.cxx
+++ b/sw/source/ui/vba/vbawrapformat.cxx
@@ -221,7 +221,7 @@ void SAL_CALL SwVbaWrapFormat::setDistanceRight( float _distanceright )
 OUString
 SwVbaWrapFormat::getServiceImplName()
 {
-    return OUString("SwVbaWrapFormat");
+    return "SwVbaWrapFormat";
 }
 
 uno::Sequence< OUString >
diff --git a/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx b/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx
index f4e9cc49771f..3132d88f7fb9 100644
--- a/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx
+++ b/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx
@@ -75,7 +75,7 @@ public:
     // XServiceInfo
     virtual OUString SAL_CALL getImplementationName() override
     {
-        return OUString("lo.writer.MMCurrentEntryController");
+        return "lo.writer.MMCurrentEntryController";
     }
 
     virtual sal_Bool SAL_CALL supportsService(const OUString& rServiceName) override
@@ -136,7 +136,7 @@ public:
     // XServiceInfo
     virtual OUString SAL_CALL getImplementationName() override
     {
-        return OUString("lo.writer.MMExcludeEntryController");
+        return "lo.writer.MMExcludeEntryController";
     }
 
     virtual sal_Bool SAL_CALL supportsService(const OUString& rServiceName) override
diff --git a/sw/source/uibase/misc/glosdoc.cxx b/sw/source/uibase/misc/glosdoc.cxx
index 20807a0c6337..fcaf11b7e126 100644
--- a/sw/source/uibase/misc/glosdoc.cxx
+++ b/sw/source/uibase/misc/glosdoc.cxx
@@ -90,7 +90,7 @@ OUString lcl_CheckFileName( const OUString& rNewFilePath,
 // supplies the default group's name
 OUString SwGlossaries::GetDefName()
 {
-    return OUString("standard");
+    return "standard";
 
 }
 
@@ -418,7 +418,7 @@ void SwGlossaries::ShowError()
 
 OUString SwGlossaries::GetExtension()
 {
-    return OUString(".bau");
+    return ".bau";
 }
 
 void SwGlossaries::RemoveFileFromList( const OUString& rGroup )
diff --git a/sw/source/uibase/ribbar/workctrl.cxx b/sw/source/uibase/ribbar/workctrl.cxx
index 056ed1ae4398..f62059f661e5 100644
--- a/sw/source/uibase/ribbar/workctrl.cxx
+++ b/sw/source/uibase/ribbar/workctrl.cxx
@@ -862,7 +862,7 @@ sal_Bool SAL_CALL NavElementToolBoxControl::supportsService( const OUString& Ser
 
 OUString SAL_CALL NavElementToolBoxControl::getImplementationName()
 {
-    return OUString("lo.writer.NavElementToolBoxController");
+    return "lo.writer.NavElementToolBoxController";
 }
 
 uno::Sequence< OUString > SAL_CALL NavElementToolBoxControl::getSupportedServiceNames()
diff --git a/sw/source/uibase/sidebar/SwPanelFactory.cxx b/sw/source/uibase/sidebar/SwPanelFactory.cxx
index 9fe8ccc143c9..08ea0ce274eb 100644
--- a/sw/source/uibase/sidebar/SwPanelFactory.cxx
+++ b/sw/source/uibase/sidebar/SwPanelFactory.cxx
@@ -67,7 +67,7 @@ public:
         const css::uno::Sequence<css::beans::PropertyValue>& rArguments) override;
 
     OUString SAL_CALL getImplementationName() override
-    { return OUString("org.apache.openoffice.comp.sw.sidebar.SwPanelFactory"); }
+    { return "org.apache.openoffice.comp.sw.sidebar.SwPanelFactory"; }
 
     sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
     { return cppu::supportsService(this, ServiceName); }
diff --git a/sw/source/uibase/uitest/uiobject.cxx b/sw/source/uibase/uitest/uiobject.cxx
index fcf57a0d6956..ecdfd68ad6a8 100644
--- a/sw/source/uibase/uitest/uiobject.cxx
+++ b/sw/source/uibase/uitest/uiobject.cxx
@@ -118,7 +118,7 @@ void SwEditWinUIObject::execute(const OUString& rAction,
 
 OUString SwEditWinUIObject::get_name() const
 {
-    return OUString("SwEditWinUIObject");
+    return "SwEditWinUIObject";
 }
 
 std::unique_ptr<UIObject> SwEditWinUIObject::create(vcl::Window* pWindow)
@@ -163,7 +163,7 @@ std::unique_ptr<UIObject> SwNavigationPIUIObject::create(vcl::Window* pWindow)
 
 OUString SwNavigationPIUIObject::get_name() const
 {
-    return OUString("SwNavigationPIUIObject");
+    return "SwNavigationPIUIObject";
 }
 
 
diff --git a/sw/source/uibase/uno/SwXDocumentSettings.cxx b/sw/source/uibase/uno/SwXDocumentSettings.cxx
index 924db95bb73e..50bf389e702e 100644
--- a/sw/source/uibase/uno/SwXDocumentSettings.cxx
+++ b/sw/source/uibase/uno/SwXDocumentSettings.cxx
@@ -1395,7 +1395,7 @@ void SwXDocumentSettings::_postGetValues ()
 // XServiceInfo
 OUString SAL_CALL SwXDocumentSettings::getImplementationName(  )
 {
-    return OUString("SwXDocumentSettings");
+    return "SwXDocumentSettings";
 }
 
 sal_Bool SAL_CALL SwXDocumentSettings::supportsService( const OUString& ServiceName )
diff --git a/sw/source/uibase/uno/SwXFilterOptions.cxx b/sw/source/uibase/uno/SwXFilterOptions.cxx
index 79f23f77da99..bdc8f190dcb2 100644
--- a/sw/source/uibase/uno/SwXFilterOptions.cxx
+++ b/sw/source/uibase/uno/SwXFilterOptions.cxx
@@ -124,7 +124,7 @@ void SAL_CALL SwXFilterOptions::initialize(const uno::Sequence<uno::Any>& rArgum
 
 OUString SwXFilterOptions::getImplementationName()
 {
-    return OUString("com.sun.star.comp.Writer.FilterOptionsDialog");
+    return "com.sun.star.comp.Writer.FilterOptionsDialog";
 }
 
 sal_Bool SwXFilterOptions::supportsService( const OUString& rServiceName )
diff --git a/sw/source/uibase/uno/unoatxt.cxx b/sw/source/uibase/uno/unoatxt.cxx
index 9f5af5930f35..37ea804b9f59 100644
--- a/sw/source/uibase/uno/unoatxt.cxx
+++ b/sw/source/uibase/uno/unoatxt.cxx
@@ -197,7 +197,7 @@ void SwXAutoTextContainer::removeByName(const OUString& aGroupName)
 
 OUString SwXAutoTextContainer::getImplementationName()
 {
-    return OUString("SwXAutoTextContainer" );
+    return "SwXAutoTextContainer";
 }
 
 sal_Bool SwXAutoTextContainer::supportsService(const OUString& rServiceName)
@@ -665,7 +665,7 @@ void SwXAutoTextGroup::Invalidate()
 
 OUString SwXAutoTextGroup::getImplementationName()
 {
-    return OUString("SwXAutoTextGroup");
+    return "SwXAutoTextGroup";
 }
 
 sal_Bool SwXAutoTextGroup::supportsService(const OUString& rServiceName)
@@ -939,7 +939,7 @@ void SwXAutoTextEntry::applyTo(const uno::Reference< text::XTextRange > & xTextR
 
 OUString SwXAutoTextEntry::getImplementationName()
 {
-    return OUString("SwXAutoTextEntry");
+    return "SwXAutoTextEntry";
 }
 
 sal_Bool SwXAutoTextEntry::supportsService(const OUString& rServiceName)
@@ -978,7 +978,7 @@ SwAutoTextEventDescriptor::~SwAutoTextEventDescriptor()
 
 OUString SwAutoTextEventDescriptor::getImplementationName()
 {
-    return OUString("SwAutoTextEventDescriptor");
+    return "SwAutoTextEventDescriptor";
 }
 
 void SwAutoTextEventDescriptor::replaceByName(
diff --git a/sw/source/uibase/uno/unodoc.cxx b/sw/source/uibase/uno/unodoc.cxx
index 08c032796e90..efe46d868ecb 100644
--- a/sw/source/uibase/uno/unodoc.cxx
+++ b/sw/source/uibase/uno/unodoc.cxx
@@ -40,7 +40,7 @@ uno::Sequence< OUString > SwTextDocument_getSupportedServiceNames() throw()
 
 OUString SwTextDocument_getImplementationName() throw()
 {
-    return OUString( "com.sun.star.comp.Writer.TextDocument" );
+    return "com.sun.star.comp.Writer.TextDocument";
 }
 
 uno::Reference< uno::XInterface > SwTextDocument_createInstance(
diff --git a/sw/source/uibase/uno/unomailmerge.cxx b/sw/source/uibase/uno/unomailmerge.cxx
index 748f875831d3..851555f922b2 100644
--- a/sw/source/uibase/uno/unomailmerge.cxx
+++ b/sw/source/uibase/uno/unomailmerge.cxx
@@ -1164,7 +1164,7 @@ void SAL_CALL SwXMailMerge::removeMailMergeEventListener(
 
 OUString SAL_CALL SwXMailMerge::getImplementationName()
 {
-    return OUString( "SwXMailMerge" );
+    return "SwXMailMerge";
 }
 
 sal_Bool SAL_CALL SwXMailMerge::supportsService( const OUString& rServiceName )
diff --git a/sw/source/uibase/uno/unomod.cxx b/sw/source/uibase/uno/unomod.cxx
index 83b5f7adbff5..baac09794a6e 100644
--- a/sw/source/uibase/uno/unomod.cxx
+++ b/sw/source/uibase/uno/unomod.cxx
@@ -230,7 +230,7 @@ Reference< XPropertySet >  SwXModule::getPrintSettings()
 
 OUString SwXModule::getImplementationName()
 {
-    return OUString( "SwXModule"  );
+    return "SwXModule";
 }
 
 sal_Bool SwXModule::supportsService(const OUString& rServiceName)
@@ -497,7 +497,7 @@ void SwXPrintSettings::_postGetValues ()
 
 OUString SwXPrintSettings::getImplementationName()
 {
-    return OUString("SwXPrintSettings");
+    return "SwXPrintSettings";
 }
 
 sal_Bool SwXPrintSettings::supportsService(const OUString& rServiceName)
@@ -941,7 +941,7 @@ void SwXViewSettings::_postGetValues ()
 
 OUString SwXViewSettings::getImplementationName()
 {
-    return OUString("SwXViewSettings");
+    return "SwXViewSettings";
 }
 
 sal_Bool SwXViewSettings::supportsService(const OUString& rServiceName)
diff --git a/sw/source/uibase/uno/unomodule.cxx b/sw/source/uibase/uno/unomodule.cxx
index 11c51725648e..867960520fca 100644
--- a/sw/source/uibase/uno/unomodule.cxx
+++ b/sw/source/uibase/uno/unomodule.cxx
@@ -135,7 +135,7 @@ uno::Reference< frame::XDispatch > SAL_CALL SwUnoModule::queryDispatch(
 // XServiceInfo
 OUString SAL_CALL SwUnoModule::getImplementationName(  )
 {
-    return OUString( "com.sun.star.comp.Writer.WriterModule" );
+    return "com.sun.star.comp.Writer.WriterModule";
 }
 
 sal_Bool SAL_CALL SwUnoModule::supportsService( const OUString& sServiceName )
diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx
index 4fdfc5dadecf..ca337d79e4f7 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -1412,7 +1412,7 @@ public:
     // XServiceInfo
     virtual OUString SAL_CALL getImplementationName() override
     {
-        return OUString("SwDrawPagesObj");
+        return "SwDrawPagesObj";
     }
 
     virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override
@@ -1781,7 +1781,7 @@ Sequence< OUString > SwXTextDocument::getAvailableServiceNames()
 
 OUString SwXTextDocument::getImplementationName()
 {
-    return OUString("SwXTextDocument");
+    return "SwXTextDocument";
     /* // Matching the .component information:
        return dynamic_cast<SwGlobalDocShell*>( pDocShell ) != nullptr
            ? OUString("com.sun.star.comp.Writer.GlobalDocument")
@@ -3962,7 +3962,7 @@ sal_Bool SwXLinkTargetSupplier::hasElements()
 
 OUString SwXLinkTargetSupplier::getImplementationName()
 {
-    return OUString("SwXLinkTargetSupplier");
+    return "SwXLinkTargetSupplier";
 }
 
 sal_Bool SwXLinkTargetSupplier::supportsService(const OUString& rServiceName)
@@ -4218,7 +4218,7 @@ Reference< XNameAccess >  SwXLinkNameAccessWrapper::getLinks()
 
 OUString SwXLinkNameAccessWrapper::getImplementationName()
 {
-    return OUString("SwXLinkNameAccessWrapper");
+    return "SwXLinkNameAccessWrapper";
 }
 
 sal_Bool SwXLinkNameAccessWrapper::supportsService(const OUString& rServiceName)
@@ -4284,7 +4284,7 @@ void SwXOutlineTarget::removeVetoableChangeListener(
 
 OUString SwXOutlineTarget::getImplementationName()
 {
-    return OUString("SwXOutlineTarget");
+    return "SwXOutlineTarget";
 }
 
 sal_Bool SwXOutlineTarget::supportsService(const OUString& ServiceName)
diff --git a/sw/source/uibase/uno/unotxvw.cxx b/sw/source/uibase/uno/unotxvw.cxx
index 5958aa9a103a..f268c5d27299 100644
--- a/sw/source/uibase/uno/unotxvw.cxx
+++ b/sw/source/uibase/uno/unotxvw.cxx
@@ -837,7 +837,7 @@ void SAL_CALL SwXTextView::removeVetoableChangeListener(
 
 OUString SwXTextView::getImplementationName()
 {
-    return OUString("SwXTextView");
+    return "SwXTextView";
 }
 
 sal_Bool SwXTextView::supportsService(const OUString& rServiceName)
@@ -1651,7 +1651,7 @@ void SwXTextViewCursor::gotoStartOfLine(sal_Bool bExpand)
 
 OUString SwXTextViewCursor::getImplementationName()
 {
-    return OUString("SwXTextViewCursor");
+    return "SwXTextViewCursor";
 }
 
 sal_Bool SwXTextViewCursor::supportsService(const OUString& rServiceName)
author	Stephan Bergmann <sbergman@redhat.com>	2019-07-30 17:47:50 +0200
committer	Stephan Bergmann <sbergman@redhat.com>	2019-07-31 12:54:02 +0200
commit	39642d415cd70165574f91500801d3b49c65d646 (patch)
tree	ac78afa2a06066dc9a7c2b53853694eef56926a5
parent	0f11e746c8ab74f7495c29a9287da361e469689c (diff)