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

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

30 files changed, 114 insertions, 114 deletions

diff --git a/toolkit/source/awt/asynccallback.cxx b/toolkit/source/awt/asynccallback.cxx
index c37b20930a71..0813a5fb10c7 100644
--- a/toolkit/source/awt/asynccallback.cxx
+++ b/toolkit/source/awt/asynccallback.cxx
@@ -68,7 +68,7 @@ private:
 // com.sun.star.uno.XServiceInfo:
 OUString SAL_CALL AsyncCallback::getImplementationName()
 {
-    return OUString("com.sun.star.awt.comp.AsyncCallback");
+    return "com.sun.star.awt.comp.AsyncCallback";
 }
 
 sal_Bool SAL_CALL AsyncCallback::supportsService(OUString const & serviceName)
diff --git a/toolkit/source/awt/vclxaccessiblecomponent.cxx b/toolkit/source/awt/vclxaccessiblecomponent.cxx
index f9b55d278655..d821a4c44f80 100644
--- a/toolkit/source/awt/vclxaccessiblecomponent.cxx
+++ b/toolkit/source/awt/vclxaccessiblecomponent.cxx
@@ -85,7 +85,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER3( VCLXAccessibleComponent, OAccessibleExtendedCo
 
 OUString VCLXAccessibleComponent::getImplementationName()
 {
-    return OUString("com.sun.star.comp.toolkit.AccessibleWindow");
+    return "com.sun.star.comp.toolkit.AccessibleWindow";
 }
 
 sal_Bool VCLXAccessibleComponent::supportsService( const OUString& rServiceName )
diff --git a/toolkit/source/awt/vclxpointer.cxx b/toolkit/source/awt/vclxpointer.cxx
index 7ddc4ac5796c..5323e077be08 100644
--- a/toolkit/source/awt/vclxpointer.cxx
+++ b/toolkit/source/awt/vclxpointer.cxx
@@ -48,7 +48,7 @@ sal_Int32 VCLXPointer::getType()
 
 OUString VCLXPointer::getImplementationName()
 {
-    return OUString("stardiv.Toolkit.VCLXPointer");
+    return "stardiv.Toolkit.VCLXPointer";
 }
 
 sal_Bool VCLXPointer::supportsService(OUString const & ServiceName)
diff --git a/toolkit/source/awt/vclxprinter.cxx b/toolkit/source/awt/vclxprinter.cxx
index 2897d3bafdb0..bcc9c2d20a9c 100644
--- a/toolkit/source/awt/vclxprinter.cxx
+++ b/toolkit/source/awt/vclxprinter.cxx
@@ -360,7 +360,7 @@ css::uno::Reference< css::awt::XInfoPrinter > VCLXPrinterServer::createInfoPrint
 
 OUString VCLXPrinterServer::getImplementationName()
 {
-    return OUString("stardiv.Toolkit.VCLXPrinterServer");
+    return "stardiv.Toolkit.VCLXPrinterServer";
 }
 
 sal_Bool VCLXPrinterServer::supportsService(OUString const & ServiceName)
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index 96699c246d19..1f97511e0f27 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -1833,7 +1833,7 @@ css::uno::Reference< css::datatransfer::clipboard::XClipboard > SAL_CALL VCLXToo
 // XServiceInfo
 OUString VCLXToolkit::getImplementationName()
 {
-    return OUString("stardiv.Toolkit.VCLXToolkit");
+    return "stardiv.Toolkit.VCLXToolkit";
 }
 
 sal_Bool VCLXToolkit::supportsService( const OUString& rServiceName )
diff --git a/toolkit/source/controls/animatedimages.cxx b/toolkit/source/controls/animatedimages.cxx
index 23bb5a4f4b3e..bcc0e0628130 100644
--- a/toolkit/source/controls/animatedimages.cxx
+++ b/toolkit/source/controls/animatedimages.cxx
@@ -88,7 +88,7 @@ public:
 
     OUString AnimatedImagesControl::GetComponentServiceName()
     {
-        return OUString( "AnimatedImages" );
+        return "AnimatedImages";
     }
 
 
@@ -119,7 +119,7 @@ public:
 
     OUString SAL_CALL AnimatedImagesControl::getImplementationName(  )
     {
-        return OUString( "org.openoffice.comp.toolkit.AnimatedImagesControl" );
+        return "org.openoffice.comp.toolkit.AnimatedImagesControl";
     }
 
 
@@ -280,13 +280,13 @@ namespace toolkit {
 
     OUString SAL_CALL AnimatedImagesControlModel::getServiceName()
     {
-        return OUString("com.sun.star.awt.AnimatedImagesControlModel");
+        return "com.sun.star.awt.AnimatedImagesControlModel";
     }
 
 
     OUString SAL_CALL AnimatedImagesControlModel::getImplementationName(  )
     {
-        return OUString("org.openoffice.comp.toolkit.AnimatedImagesControlModel");
+        return "org.openoffice.comp.toolkit.AnimatedImagesControlModel";
     }
 
 
diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx b/toolkit/source/controls/controlmodelcontainerbase.cxx
index 278cbf894711..147a1732885c 100644
--- a/toolkit/source/controls/controlmodelcontainerbase.cxx
+++ b/toolkit/source/controls/controlmodelcontainerbase.cxx
@@ -178,13 +178,13 @@ static void lcl_throwElementExistException( )
 
 static OUString getTabIndexPropertyName( )
 {
-    return OUString( "TabIndex" );
+    return "TabIndex";
 }
 
 
 static OUString getStepPropertyName( )
 {
-    return OUString( "Step" );
+    return "Step";
 }
 
 
diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx
index 328b62d07905..dede0319d66d 100644
--- a/toolkit/source/controls/dialogcontrol.cxx
+++ b/toolkit/source/controls/dialogcontrol.cxx
@@ -157,7 +157,7 @@ public:
 
     // XServiceInfo
     OUString SAL_CALL getImplementationName() override
-    { return OUString("stardiv.Toolkit.UnoControlDialogModel"); }
+    { return "stardiv.Toolkit.UnoControlDialogModel"; }
 
     css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
     {
@@ -232,7 +232,7 @@ rtl::Reference<UnoControlModel> UnoControlDialogModel::Clone() const
 
 OUString UnoControlDialogModel::getServiceName( )
 {
-    return OUString("stardiv.vcl.controlmodel.Dialog");
+    return "stardiv.vcl.controlmodel.Dialog";
 }
 
 Any UnoControlDialogModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
@@ -313,9 +313,9 @@ OUString UnoDialogControl::GetComponentServiceName()
     bool bDecoration( true );
     ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_DECORATION )) >>= bDecoration;
     if ( bDecoration )
-        return OUString("Dialog");
+        return "Dialog";
     else
-        return OUString("TabPage");
+        return "TabPage";
 }
 
 void UnoDialogControl::dispose()
