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>

64 files changed, 80 insertions, 80 deletions

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 >