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

Change-Id: I10c543744f22a9f4db4e99c97629bb0e0b7f37db
Reviewed-on: https://gerrit.libreoffice.org/76628
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

40 files changed, 50 insertions, 50 deletions

diff --git a/vbahelper/source/msforms/vbabutton.cxx b/vbahelper/source/msforms/vbabutton.cxx
index 7c7e98143432..b1d07ba9911c 100644
--- a/vbahelper/source/msforms/vbabutton.cxx
+++ b/vbahelper/source/msforms/vbabutton.cxx
@@ -112,7 +112,7 @@ uno::Reference< msforms::XNewFont > SAL_CALL VbaButton::getFont()
 OUString
 VbaButton::getServiceImplName()
 {
-    return OUString("VbaButton");
+    return "VbaButton";
 }
 
 uno::Sequence< OUString >
diff --git a/vbahelper/source/msforms/vbacheckbox.cxx b/vbahelper/source/msforms/vbacheckbox.cxx
index 719fd3183696..6444d9dab526 100644
--- a/vbahelper/source/msforms/vbacheckbox.cxx
+++ b/vbahelper/source/msforms/vbacheckbox.cxx
@@ -86,7 +86,7 @@ uno::Reference< msforms::XNewFont > SAL_CALL ScVbaCheckbox::getFont()
 OUString
 ScVbaCheckbox::getServiceImplName()
 {
-    return OUString("ScVbaCheckbox");
+    return "ScVbaCheckbox";
 }
 
 uno::Sequence< OUString >
diff --git a/vbahelper/source/msforms/vbacheckbox.hxx b/vbahelper/source/msforms/vbacheckbox.hxx
index 561ee3c12abc..7053e0aec2a2 100644
--- a/vbahelper/source/msforms/vbacheckbox.hxx
+++ b/vbahelper/source/msforms/vbacheckbox.hxx
@@ -43,7 +43,7 @@ public:
     virtual sal_Bool SAL_CALL getLocked() override;
     virtual void SAL_CALL setLocked( sal_Bool bAutoSize ) override;
     // XDefaultProperty
-    OUString SAL_CALL getDefaultPropertyName(  ) override { return OUString("Value"); }
+    OUString SAL_CALL getDefaultPropertyName(  ) override { return "Value"; }
     //XHelperInterface
     virtual OUString getServiceImplName() override;
     virtual css::uno::Sequence<OUString> getServiceNames() override;
diff --git a/vbahelper/source/msforms/vbacombobox.cxx b/vbahelper/source/msforms/vbacombobox.cxx
index 3f4468d7d07a..429ef73a2219 100644
--- a/vbahelper/source/msforms/vbacombobox.cxx
+++ b/vbahelper/source/msforms/vbacombobox.cxx
@@ -253,7 +253,7 @@ uno::Reference< msforms::XNewFont > SAL_CALL ScVbaComboBox::getFont()
 OUString
 ScVbaComboBox::getServiceImplName()
 {
-    return OUString("ScVbaComboBox");
+    return "ScVbaComboBox";
 }
 
 sal_Int32 SAL_CALL ScVbaComboBox::getBackColor()
diff --git a/vbahelper/source/msforms/vbacombobox.hxx b/vbahelper/source/msforms/vbacombobox.hxx
index 68898a9f6cea..feea8e52c504 100644
--- a/vbahelper/source/msforms/vbacombobox.hxx
+++ b/vbahelper/source/msforms/vbacombobox.hxx
@@ -79,7 +79,7 @@ public:
     virtual void SAL_CALL setRowSource( const OUString& _rowsource ) override;
 
     // XDefaultProperty
-        OUString SAL_CALL getDefaultPropertyName(  ) override { return OUString("Value"); }
+        OUString SAL_CALL getDefaultPropertyName(  ) override { return "Value"; }
     //XHelperInterface
     virtual OUString getServiceImplName() override;
     virtual css::uno::Sequence<OUString> getServiceNames() override;