@@ -374,7 +374,7 @@ void UnoDialogControl::createPeer( const Reference< XToolkit > & rxToolkit, cons
 
 OUString UnoDialogControl::getImplementationName()
 {
-    return OUString("stardiv.Toolkit.UnoDialogControl");
+    return "stardiv.Toolkit.UnoDialogControl";
 }
 
 sal_Bool UnoDialogControl::supportsService(OUString const & ServiceName)
@@ -760,9 +760,9 @@ OUString UnoMultiPageControl::GetComponentServiceName()
     bool bDecoration( true );
     ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_DECORATION )) >>= bDecoration;
     if ( bDecoration )
-        return OUString("tabcontrol");
+        return "tabcontrol";
     // Hopefully we can tweak the tabcontrol to display without tabs
-    return OUString("tabcontrolnotabs");
+    return "tabcontrolnotabs";
 }
 
 void UnoMultiPageControl::bindPage( const uno::Reference< awt::XControl >& _rxControl )
@@ -871,7 +871,7 @@ rtl::Reference<UnoControlModel> UnoMultiPageModel::Clone() const
 
 OUString UnoMultiPageModel::getServiceName()
 {
-    return OUString( "com.sun.star.awt.UnoMultiPageModel" );
+    return "com.sun.star.awt.UnoMultiPageModel";
 }
 
 uno::Any UnoMultiPageModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
@@ -932,7 +932,7 @@ UnoPageControl::~UnoPageControl()
 
 OUString UnoPageControl::GetComponentServiceName()
 {
-    return OUString("tabpage");
+    return "tabpage";
 }
 
 
@@ -978,7 +978,7 @@ rtl::Reference<UnoControlModel> UnoPageModel::Clone() const
 
 OUString UnoPageModel::getServiceName()
 {
-    return OUString( "com.sun.star.awt.UnoPageModel" );
+    return "com.sun.star.awt.UnoPageModel";
 }
 
 uno::Any UnoPageModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
@@ -1026,7 +1026,7 @@ UnoFrameControl::~UnoFrameControl()
 
 OUString UnoFrameControl::GetComponentServiceName()
 {
-    return OUString("frame");
+    return "frame";
 }
 
 void UnoFrameControl::ImplSetPosSize( Reference< XControl >& rxCtrl )
@@ -1125,7 +1125,7 @@ rtl::Reference<UnoControlModel> UnoFrameModel::Clone() const
 
 OUString UnoFrameModel::getServiceName()
 {
-    return OUString( "com.sun.star.awt.UnoFrameModel" );
+    return "com.sun.star.awt.UnoFrameModel";
 }
 
 uno::Any UnoFrameModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
diff --git a/toolkit/source/controls/formattedcontrol.cxx b/toolkit/source/controls/formattedcontrol.cxx
index c08e1f3f63ca..c7ff000eac80 100644
--- a/toolkit/source/controls/formattedcontrol.cxx
+++ b/toolkit/source/controls/formattedcontrol.cxx
@@ -407,7 +407,7 @@ namespace toolkit
 
     OUString UnoControlFormattedFieldModel::getImplementationName()
     {
-        return OUString("stardiv.Toolkit.UnoControlFormattedFieldModel");
+        return "stardiv.Toolkit.UnoControlFormattedFieldModel";
     }
 
     css::uno::Sequence<OUString>
@@ -431,7 +431,7 @@ namespace toolkit
 
     OUString UnoFormattedFieldControl::GetComponentServiceName()
     {
-        return OUString("FormattedField");
+        return "FormattedField";
     }
 
 
@@ -456,7 +456,7 @@ namespace toolkit
 
     OUString UnoFormattedFieldControl::getImplementationName()
     {
-        return OUString("stardiv.Toolkit.UnoFormattedFieldControl");
+        return "stardiv.Toolkit.UnoFormattedFieldControl";
     }
 
     css::uno::Sequence<OUString>
diff --git a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx
index 3883f662a48b..460b4bcc03d0 100644
--- a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx
+++ b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx
@@ -317,7 +317,7 @@ private:
 
     OUString SAL_CALL DefaultGridColumnModel::getImplementationName(  )
     {
-        return OUString("stardiv.Toolkit.DefaultGridColumnModel");
+        return "stardiv.Toolkit.DefaultGridColumnModel";
     }
 
     sal_Bool SAL_CALL DefaultGridColumnModel::supportsService( const OUString& i_serviceName )
diff --git a/toolkit/source/controls/grid/defaultgriddatamodel.cxx b/toolkit/source/controls/grid/defaultgriddatamodel.cxx
index ae08e1da9a6a..b2c13aac6b4a 100644
--- a/toolkit/source/controls/grid/defaultgriddatamodel.cxx
+++ b/toolkit/source/controls/grid/defaultgriddatamodel.cxx
@@ -480,7 +480,7 @@ private:
 
     OUString SAL_CALL DefaultGridDataModel::getImplementationName(  )
     {
-        return OUString("stardiv.Toolkit.DefaultGridDataModel");
+        return "stardiv.Toolkit.DefaultGridDataModel";
     }
 
     sal_Bool SAL_CALL DefaultGridDataModel::supportsService( const OUString& ServiceName )
diff --git a/toolkit/source/controls/grid/gridcolumn.cxx b/toolkit/source/controls/grid/gridcolumn.cxx
index acb64eccf76c..f56c250156c9 100644
--- a/toolkit/source/controls/grid/gridcolumn.cxx
+++ b/toolkit/source/controls/grid/gridcolumn.cxx
@@ -263,7 +263,7 @@ namespace toolkit
 
     OUString SAL_CALL GridColumn::getImplementationName(  )
     {
-        return OUString( "org.openoffice.comp.toolkit.GridColumn" );
+        return "org.openoffice.comp.toolkit.GridColumn";
     }
 
     sal_Bool SAL_CALL GridColumn::supportsService( const OUString& i_serviceName )
