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>

15 files changed, 25 insertions, 25 deletions

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 >