diff --git a/vbahelper/source/msforms/vbacontrol.cxx b/vbahelper/source/msforms/vbacontrol.cxx
index 48cced0e8730..ba0a6f994035 100644
--- a/vbahelper/source/msforms/vbacontrol.cxx
+++ b/vbahelper/source/msforms/vbacontrol.cxx
@@ -696,7 +696,7 @@ void SAL_CALL ScVbaControl::setTabIndex( sal_Int32 /*nTabIndex*/ )
 OUString
 ScVbaControl::getServiceImplName()
 {
-    return OUString("ScVbaControl");
+    return "ScVbaControl";
 }
 
 uno::Sequence< OUString >
diff --git a/vbahelper/source/msforms/vbaimage.cxx b/vbahelper/source/msforms/vbaimage.cxx
index 1deeaf249f31..827544168676 100644
--- a/vbahelper/source/msforms/vbaimage.cxx
+++ b/vbahelper/source/msforms/vbaimage.cxx
@@ -30,7 +30,7 @@ ScVbaImage::ScVbaImage( const uno::Reference< XHelperInterface >& xParent, const
 OUString
 ScVbaImage::getServiceImplName()
 {
-    return OUString("ScVbaImage");
+    return "ScVbaImage";
 }
 
 uno::Sequence< OUString >
diff --git a/vbahelper/source/msforms/vbalabel.cxx b/vbahelper/source/msforms/vbalabel.cxx
index 567cd6b79c4a..df4ac8be08df 100644
--- a/vbahelper/source/msforms/vbalabel.cxx
+++ b/vbahelper/source/msforms/vbalabel.cxx
@@ -76,7 +76,7 @@ uno::Reference< msforms::XNewFont > SAL_CALL ScVbaLabel::getFont()
 
 OUString ScVbaLabel::getServiceImplName()
 {
-    return OUString( "ScVbaLabel" );
+    return "ScVbaLabel";
 }
 
 sal_Int32 SAL_CALL ScVbaLabel::getBackColor()
diff --git a/vbahelper/source/msforms/vbalabel.hxx b/vbahelper/source/msforms/vbalabel.hxx
index f11c3cdae7e2..d002557bb4c9 100644
--- a/vbahelper/source/msforms/vbalabel.hxx
+++ b/vbahelper/source/msforms/vbalabel.hxx
@@ -46,7 +46,7 @@ public:
     virtual OUString getServiceImplName() override;
     virtual css::uno::Sequence<OUString> getServiceNames() override;
     // XDefaultProperty
-    OUString SAL_CALL getDefaultPropertyName(  ) override { return OUString("Value"); }
+    OUString SAL_CALL getDefaultPropertyName(  ) override { return "Value"; }
 };
 #endif // INCLUDED_VBAHELPER_SOURCE_MSFORMS_VBALABEL_HXX
 
diff --git a/vbahelper/source/msforms/vbalistbox.cxx b/vbahelper/source/msforms/vbalistbox.cxx
index cb35e7b58b40..4e3467abdb44 100644
--- a/vbahelper/source/msforms/vbalistbox.cxx
+++ b/vbahelper/source/msforms/vbalistbox.cxx
@@ -261,7 +261,7 @@ uno::Reference< msforms::XNewFont > SAL_CALL ScVbaListBox::getFont()
 OUString
 ScVbaListBox::getServiceImplName()
 {
-    return OUString("ScVbaListBox");
+    return "ScVbaListBox";
 }
 
 uno::Sequence< OUString >
diff --git a/vbahelper/source/msforms/vbalistbox.hxx b/vbahelper/source/msforms/vbalistbox.hxx
index 71912fa06e15..b87f9e74f7dd 100644
--- a/vbahelper/source/msforms/vbalistbox.hxx
+++ b/vbahelper/source/msforms/vbalistbox.hxx
@@ -63,7 +63,7 @@ public:
     virtual void SAL_CALL setRowSource( const OUString& _rowsource ) override;
 
     // XDefaultProperty