diff --git a/toolkit/source/controls/grid/gridcontrol.cxx b/toolkit/source/controls/grid/gridcontrol.cxx
index 2602d112a017..88335b4d5baf 100644
--- a/toolkit/source/controls/grid/gridcontrol.cxx
+++ b/toolkit/source/controls/grid/gridcontrol.cxx
@@ -212,7 +212,7 @@ void SAL_CALL UnoGridModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle,
 
 OUString UnoGridModel::getServiceName()
 {
-    return OUString("com.sun.star.awt.grid.UnoControlGridModel");
+    return "com.sun.star.awt.grid.UnoControlGridModel";
 }
 
 
@@ -281,7 +281,7 @@ UnoGridControl::~UnoGridControl()
 
 OUString UnoGridControl::GetComponentServiceName()
 {
-    return OUString("Grid");
+    return "Grid";
 }
 
 
diff --git a/toolkit/source/controls/grid/gridcontrol.hxx b/toolkit/source/controls/grid/gridcontrol.hxx
index b82887f35d00..e0dc8ba4fcd7 100644
--- a/toolkit/source/controls/grid/gridcontrol.hxx
+++ b/toolkit/source/controls/grid/gridcontrol.hxx
@@ -65,7 +65,7 @@ public:
 
     // XServiceInfo
     OUString SAL_CALL getImplementationName() override