-    OUString SAL_CALL getDefaultPropertyName(  ) override { return OUString("Value"); }
+    OUString SAL_CALL getDefaultPropertyName(  ) override { return "Value"; }
 
     //XHelperInterface
     virtual OUString getServiceImplName() override;
diff --git a/vbahelper/source/msforms/vbamultipage.cxx b/vbahelper/source/msforms/vbamultipage.cxx
index 0608c1d64bda..18c74ffdff30 100644
--- a/vbahelper/source/msforms/vbamultipage.cxx
+++ b/vbahelper/source/msforms/vbamultipage.cxx
@@ -86,7 +86,7 @@ ScVbaMultiPage::setValue( const sal_Int32 _value )
 OUString
 ScVbaMultiPage::getServiceImplName()
 {
-    return OUString( "ScVbaMultiPage" );
+    return "ScVbaMultiPage";
 }
 
 uno::Any SAL_CALL
diff --git a/vbahelper/source/msforms/vbapages.cxx b/vbahelper/source/msforms/vbapages.cxx
index c40aaa8fdf90..05e0f25c110d 100644
--- a/vbahelper/source/msforms/vbapages.cxx
+++ b/vbahelper/source/msforms/vbapages.cxx
@@ -41,7 +41,7 @@ ScVbaPages::createCollectionObject( const css::uno::Any& aSource )
 OUString
 ScVbaPages::getServiceImplName()
 {
-    return OUString( "ScVbaPages" );
+    return "ScVbaPages";
 }
 
 uno::Reference< container::XEnumeration > SAL_CALL
diff --git a/vbahelper/source/msforms/vbaprogressbar.cxx b/vbahelper/source/msforms/vbaprogressbar.cxx
index 64b6726905ff..b6c3513ab7d3 100644
--- a/vbahelper/source/msforms/vbaprogressbar.cxx
+++ b/vbahelper/source/msforms/vbaprogressbar.cxx
@@ -45,7 +45,7 @@ ScVbaProgressBar::setValue( const uno::Any& _value )
 OUString
 ScVbaProgressBar::getServiceImplName()
 {
-    return OUString( "ScVbaProgressBar" );
+    return "ScVbaProgressBar";
 }
 
 uno::Sequence< OUString >
diff --git a/vbahelper/source/msforms/vbaprogressbar.hxx b/vbahelper/source/msforms/vbaprogressbar.hxx
index 3b505d6fd120..3822acf21527 100644
--- a/vbahelper/source/msforms/vbaprogressbar.hxx
+++ b/vbahelper/source/msforms/vbaprogressbar.hxx
@@ -39,7 +39,7 @@ public:
     virtual OUString getServiceImplName() override;
     virtual css::uno::Sequence<OUString> getServiceNames() override;
     // XDefaultProperty
-    OUString SAL_CALL getDefaultPropertyName(  ) override { return OUString("Value"); }
+    OUString SAL_CALL getDefaultPropertyName(  ) override { return "Value"; }
 };
 
 #endif // INCLUDED_VBAHELPER_SOURCE_MSFORMS_VBAPROGRESSBAR_HXX
diff --git a/vbahelper/source/msforms/vbaradiobutton.cxx b/vbahelper/source/msforms/vbaradiobutton.cxx
index 8328dff14d76..5a00c21e0d98 100644
--- a/vbahelper/source/msforms/vbaradiobutton.cxx
+++ b/vbahelper/source/msforms/vbaradiobutton.cxx
@@ -94,7 +94,7 @@ uno::Reference< msforms::XNewFont > SAL_CALL ScVbaRadioButton::getFont()
 OUString
 ScVbaRadioButton::getServiceImplName()
 {
-    return OUString( "ScVbaRadioButton" );
+    return "ScVbaRadioButton";
 }
 
 uno::Sequence< OUString >
diff --git a/vbahelper/source/msforms/vbaradiobutton.hxx b/vbahelper/source/msforms/vbaradiobutton.hxx
index 047789597e9d..ffa5a542c6b8 100644
--- a/vbahelper/source/msforms/vbaradiobutton.hxx
+++ b/vbahelper/source/msforms/vbaradiobutton.hxx
@@ -39,7 +39,7 @@ public:
     virtual OUString getServiceImplName() override;
     virtual css::uno::Sequence<OUString> getServiceNames() override;
     // XDefaultProperty
-    OUString SAL_CALL getDefaultPropertyName(  ) override { return OUString("Value"); }
+    OUString SAL_CALL getDefaultPropertyName(  ) override { return "Value"; }
 
 };
 #endif // INCLUDED_VBAHELPER_SOURCE_MSFORMS_VBARADIOBUTTON_HXX
diff --git a/vbahelper/source/msforms/vbascrollbar.cxx b/vbahelper/source/msforms/vbascrollbar.cxx
index 10c49e79c16b..4968c72826b6 100644
--- a/vbahelper/source/msforms/vbascrollbar.cxx
+++ b/vbahelper/source/msforms/vbascrollbar.cxx
@@ -99,7 +99,7 @@ ScVbaScrollBar::setSmallChange( ::sal_Int32 _smallchange )
 OUString
 ScVbaScrollBar::getServiceImplName()
 {
-    return OUString("ScVbaScrollBar" );
+    return "ScVbaScrollBar";
 }
 
 uno::Sequence< OUString >
diff --git a/vbahelper/source/msforms/vbaspinbutton.cxx b/vbahelper/source/msforms/vbaspinbutton.cxx
index 1da95fcedc55..3180f4861e83 100644
--- a/vbahelper/source/msforms/vbaspinbutton.cxx
+++ b/vbahelper/source/msforms/vbaspinbutton.cxx
@@ -71,7 +71,7 @@ ScVbaSpinButton::setMin( sal_Int32 nVal )
 OUString
 ScVbaSpinButton::getServiceImplName()
 {
-    return OUString( "ScVbaSpinButton" );
+    return "ScVbaSpinButton";
 }
 
 uno::Sequence< OUString >
diff --git a/vbahelper/source/msforms/vbasystemaxcontrol.cxx b/vbahelper/source/msforms/vbasystemaxcontrol.cxx
index d1c42c3746b2..ea135e270b00 100644
--- a/vbahelper/source/msforms/vbasystemaxcontrol.cxx
+++ b/vbahelper/source/msforms/vbasystemaxcontrol.cxx
@@ -68,7 +68,7 @@ sal_Bool SAL_CALL VbaSystemAXControl::hasProperty( const OUString& aName )
 OUString
 VbaSystemAXControl::getServiceImplName()
 {
-    return OUString( "VbaSystemAXControl" );
+    return "VbaSystemAXControl";
 }
 
 
diff --git a/vbahelper/source/msforms/vbatextbox.cxx b/vbahelper/source/msforms/vbatextbox.cxx
index 4c2e7a89b73d..59f736d48dcc 100644
--- a/vbahelper/source/msforms/vbatextbox.cxx
+++ b/vbahelper/source/msforms/vbatextbox.cxx
@@ -167,7 +167,7 @@ void SAL_CALL ScVbaTextBox::setLocked( sal_Bool bLocked )
 OUString
 ScVbaTextBox::getServiceImplName()
 {
-    return OUString( "ScVbaTextBox" );
+    return "ScVbaTextBox";
 }
 
 uno::Sequence< OUString >
diff --git a/vbahelper/source/msforms/vbatextbox.hxx b/vbahelper/source/msforms/vbatextbox.hxx
index 248106fb7877..debf3994de40 100644
--- a/vbahelper/source/msforms/vbatextbox.hxx
+++ b/vbahelper/source/msforms/vbatextbox.hxx
@@ -55,7 +55,7 @@ public:
     virtual void SAL_CALL setLocked( sal_Bool bAutoSize ) override;
 
     // XDefaultProperty
-    OUString SAL_CALL getDefaultPropertyName(  ) override { return OUString("Value"); }
+    OUString SAL_CALL getDefaultPropertyName(  ) override { return "Value"; }
     //XHelperInterface
     virtual OUString getServiceImplName() override;
     virtual css::uno::Sequence<OUString> getServiceNames() override;