-    { return OUString("stardiv.Toolkit.GridControlModel"); }
+    { return "stardiv.Toolkit.GridControlModel"; }
 
     css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
     {
@@ -116,7 +116,7 @@ public:
 
     // css::lang::XServiceInfo
     OUString SAL_CALL getImplementationName() override
-    { return OUString("stardiv.Toolkit.GridControl"); }
+    { return "stardiv.Toolkit.GridControl"; }
 
     css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
     {
diff --git a/toolkit/source/controls/grid/sortablegriddatamodel.cxx b/toolkit/source/controls/grid/sortablegriddatamodel.cxx
index d56ae124b781..44204b35458b 100644
--- a/toolkit/source/controls/grid/sortablegriddatamodel.cxx
+++ b/toolkit/source/controls/grid/sortablegriddatamodel.cxx
@@ -869,7 +869,7 @@ void lcl_clear( STLCONTAINER& i_container )
 
     OUString SAL_CALL SortableGridDataModel::getImplementationName(  )
     {
-        return OUString( "org.openoffice.comp.toolkit.SortableGridDataModel" );
+        return "org.openoffice.comp.toolkit.SortableGridDataModel";
     }
 
     sal_Bool SAL_CALL SortableGridDataModel::supportsService( const OUString& i_serviceName )
diff --git a/toolkit/source/controls/roadmapcontrol.cxx b/toolkit/source/controls/roadmapcontrol.cxx
index 54dbb3e20683..ee9aed15d455 100644
--- a/toolkit/source/controls/roadmapcontrol.cxx
+++ b/toolkit/source/controls/roadmapcontrol.cxx
@@ -85,7 +85,7 @@ static void lcl_throwIndexOutOfBoundsException( )
 
     OUString UnoControlRoadmapModel::getImplementationName()
     {
-        return OUString("stardiv.Toolkit.UnoControlRoadmapModel");
+        return "stardiv.Toolkit.UnoControlRoadmapModel";
     }
 
     css::uno::Sequence<OUString>
@@ -385,7 +385,7 @@ sal_Bool SAL_CALL UnoRoadmapControl::setModel(const Reference< XControlModel >&
 
     OUString UnoRoadmapControl::GetComponentServiceName()
     {
-        return OUString("Roadmap");
+        return "Roadmap";
     }
 
 
@@ -481,7 +481,7 @@ void SAL_CALL UnoRoadmapControl::propertyChange( const PropertyChangeEvent& evt
 
 OUString UnoRoadmapControl::getImplementationName()
 {
-    return OUString("stardiv.Toolkit.UnoRoadmapControl");
+    return "stardiv.Toolkit.UnoRoadmapControl";
 }
 
 css::uno::Sequence<OUString> UnoRoadmapControl::getSupportedServiceNames()
diff --git a/toolkit/source/controls/roadmapentry.cxx b/toolkit/source/controls/roadmapentry.cxx
index 5a35fca98d01..d4580cd8c029 100644
--- a/toolkit/source/controls/roadmapentry.cxx
+++ b/toolkit/source/controls/roadmapentry.cxx
@@ -75,7 +75,7 @@ css::uno::Reference< css:: beans::XPropertySetInfo > SAL_CALL
 
 OUString SAL_CALL ORoadmapEntry::getImplementationName(  )
 {
-    return OUString("com.sun.star.comp.toolkit.RoadmapItem");
+    return "com.sun.star.comp.toolkit.RoadmapItem";
 }
 
 sal_Bool SAL_CALL ORoadmapEntry::supportsService( const OUString& ServiceName )
diff --git a/toolkit/source/controls/spinningprogress.cxx b/toolkit/source/controls/spinningprogress.cxx
index ce390e0fd2a5..50ca0bdcaa59 100644
--- a/toolkit/source/controls/spinningprogress.cxx
+++ b/toolkit/source/controls/spinningprogress.cxx
@@ -103,13 +103,13 @@ protected:
 
     OUString SAL_CALL SpinningProgressControlModel::getServiceName()
     {
-        return OUString("com.sun.star.awt.SpinningProgressControlModel");
+        return "com.sun.star.awt.SpinningProgressControlModel";
     }
 
 
     OUString SAL_CALL SpinningProgressControlModel::getImplementationName(  )
     {
-        return OUString("org.openoffice.comp.toolkit.SpinningProgressControlModel");
+        return "org.openoffice.comp.toolkit.SpinningProgressControlModel";
     }
 
 
diff --git a/toolkit/source/controls/stdtabcontroller.cxx b/toolkit/source/controls/stdtabcontroller.cxx
index 0bfdc6302ad7..6d0bc4621809 100644
--- a/toolkit/source/controls/stdtabcontroller.cxx
+++ b/toolkit/source/controls/stdtabcontroller.cxx
@@ -365,7 +365,7 @@ void StdTabController::activateLast(  )
 
 OUString StdTabController::getImplementationName()
 {
-    return OUString("stardiv.Toolkit.StdTabController");
+    return "stardiv.Toolkit.StdTabController";
 }
 
 sal_Bool StdTabController::supportsService(OUString const & ServiceName)
diff --git a/toolkit/source/controls/stdtabcontrollermodel.cxx b/toolkit/source/controls/stdtabcontrollermodel.cxx
index 17b5d8144480..f21720854035 100644
--- a/toolkit/source/controls/stdtabcontrollermodel.cxx
+++ b/toolkit/source/controls/stdtabcontrollermodel.cxx
@@ -419,7 +419,7 @@ void StdTabControllerModel::read( const css::uno::Reference< css::io::XObjectInp
 
 OUString StdTabControllerModel::getImplementationName()
 {
-    return OUString("stardiv.Toolkit.StdTabControllerModel");
+    return "stardiv.Toolkit.StdTabControllerModel";
 }
 
 sal_Bool StdTabControllerModel::supportsService(OUString const & ServiceName)
diff --git a/toolkit/source/controls/tabpagecontainer.cxx b/toolkit/source/controls/tabpagecontainer.cxx
index 61f17296a348..f488687f5d75 100644
--- a/toolkit/source/controls/tabpagecontainer.cxx
+++ b/toolkit/source/controls/tabpagecontainer.cxx
@@ -63,7 +63,7 @@ UnoControlTabPageContainerModel::UnoControlTabPageContainerModel( const Referenc
 
 OUString UnoControlTabPageContainerModel::getServiceName()
 {
-    return OUString("com.sun.star.awt.tab.UnoControlTabPageContainerModel");
+    return "com.sun.star.awt.tab.UnoControlTabPageContainerModel";
 }
 
 uno::Any UnoControlTabPageContainerModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
@@ -220,7 +220,7 @@ UnoControlTabPageContainer::UnoControlTabPageContainer( const uno::Reference< un
 
 OUString UnoControlTabPageContainer::GetComponentServiceName()
 {
-    return OUString("TabPageContainer");
+    return "TabPageContainer";
 }
 
 void SAL_CALL UnoControlTabPageContainer::dispose(  )
diff --git a/toolkit/source/controls/tabpagemodel.cxx b/toolkit/source/controls/tabpagemodel.cxx
index 334557a9ff1e..7d0ff366ba73 100644
--- a/toolkit/source/controls/tabpagemodel.cxx
+++ b/toolkit/source/controls/tabpagemodel.cxx
@@ -59,7 +59,7 @@ UnoControlTabPageModel::UnoControlTabPageModel( Reference< XComponentContext > c
 
 OUString SAL_CALL UnoControlTabPageModel::getImplementationName()
 {
-    return OUString("stardiv.Toolkit.UnoControlTabPageModel");
+    return "stardiv.Toolkit.UnoControlTabPageModel";
 }
 
 css::uno::Sequence< OUString > SAL_CALL UnoControlTabPageModel::getSupportedServiceNames()
@@ -72,7 +72,7 @@ css::uno::Sequence< OUString > SAL_CALL UnoControlTabPageModel::getSupportedServ
 
 OUString UnoControlTabPageModel::getServiceName( )
 {
-    return OUString("com.sun.star.awt.tab.UnoControlTabPageModel");
+    return "com.sun.star.awt.tab.UnoControlTabPageModel";
 }
 
 Any UnoControlTabPageModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
@@ -171,12 +171,12 @@ UnoControlTabPage::~UnoControlTabPage()
 
 OUString UnoControlTabPage::GetComponentServiceName()
 {
-    return OUString("TabPageModel");
+    return "TabPageModel";
 }
 
 OUString SAL_CALL UnoControlTabPage::getImplementationName()
 {
-    return OUString("stardiv.Toolkit.UnoControlTabPage");
+    return "stardiv.Toolkit.UnoControlTabPage";
 }
 
 sal_Bool SAL_CALL UnoControlTabPage::supportsService(OUString const & ServiceName)
diff --git a/toolkit/source/controls/tkscrollbar.cxx b/toolkit/source/controls/tkscrollbar.cxx
index f0efbaccecfe..5ca66a34ab9b 100644
--- a/toolkit/source/controls/tkscrollbar.cxx
+++ b/toolkit/source/controls/tkscrollbar.cxx
@@ -52,7 +52,7 @@ namespace toolkit
 
     OUString UnoControlScrollBarModel::getImplementationName()
     {
-        return OUString("stardiv.Toolkit.UnoControlScrollBarModel");
+        return "stardiv.Toolkit.UnoControlScrollBarModel";
     }
 
     css::uno::Sequence<OUString>
@@ -104,7 +104,7 @@ namespace toolkit
 
     OUString UnoScrollBarControl::GetComponentServiceName()
     {
-        return OUString("ScrollBar");
+        return "ScrollBar";
     }
 
     // css::uno::XInterface
@@ -290,7 +290,7 @@ namespace toolkit
 
     OUString UnoScrollBarControl::getImplementationName()
     {
-        return OUString("stardiv.Toolkit.UnoScrollBarControl");
+        return "stardiv.Toolkit.UnoScrollBarControl";
     }
 
     css::uno::Sequence<OUString> UnoScrollBarControl::getSupportedServiceNames()
diff --git a/toolkit/source/controls/tkspinbutton.cxx b/toolkit/source/controls/tkspinbutton.cxx
index 3baf18dfbbde..25702fd45886 100644
--- a/toolkit/source/controls/tkspinbutton.cxx
+++ b/toolkit/source/controls/tkspinbutton.cxx
@@ -144,7 +144,7 @@ public:
 
     OUString UnoSpinButtonModel::getServiceName( )
     {
-        return OUString("com.sun.star.awt.UnoControlSpinButtonModel");
+        return "com.sun.star.awt.UnoControlSpinButtonModel";
     }
 
 
@@ -183,7 +183,7 @@ public:
 
     OUString SAL_CALL UnoSpinButtonModel::getImplementationName(  )
     {
-        return OUString( "stardiv.Toolkit.UnoSpinButtonModel" );
+        return "stardiv.Toolkit.UnoSpinButtonModel";
     }
 
 
@@ -208,7 +208,7 @@ public:
 
     OUString UnoSpinButtonControl::GetComponentServiceName()
     {
-        return OUString("SpinButton");
+        return "SpinButton";
     }
 
 
@@ -246,7 +246,7 @@ public:
 
     OUString SAL_CALL UnoSpinButtonControl::getImplementationName(  )
     {
-        return OUString( "stardiv.Toolkit.UnoSpinButtonControl" );
+        return "stardiv.Toolkit.UnoSpinButtonControl";
     }
 
 
diff --git a/toolkit/source/controls/tree/treecontrol.cxx b/toolkit/source/controls/tree/treecontrol.cxx
index 6a8c77c11941..3d374bfadacd 100644
--- a/toolkit/source/controls/tree/treecontrol.cxx
+++ b/toolkit/source/controls/tree/treecontrol.cxx
@@ -77,7 +77,7 @@ rtl::Reference<UnoControlModel> UnoTreeModel::Clone() const
 
 OUString UnoTreeModel::getServiceName()
 {
-    return OUString( "com.sun.star.awt.tree.TreeControlModel" );
+    return "com.sun.star.awt.tree.TreeControlModel";
 }
 
 Any UnoTreeModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
@@ -191,7 +191,7 @@ UnoTreeControl::UnoTreeControl()
 
 OUString UnoTreeControl::GetComponentServiceName()
 {
-    return OUString("Tree");
+    return "Tree";
 }
 
 
diff --git a/toolkit/source/controls/tree/treecontrol.hxx b/toolkit/source/controls/tree/treecontrol.hxx
index b72511077574..0d7dc6a066cc 100644
--- a/toolkit/source/controls/tree/treecontrol.hxx
+++ b/toolkit/source/controls/tree/treecontrol.hxx
@@ -49,7 +49,7 @@ public:
 
     // XServiceInfo
     OUString SAL_CALL getImplementationName() override
-    { return OUString("stardiv.Toolkit.TreeControlModel"); }
+    { return "stardiv.Toolkit.TreeControlModel"; }
 
     css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
     {
diff --git a/toolkit/source/controls/tree/treedatamodel.cxx b/toolkit/source/controls/tree/treedatamodel.cxx
index 8878ef23b413..822b22b4d50e 100644
--- a/toolkit/source/controls/tree/treedatamodel.cxx
+++ b/toolkit/source/controls/tree/treedatamodel.cxx
@@ -239,7 +239,7 @@ void SAL_CALL MutableTreeDataModel::removeEventListener( const Reference< XEvent
 
 OUString SAL_CALL MutableTreeDataModel::getImplementationName(  )
 {
-    return OUString( "toolkit.MutableTreeDataModel" );
+    return "toolkit.MutableTreeDataModel";
 }
 
 sal_Bool SAL_CALL MutableTreeDataModel::supportsService( const OUString& ServiceName )
@@ -504,7 +504,7 @@ OUString SAL_CALL MutableTreeNode::getCollapsedGraphicURL(  )
 
 OUString SAL_CALL MutableTreeNode::getImplementationName(  )
 {
-    return OUString( "toolkit.MutableTreeNode" );
+    return "toolkit.MutableTreeNode";
 }
 
 sal_Bool SAL_CALL MutableTreeNode::supportsService( const OUString& ServiceName )
diff --git a/toolkit/source/controls/unocontrolcontainer.cxx b/toolkit/source/controls/unocontrolcontainer.cxx
index eacaffbc0ee1..77eb161f8ac9 100644
--- a/toolkit/source/controls/unocontrolcontainer.cxx
+++ b/toolkit/source/controls/unocontrolcontainer.cxx
@@ -780,7 +780,7 @@ void UnoControlContainer::setVisible( sal_Bool bVisible )
 
 OUString UnoControlContainer::getImplementationName()
 {
-    return OUString("stardiv.Toolkit.UnoControlContainer");
+    return "stardiv.Toolkit.UnoControlContainer";
 }
 
 css::uno::Sequence<OUString> UnoControlContainer::getSupportedServiceNames()
diff --git a/toolkit/source/controls/unocontrolcontainermodel.cxx b/toolkit/source/controls/unocontrolcontainermodel.cxx
index 162173157b29..ef00b644c84f 100644
--- a/toolkit/source/controls/unocontrolcontainermodel.cxx
+++ b/toolkit/source/controls/unocontrolcontainermodel.cxx
@@ -47,7 +47,7 @@ OUString UnoControlContainerModel::getServiceName()
 
 OUString UnoControlContainerModel::getImplementationName()
 {
-    return OUString("stardiv.Toolkit.UnoControlContainerModel");
+    return "stardiv.Toolkit.UnoControlContainerModel";
 }
 
 css::uno::Sequence<OUString>
diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx
index 46866c803e50..97b304699154 100644
--- a/toolkit/source/controls/unocontrols.cxx
+++ b/toolkit/source/controls/unocontrols.cxx
@@ -149,7 +149,7 @@ uno::Reference< beans::XPropertySetInfo > UnoControlEditModel::getPropertySetInf
 
 OUString UnoControlEditModel::getImplementationName()
 {
-    return OUString("stardiv.Toolkit.UnoControlEditModel");
+    return "stardiv.Toolkit.UnoControlEditModel";
 }
 
 css::uno::Sequence<OUString> UnoControlEditModel::getSupportedServiceNames()
@@ -468,7 +468,7 @@ void UnoEditControl::getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines )
 
 OUString UnoEditControl::getImplementationName(  )
 {
-    return OUString( "stardiv.Toolkit.UnoEditControl" );
+    return "stardiv.Toolkit.UnoEditControl";
 }
 
 uno::Sequence< OUString > UnoEditControl::getSupportedServiceNames()
@@ -543,7 +543,7 @@ uno::Reference< beans::XPropertySetInfo > UnoControlFileControlModel::getPropert
 
 OUString UnoControlFileControlModel::getImplementationName()
 {
-    return OUString("stardiv.Toolkit.UnoControlFileControlModel");
+    return "stardiv.Toolkit.UnoControlFileControlModel";
 }
 
 css::uno::Sequence<OUString>
@@ -574,12 +574,12 @@ UnoFileControl::UnoFileControl()
 
 OUString UnoFileControl::GetComponentServiceName()
 {
-    return OUString("filecontrol");
+    return "filecontrol";
 }
 
 OUString UnoFileControl::getImplementationName()
 {
-    return OUString("stardiv.Toolkit.UnoFileControl");
+    return "stardiv.Toolkit.UnoFileControl";
 }
 
 css::uno::Sequence<OUString> UnoFileControl::getSupportedServiceNames()
@@ -724,7 +724,7 @@ uno::Reference< beans::XPropertySetInfo > UnoControlButtonModel::getPropertySetI
 
 OUString UnoControlButtonModel::getImplementationName()
 {
-    return OUString("stardiv.Toolkit.UnoControlButtonModel");
+    return "stardiv.Toolkit.UnoControlButtonModel";
 }
 
 css::uno::Sequence<OUString> UnoControlButtonModel::getSupportedServiceNames()
@@ -882,7 +882,7 @@ awt::Size UnoButtonControl::calcAdjustedSize( const awt::Size& rNewSize )
 
 OUString UnoButtonControl::getImplementationName()
 {
-    return OUString("stardiv.Toolkit.UnoButtonControl");
+    return "stardiv.Toolkit.UnoButtonControl";
 }
 
 css::uno::Sequence<OUString> UnoButtonControl::getSupportedServiceNames()
@@ -919,7 +919,7 @@ OUString UnoControlImageControlModel::getServiceName()
 
 OUString UnoControlImageControlModel::getImplementationName()
 {
-    return OUString("stardiv.Toolkit.UnoControlImageControlModel");
+    return "stardiv.Toolkit.UnoControlImageControlModel";
 }
 
 css::uno::Sequence<OUString>
@@ -1018,7 +1018,7 @@ UnoImageControlControl::UnoImageControlControl()
 
 OUString UnoImageControlControl::GetComponentServiceName()
 {
-    return OUString("fixedimage");
+    return "fixedimage";
 }
 
 void UnoImageControlControl::dispose()
@@ -1051,7 +1051,7 @@ awt::Size UnoImageControlControl::calcAdjustedSize( const awt::Size& rNewSize )
 
 OUString UnoImageControlControl::getImplementationName()
 {
-    return OUString("stardiv.Toolkit.UnoImageControlControl");
+    return "stardiv.Toolkit.UnoImageControlControl";
 }
 
 css::uno::Sequence<OUString> UnoImageControlControl::getSupportedServiceNames()
@@ -1116,7 +1116,7 @@ uno::Reference< beans::XPropertySetInfo > UnoControlRadioButtonModel::getPropert
 
 OUString UnoControlRadioButtonModel::getImplementationName()
 {
-    return OUString("stardiv.Toolkit.UnoControlRadioButtonModel");
+    return "stardiv.Toolkit.UnoControlRadioButtonModel";
 }
 
 css::uno::Sequence<OUString>
@@ -1151,7 +1151,7 @@ UnoRadioButtonControl::UnoRadioButtonControl()
 
 OUString UnoRadioButtonControl::GetComponentServiceName()
 {
-    return OUString("radiobutton");
+    return "radiobutton";
 }
 
 void UnoRadioButtonControl::dispose()
@@ -1295,7 +1295,7 @@ awt::Size UnoRadioButtonControl::calcAdjustedSize( const awt::Size& rNewSize )
 
 OUString UnoRadioButtonControl::getImplementationName()
 {
-    return OUString("stardiv.Toolkit.UnoRadioButtonControl");
+    return "stardiv.Toolkit.UnoRadioButtonControl";
 }
 
 css::uno::Sequence<OUString> UnoRadioButtonControl::getSupportedServiceNames()
@@ -1358,7 +1358,7 @@ uno::Reference< beans::XPropertySetInfo > UnoControlCheckBoxModel::getPropertySe
 
 OUString UnoControlCheckBoxModel::getImplementationName()
 {
-    return OUString( "stardiv.Toolkit.UnoControlCheckBoxModel");
+    return "stardiv.Toolkit.UnoControlCheckBoxModel";
 }
 
 css::uno::Sequence<OUString> UnoControlCheckBoxModel::getSupportedServiceNames()
@@ -1391,7 +1391,7 @@ UnoCheckBoxControl::UnoCheckBoxControl()
 
 OUString UnoCheckBoxControl::GetComponentServiceName()
 {
-    return OUString("checkbox");
+    return "checkbox";
 }
 
 void UnoCheckBoxControl::dispose()
@@ -1509,7 +1509,7 @@ awt::Size UnoCheckBoxControl::calcAdjustedSize( const awt::Size& rNewSize )
 
 OUString UnoCheckBoxControl::getImplementationName()
 {
-    return OUString("stardiv.Toolkit.UnoCheckBoxControl");
+    return "stardiv.Toolkit.UnoCheckBoxControl";
 }
 
 css::uno::Sequence<OUString> UnoCheckBoxControl::getSupportedServiceNames()
@@ -1540,7 +1540,7 @@ UnoControlFixedHyperlinkModel::UnoControlFixedHyperlinkModel( const Reference< X
 
 OUString UnoControlFixedHyperlinkModel::getServiceName()
 {
-    return OUString( "com.sun.star.awt.UnoControlFixedHyperlinkModel" );
+    return "com.sun.star.awt.UnoControlFixedHyperlinkModel";
 }
 
 uno::Any UnoControlFixedHyperlinkModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
@@ -1595,7 +1595,7 @@ UnoFixedHyperlinkControl::UnoFixedHyperlinkControl()
 
 OUString UnoFixedHyperlinkControl::GetComponentServiceName()
 {
-    return OUString("fixedhyperlink");
+    return "fixedhyperlink";
 }
 
 // uno::XInterface
@@ -1733,7 +1733,7 @@ UnoControlFixedTextModel::UnoControlFixedTextModel( const Reference< XComponentC
 
 OUString UnoControlFixedTextModel::getServiceName()
 {
-    return OUString( "stardiv.vcl.controlmodel.FixedText" );
+    return "stardiv.vcl.controlmodel.FixedText";
 }
 
 uno::Any UnoControlFixedTextModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
@@ -1765,7 +1765,7 @@ uno::Reference< beans::XPropertySetInfo > UnoControlFixedTextModel::getPropertyS
 
 OUString UnoControlFixedTextModel::getImplementationName()
 {
-    return OUString("stardiv.Toolkit.UnoControlFixedTextModel");
+    return "stardiv.Toolkit.UnoControlFixedTextModel";
 }
 
 css::uno::Sequence<OUString>
@@ -1798,7 +1798,7 @@ UnoFixedTextControl::UnoFixedTextControl()
 
 OUString UnoFixedTextControl::GetComponentServiceName()
 {
-    return OUString("fixedtext");
+    return "fixedtext";
 }
 
 // uno::XInterface
@@ -1872,7 +1872,7 @@ awt::Size UnoFixedTextControl::calcAdjustedSize( const awt::Size& rNewSize )
 
 OUString UnoFixedTextControl::getImplementationName()
 {
-    return OUString("stardiv.Toolkit.UnoFixedTextControl");
+    return "stardiv.Toolkit.UnoFixedTextControl";
 }
 
 css::uno::Sequence<OUString> UnoFixedTextControl::getSupportedServiceNames()
@@ -1939,7 +1939,7 @@ uno::Reference< beans::XPropertySetInfo > UnoControlGroupBoxModel::getPropertySe
 
 OUString UnoControlGroupBoxModel::getImplementationName()
 {
-    return OUString("stardiv.Toolkit.UnoControlGroupBoxModel");
+    return "stardiv.Toolkit.UnoControlGroupBoxModel";
 }
 
 css::uno::Sequence<OUString> UnoControlGroupBoxModel::getSupportedServiceNames()
@@ -1971,7 +1971,7 @@ UnoGroupBoxControl::UnoGroupBoxControl()
 
 OUString UnoGroupBoxControl::GetComponentServiceName()
 {
-    return OUString("groupbox");
+    return "groupbox";
 }
 
 sal_Bool UnoGroupBoxControl::isTransparent()
@@ -1981,7 +1981,7 @@ sal_Bool UnoGroupBoxControl::isTransparent()
 
 OUString UnoGroupBoxControl::getImplementationName()
 {
-    return OUString("stardiv.Toolkit.UnoGroupBoxControl");
+    return "stardiv.Toolkit.UnoGroupBoxControl";
 }
 
 css::uno::Sequence<OUString> UnoGroupBoxControl::getSupportedServiceNames()
@@ -2131,7 +2131,7 @@ UnoControlListBoxModel::~UnoControlListBoxModel()
 
 OUString UnoControlListBoxModel::getImplementationName()
 {
-    return OUString("stardiv.Toolkit.UnoControlListBoxModel");
+    return "stardiv.Toolkit.UnoControlListBoxModel";
 }
 
 css::uno::Sequence<OUString> UnoControlListBoxModel::getSupportedServiceNames()
@@ -2565,12 +2565,12 @@ UnoListBoxControl::UnoListBoxControl()
 
 OUString UnoListBoxControl::GetComponentServiceName()
 {
-    return OUString("listbox");
+    return "listbox";
 }
 
 OUString UnoListBoxControl::getImplementationName()
 {
-    return OUString("stardiv.Toolkit.UnoListBoxControl");
+    return "stardiv.Toolkit.UnoListBoxControl";
 }
 
 css::uno::Sequence<OUString> UnoListBoxControl::getSupportedServiceNames()
@@ -2979,7 +2979,7 @@ UnoControlComboBoxModel::UnoControlComboBoxModel( const Reference< XComponentCon
 
 OUString UnoControlComboBoxModel::getImplementationName()
 {
-    return OUString("stardiv.Toolkit.UnoControlComboBoxModel");
+    return "stardiv.Toolkit.UnoControlComboBoxModel";
 }
 
 css::uno::Sequence<OUString> UnoControlComboBoxModel::getSupportedServiceNames()
@@ -3071,7 +3071,7 @@ UnoComboBoxControl::UnoComboBoxControl()
 
 OUString UnoComboBoxControl::getImplementationName()
 {
-    return OUString( "stardiv.Toolkit.UnoComboBoxControl");
+    return "stardiv.Toolkit.UnoComboBoxControl";
 }
 
 css::uno::Sequence<OUString> UnoComboBoxControl::getSupportedServiceNames()
@@ -3085,7 +3085,7 @@ css::uno::Sequence<OUString> UnoComboBoxControl::getSupportedServiceNames()
 
 OUString UnoComboBoxControl::GetComponentServiceName()
 {
-    return OUString("combobox");
+    return "combobox";
 }
 
 void UnoComboBoxControl::dispose()
@@ -3512,7 +3512,7 @@ uno::Reference< beans::XPropertySetInfo > UnoControlDateFieldModel::getPropertyS
 
 OUString UnoControlDateFieldModel::getImplementationName()
 {
-    return OUString("stardiv.Toolkit.UnoControlDateFieldModel");
+    return "stardiv.Toolkit.UnoControlDateFieldModel";
 }
 
 css::uno::Sequence<OUString>
@@ -3546,7 +3546,7 @@ UnoDateFieldControl::UnoDateFieldControl()
 
 OUString UnoDateFieldControl::GetComponentServiceName()
 {
-    return OUString("datefield");
+    return "datefield";
 }
 
 // uno::XInterface
@@ -3730,7 +3730,7 @@ sal_Bool UnoDateFieldControl::isStrictFormat()
 
 OUString UnoDateFieldControl::getImplementationName()
 {
-    return OUString("stardiv.Toolkit.UnoDateFieldControl");
+    return "stardiv.Toolkit.UnoDateFieldControl";
 }
 
 css::uno::Sequence<OUString> UnoDateFieldControl::getSupportedServiceNames()
@@ -3789,7 +3789,7 @@ uno::Reference< beans::XPropertySetInfo > UnoControlTimeFieldModel::getPropertyS
 
 OUString UnoControlTimeFieldModel::getImplementationName()
 {
-    return OUString("stardiv.Toolkit.UnoControlTimeFieldModel");
+    return "stardiv.Toolkit.UnoControlTimeFieldModel";
 }
 
 css::uno::Sequence<OUString>
@@ -3822,7 +3822,7 @@ UnoTimeFieldControl::UnoTimeFieldControl()
 
 OUString UnoTimeFieldControl::GetComponentServiceName()
 {
-    return OUString("timefield");
+    return "timefield";
 }
 
 // uno::XInterface
@@ -3966,7 +3966,7 @@ sal_Bool UnoTimeFieldControl::isStrictFormat()
 
 OUString UnoTimeFieldControl::getImplementationName()
 {
-    return OUString("stardiv.Toolkit.UnoTimeFieldControl");
+    return "stardiv.Toolkit.UnoTimeFieldControl";
 }
 
 css::uno::Sequence<OUString> UnoTimeFieldControl::getSupportedServiceNames()
@@ -4025,7 +4025,7 @@ uno::Reference< beans::XPropertySetInfo > UnoControlNumericFieldModel::getProper
 
 OUString UnoControlNumericFieldModel::getImplementationName()
 {
-    return OUString("stardiv.Toolkit.UnoControlNumericFieldModel");
+    return "stardiv.Toolkit.UnoControlNumericFieldModel";
 }
 
 css::uno::Sequence<OUString>
@@ -4058,7 +4058,7 @@ UnoNumericFieldControl::UnoNumericFieldControl()
 
 OUString UnoNumericFieldControl::GetComponentServiceName()
 {
-    return OUString("numericfield");
+    return "numericfield";
 }
 
 // uno::XInterface
@@ -4173,7 +4173,7 @@ sal_Bool UnoNumericFieldControl::isStrictFormat()
 
 OUString UnoNumericFieldControl::getImplementationName()
 {
-    return OUString("stardiv.Toolkit.UnoNumericFieldControl");
+    return "stardiv.Toolkit.UnoNumericFieldControl";
 }
 
 css::uno::Sequence<OUString> UnoNumericFieldControl::getSupportedServiceNames()
@@ -4256,7 +4256,7 @@ uno::Reference< beans::XPropertySetInfo > UnoControlCurrencyFieldModel::getPrope
 
 OUString UnoControlCurrencyFieldModel::getImplementationName()
 {
-    return OUString("stardiv.Toolkit.UnoControlCurrencyFieldModel");
+    return "stardiv.Toolkit.UnoControlCurrencyFieldModel";
 }
 
 css::uno::Sequence<OUString>
@@ -4289,7 +4289,7 @@ UnoCurrencyFieldControl::UnoCurrencyFieldControl()
 
 OUString UnoCurrencyFieldControl::GetComponentServiceName()
 {
-    return OUString("longcurrencyfield");
+    return "longcurrencyfield";
 }
 
 // uno::XInterface
@@ -4403,7 +4403,7 @@ sal_Bool UnoCurrencyFieldControl::isStrictFormat()
 
 OUString UnoCurrencyFieldControl::getImplementationName()
 {
-    return OUString("stardiv.Toolkit.UnoCurrencyFieldControl");
+    return "stardiv.Toolkit.UnoCurrencyFieldControl";
 }
 
 css::uno::Sequence<OUString>
@@ -4482,7 +4482,7 @@ uno::Reference< beans::XPropertySetInfo > UnoControlPatternFieldModel::getProper
 
 OUString UnoControlPatternFieldModel::getImplementationName()
 {
-    return OUString("stardiv.Toolkit.UnoControlPatternFieldModel");
+    return "stardiv.Toolkit.UnoControlPatternFieldModel";
 }
 
 css::uno::Sequence<OUString>
@@ -4513,7 +4513,7 @@ UnoPatternFieldControl::UnoPatternFieldControl()
 
 OUString UnoPatternFieldControl::GetComponentServiceName()
 {
-    return OUString("patternfield");
+    return "patternfield";
 }
 
 void UnoPatternFieldControl::ImplSetPeerProperty( const OUString& rPropName, const uno::Any& rVal )
@@ -4596,7 +4596,7 @@ sal_Bool UnoPatternFieldControl::isStrictFormat()
 
 OUString UnoPatternFieldControl::getImplementationName()
 {
-    return OUString("stardiv.Toolkit.UnoPatternFieldControl");
+    return "stardiv.Toolkit.UnoPatternFieldControl";
 }
 
 css::uno::Sequence<OUString> UnoPatternFieldControl::getSupportedServiceNames()
@@ -4667,7 +4667,7 @@ uno::Reference< beans::XPropertySetInfo > UnoControlProgressBarModel::getPropert
 
 OUString UnoControlProgressBarModel::getImplementationName()
 {
-    return OUString("stardiv.Toolkit.UnoControlProgressBarModel");
+    return "stardiv.Toolkit.UnoControlProgressBarModel";
 }
 
 css::uno::Sequence<OUString>
@@ -4698,7 +4698,7 @@ UnoProgressBarControl::UnoProgressBarControl()
 
 OUString UnoProgressBarControl::GetComponentServiceName()
 {
-    return OUString("ProgressBar");
+    return "ProgressBar";
 }
 
 // uno::XInterface
@@ -4767,7 +4767,7 @@ sal_Int32 UnoProgressBarControl::getValue()
 
 OUString UnoProgressBarControl::getImplementationName()
 {
-    return OUString("stardiv.Toolkit.UnoProgressBarControl");
+    return "stardiv.Toolkit.UnoProgressBarControl";
 }
 
 css::uno::Sequence<OUString> UnoProgressBarControl::getSupportedServiceNames()
@@ -4834,7 +4834,7 @@ uno::Reference< beans::XPropertySetInfo > UnoControlFixedLineModel::getPropertyS
 
 OUString UnoControlFixedLineModel::getImplementationName()
 {
-    return OUString("stardiv.Toolkit.UnoControlFixedLineModel");
+    return "stardiv.Toolkit.UnoControlFixedLineModel";
 }
 
 css::uno::Sequence<OUString>
@@ -4867,7 +4867,7 @@ UnoFixedLineControl::UnoFixedLineControl()
 
 OUString UnoFixedLineControl::GetComponentServiceName()
 {
-    return OUString("FixedLine");
+    return "FixedLine";
 }
 
 sal_Bool UnoFixedLineControl::isTransparent()
@@ -4877,7 +4877,7 @@ sal_Bool UnoFixedLineControl::isTransparent()
 
 OUString UnoFixedLineControl::getImplementationName()
 {
-    return OUString("stardiv.Toolkit.UnoFixedLineControl");
+    return "stardiv.Toolkit.UnoFixedLineControl";
 }
 
 css::uno::Sequence<OUString> UnoFixedLineControl::getSupportedServiceNames()