diff --git a/vbahelper/source/msforms/vbatogglebutton.cxx b/vbahelper/source/msforms/vbatogglebutton.cxx
index 61b6562f0beb..fbb7c267a428 100644
--- a/vbahelper/source/msforms/vbatogglebutton.cxx
+++ b/vbahelper/source/msforms/vbatogglebutton.cxx
@@ -148,7 +148,7 @@ void SAL_CALL ScVbaToggleButton::setLocked( sal_Bool bLocked )
 OUString
 ScVbaToggleButton::getServiceImplName()
 {
-    return OUString( "ScVbaToggleButton" );
+    return "ScVbaToggleButton";
 }
 
 uno::Sequence< OUString >
diff --git a/vbahelper/source/msforms/vbatogglebutton.hxx b/vbahelper/source/msforms/vbatogglebutton.hxx
index fbedac3cdd37..dc6a440a5f1b 100644
--- a/vbahelper/source/msforms/vbatogglebutton.hxx
+++ b/vbahelper/source/msforms/vbatogglebutton.hxx
@@ -53,7 +53,7 @@ public:
     virtual OUString getServiceImplName() override;
     virtual css::uno::Sequence<OUString> getServiceNames() override;
     // XDefaultProperty
-    OUString SAL_CALL getDefaultPropertyName(  ) override { return OUString("Value"); }
+    OUString SAL_CALL getDefaultPropertyName(  ) override { return "Value"; }
 };
 #endif // INCLUDED_VBAHELPER_SOURCE_MSFORMS_VBATOGGLEBUTTON_HXX
 
diff --git a/vbahelper/source/msforms/vbauserform.cxx b/vbahelper/source/msforms/vbauserform.cxx
index a22f15d41dae..c29c9782b3c9 100644
--- a/vbahelper/source/msforms/vbauserform.cxx
+++ b/vbahelper/source/msforms/vbauserform.cxx
@@ -182,7 +182,7 @@ ScVbaUserForm::UnloadObject(  )
 OUString
 ScVbaUserForm::getServiceImplName()
 {
-    return OUString("ScVbaUserForm");
+    return "ScVbaUserForm";
 }
 
 uno::Sequence< OUString >
diff --git a/vbahelper/source/vbahelper/vbaapplicationbase.cxx b/vbahelper/source/vbahelper/vbaapplicationbase.cxx
index 6b647e26db1c..90c7e83badc6 100644
--- a/vbahelper/source/vbahelper/vbaapplicationbase.cxx
+++ b/vbahelper/source/vbahelper/vbaapplicationbase.cxx
@@ -316,7 +316,7 @@ VbaApplicationBase::CommandBars( const uno::Any& aIndex )
 OUString SAL_CALL
 VbaApplicationBase::getVersion()
 {
-    return OUString(OFFICEVERSION);
+    return OFFICEVERSION;
 }
 
 uno::Any SAL_CALL VbaApplicationBase::Run( const OUString& MacroName, const uno::Any& varg1, const uno::Any& varg2, const uno::Any& varg3, const uno::Any& varg4, const uno::Any& varg5, const uno::Any& varg6, const uno::Any& varg7, const uno::Any& varg8, const uno::Any& varg9, const uno::Any& varg10, const uno::Any& varg11, const uno::Any& varg12, const uno::Any& varg13, const uno::Any& varg14, const uno::Any& varg15, const uno::Any& varg16, const uno::Any& varg17, const uno::Any& varg18, const uno::Any& varg19, const uno::Any& varg20, const uno::Any& varg21, const uno::Any& varg22, const uno::Any& varg23, const uno::Any& varg24, const uno::Any& varg25, const uno::Any& varg26, const uno::Any& varg27, const uno::Any& varg28, const uno::Any& varg29, const uno::Any& varg30 )
@@ -425,7 +425,7 @@ uno::Any SAL_CALL VbaApplicationBase::getVBE()
 OUString
 VbaApplicationBase::getServiceImplName()
 {
-    return OUString("VbaApplicationBase");
+    return "VbaApplicationBase";
 }
 
 uno::Sequence<OUString>
diff --git a/vbahelper/source/vbahelper/vbacolorformat.cxx b/vbahelper/source/vbahelper/vbacolorformat.cxx
index fc4301a4490f..7c72c65a1eeb 100644
--- a/vbahelper/source/vbahelper/vbacolorformat.cxx
+++ b/vbahelper/source/vbahelper/vbacolorformat.cxx
@@ -154,7 +154,7 @@ ScVbaColorFormat::setSchemeColor( sal_Int32 _schemecolor )
 OUString
 ScVbaColorFormat::getServiceImplName()
 {
-    return OUString("ScVbaColorFormat");
+    return "ScVbaColorFormat";
 }
 
 uno::Sequence< OUString >
diff --git a/vbahelper/source/vbahelper/vbacommandbar.cxx b/vbahelper/source/vbahelper/vbacommandbar.cxx
index c0316c1b51d7..c1adf36f681a 100644
--- a/vbahelper/source/vbahelper/vbacommandbar.cxx
+++ b/vbahelper/source/vbahelper/vbacommandbar.cxx
@@ -177,7 +177,7 @@ ScVbaCommandBar::FindControl( const uno::Any& /*aType*/, const uno::Any& /*aId*/
 OUString
 ScVbaCommandBar::getServiceImplName()
 {
-    return OUString("ScVbaCommandBar");
+    return "ScVbaCommandBar";
 }
 
 uno::Sequence<OUString>
@@ -259,7 +259,7 @@ uno::Any SAL_CALL VbaDummyCommandBar::FindControl( const uno::Any& /*aType*/, co
 
 OUString VbaDummyCommandBar::getServiceImplName()
 {
-    return OUString("VbaDummyCommandBar");
+    return "VbaDummyCommandBar";
 }
 
 uno::Sequence< OUString > VbaDummyCommandBar::getServiceNames()
diff --git a/vbahelper/source/vbahelper/vbacommandbarcontrol.cxx b/vbahelper/source/vbahelper/vbacommandbarcontrol.cxx
index 27d98cbd9241..d7220f071e8d 100644
--- a/vbahelper/source/vbahelper/vbacommandbarcontrol.cxx
+++ b/vbahelper/source/vbahelper/vbacommandbarcontrol.cxx
@@ -179,7 +179,7 @@ ScVbaCommandBarControl::Controls( const uno::Any& aIndex )
 OUString
 ScVbaCommandBarControl::getServiceImplName()
 {
-    return OUString("ScVbaCommandBarControl");
+    return "ScVbaCommandBarControl";
 }
 
 uno::Sequence<OUString>
@@ -209,7 +209,7 @@ ScVbaCommandBarPopup::ScVbaCommandBarPopup( const css::uno::Reference< ov::XHelp
 OUString
 ScVbaCommandBarPopup::getServiceImplName()
 {
-    return OUString("ScVbaCommandBarPopup");
+    return "ScVbaCommandBarPopup";
 }
 
 uno::Sequence<OUString>
@@ -239,7 +239,7 @@ ScVbaCommandBarButton::ScVbaCommandBarButton( const css::uno::Reference< ov::XHe
 OUString
 ScVbaCommandBarButton::getServiceImplName()
 {
-    return OUString("ScVbaCommandBarButton");
+    return "ScVbaCommandBarButton";
 }
 
 uno::Sequence<OUString>
diff --git a/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx b/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx
index 830a922c2d09..f789a487f6b2 100644
--- a/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx
+++ b/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx
@@ -230,7 +230,7 @@ ScVbaCommandBarControls::Add( const uno::Any& Type, const uno::Any& Id, const un
 OUString
 ScVbaCommandBarControls::getServiceImplName()
 {
-    return OUString("ScVbaCommandBarControls");
+    return "ScVbaCommandBarControls";
 }
 
 uno::Sequence<OUString>
@@ -299,7 +299,7 @@ uno::Reference< XCommandBarControl > SAL_CALL VbaDummyCommandBarControls::Add(
 // XHelperInterface
 OUString VbaDummyCommandBarControls::getServiceImplName()
 {
-    return OUString("VbaDummyCommandBarControls");
+    return "VbaDummyCommandBarControls";
 }
 
 uno::Sequence<OUString> VbaDummyCommandBarControls::getServiceNames()
diff --git a/vbahelper/source/vbahelper/vbacommandbars.cxx b/vbahelper/source/vbahelper/vbacommandbars.cxx
index b771e3d541cf..be173f49b2a7 100644
--- a/vbahelper/source/vbahelper/vbacommandbars.cxx
+++ b/vbahelper/source/vbahelper/vbacommandbars.cxx
@@ -220,7 +220,7 @@ ScVbaCommandBars::Item( const uno::Any& aIndex, const uno::Any& /*aIndex2*/ )
 OUString
 ScVbaCommandBars::getServiceImplName()
 {
-    return OUString("ScVbaCommandBars");
+    return "ScVbaCommandBars";
 }
 
 uno::Sequence<OUString>
diff --git a/vbahelper/source/vbahelper/vbadocumentbase.cxx b/vbahelper/source/vbahelper/vbadocumentbase.cxx
index e8686824dc6c..39aea5b2db18 100644
--- a/vbahelper/source/vbahelper/vbadocumentbase.cxx
+++ b/vbahelper/source/vbahelper/vbadocumentbase.cxx
@@ -296,7 +296,7 @@ VbaDocumentBase::getVBProject()
 OUString
 VbaDocumentBase::getServiceImplName()
 {
-    return OUString( "VbaDocumentBase" );
+    return "VbaDocumentBase";
 }
 
 uno::Sequence< OUString >
diff --git a/vbahelper/source/vbahelper/vbafillformat.cxx b/vbahelper/source/vbahelper/vbafillformat.cxx
index acc748de395d..e72be2c908fc 100644
--- a/vbahelper/source/vbahelper/vbafillformat.cxx
+++ b/vbahelper/source/vbahelper/vbafillformat.cxx
@@ -171,7 +171,7 @@ ScVbaFillFormat::ForeColor()
 OUString
 ScVbaFillFormat::getServiceImplName()
 {
-    return OUString("ScVbaFillFormat");
+    return "ScVbaFillFormat";
 }
 
 uno::Sequence< OUString >
diff --git a/vbahelper/source/vbahelper/vbalineformat.cxx b/vbahelper/source/vbahelper/vbalineformat.cxx
index aa56903264f5..5437d030c777 100644
--- a/vbahelper/source/vbahelper/vbalineformat.cxx
+++ b/vbahelper/source/vbahelper/vbalineformat.cxx
@@ -81,15 +81,15 @@ ScVbaLineFormat::convertArrowheadStyleToLineStartEndName( sal_Int32 nArrowheadSt
         case office::MsoArrowheadStyle::msoArrowheadNone:
             return OUString();
         case office::MsoArrowheadStyle::msoArrowheadStealth:
-            return OUString("Arrow concave");
+            return "Arrow concave";
         case office::MsoArrowheadStyle::msoArrowheadOpen:
-            return OUString("Line Arrow");
+            return "Line Arrow";
         case office::MsoArrowheadStyle::msoArrowheadOval:
-            return  OUString("Circle");
+            return  "Circle";
         case office::MsoArrowheadStyle::msoArrowheadDiamond:
-            return OUString("Square 45");
+            return "Square 45";
         case office::MsoArrowheadStyle::msoArrowheadTriangle:
-            return OUString("Arrow");
+            return "Arrow";
         default:
             throw uno::RuntimeException( "Invalid Arrow Style!" );
     }
@@ -427,7 +427,7 @@ ScVbaLineFormat::ForeColor()
 OUString
 ScVbaLineFormat::getServiceImplName()
 {
-    return OUString("ScVbaLineFormat");
+    return "ScVbaLineFormat";
 }
 
 uno::Sequence< OUString >
diff --git a/vbahelper/source/vbahelper/vbapictureformat.cxx b/vbahelper/source/vbahelper/vbapictureformat.cxx
index 9ace2fb60a79..8e3578f1d35c 100644
--- a/vbahelper/source/vbahelper/vbapictureformat.cxx
+++ b/vbahelper/source/vbahelper/vbapictureformat.cxx
@@ -118,7 +118,7 @@ ScVbaPictureFormat::IncrementContrast( double increment )
 OUString
 ScVbaPictureFormat::getServiceImplName()
 {
-    return OUString("ScVbaPictureFormat");
+    return "ScVbaPictureFormat";
 }
 
 uno::Sequence< OUString >
diff --git a/vbahelper/source/vbahelper/vbashape.cxx b/vbahelper/source/vbahelper/vbashape.cxx
index 8fe5eec3428b..2dd9cdbda000 100644
--- a/vbahelper/source/vbahelper/vbashape.cxx
+++ b/vbahelper/source/vbahelper/vbashape.cxx
@@ -742,7 +742,7 @@ ScVbaShape::WrapFormat()
 OUString
 ScVbaShape::getServiceImplName()
 {
-    return OUString("ScVbaShape");
+    return "ScVbaShape";
 }
 
 uno::Sequence< OUString >
diff --git a/vbahelper/source/vbahelper/vbashaperange.cxx b/vbahelper/source/vbahelper/vbashaperange.cxx
index e75aff14b0ff..b21c24165cf7 100644
--- a/vbahelper/source/vbahelper/vbashaperange.cxx
+++ b/vbahelper/source/vbahelper/vbashaperange.cxx
@@ -400,7 +400,7 @@ ScVbaShapeRange:: createCollectionObject( const css::uno::Any& aSource )
 OUString
 ScVbaShapeRange::getServiceImplName()
 {
-    return OUString("ScVbaShapeRange");
+    return "ScVbaShapeRange";
 }
 
 uno::Sequence< OUString >
diff --git a/vbahelper/source/vbahelper/vbashapes.cxx b/vbahelper/source/vbahelper/vbashapes.cxx
index 52b5f4e5ec5b..d993d443ea5e 100644
--- a/vbahelper/source/vbahelper/vbashapes.cxx
+++ b/vbahelper/source/vbahelper/vbashapes.cxx
@@ -120,7 +120,7 @@ ScVbaShapes::getElementType()
 OUString
 ScVbaShapes::getServiceImplName()
 {
-    return OUString("ScVbaShapes");
+    return "ScVbaShapes";
 }
 
 uno::Sequence< OUString >
diff --git a/vbahelper/source/vbahelper/vbatextframe.cxx b/vbahelper/source/vbahelper/vbatextframe.cxx
index 8f6ba54492a8..a55c895376ec 100644
--- a/vbahelper/source/vbahelper/vbatextframe.cxx
+++ b/vbahelper/source/vbahelper/vbatextframe.cxx
@@ -141,7 +141,7 @@ VbaTextFrame::Characters()
 OUString
 VbaTextFrame::getServiceImplName()
 {
-    return OUString("VbaTextFrame");
+    return "VbaTextFrame";
 }
 
 uno::Sequence< OUString >
diff --git a/vbahelper/source/vbahelper/vbawindowbase.cxx b/vbahelper/source/vbahelper/vbawindowbase.cxx
index 46b08bced666..3e86fe0399ea 100644
--- a/vbahelper/source/vbahelper/vbawindowbase.cxx
+++ b/vbahelper/source/vbahelper/vbawindowbase.cxx
@@ -132,7 +132,7 @@ VbaWindowBase::setWidth( sal_Int32 _width )
 OUString
 VbaWindowBase::getServiceImplName()
 {
-    return OUString("VbaWindowBase");
+    return "VbaWindowBase";
 }
 
 uno::Sequence< OUString >