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

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

51 files changed, 73 insertions, 73 deletions

diff --git a/forms/source/component/Button.cxx b/forms/source/component/Button.cxx
index 68c7d153fbbc..31f87284d0d4 100644
--- a/forms/source/component/Button.cxx
+++ b/forms/source/component/Button.cxx
@@ -129,7 +129,7 @@ css::uno::Sequence<OUString>  OButtonModel::getSupportedServiceNames()
 
 OUString OButtonModel::getServiceName()
 {
-    return OUString(FRM_COMPONENT_COMMANDBUTTON); // old (non-sun) name for compatibility !
+    return FRM_COMPONENT_COMMANDBUTTON; // old (non-sun) name for compatibility !
 }
 
 
diff --git a/forms/source/component/Button.hxx b/forms/source/component/Button.hxx
index cd3907742686..341ea2dc2c00 100644
--- a/forms/source/component/Button.hxx
+++ b/forms/source/component/Button.hxx
@@ -56,7 +56,7 @@ public:
 
 // css::lang::XServiceInfo
     OUString SAL_CALL getImplementationName() override
-    { return OUString("com.sun.star.form.OButtonModel"); }
+    { return "com.sun.star.form.OButtonModel"; }
 
     virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
@@ -132,7 +132,7 @@ public:
 
     // XServiceInfo
     OUString SAL_CALL getImplementationName() override
-    { return OUString("com.sun.star.form.OButtonControl"); }
+    { return "com.sun.star.form.OButtonControl"; }
 
     virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
diff --git a/forms/source/component/CheckBox.cxx b/forms/source/component/CheckBox.cxx
index a62e6dce38eb..1966a53fab06 100644
--- a/forms/source/component/CheckBox.cxx
+++ b/forms/source/component/CheckBox.cxx
@@ -117,7 +117,7 @@ void OCheckBoxModel::describeFixedProperties( Sequence< Property >& _rProps ) co
 
 OUString SAL_CALL OCheckBoxModel::getServiceName()
 {
-    return OUString(FRM_COMPONENT_CHECKBOX);  // old (non-sun) name for compatibility !
+    return FRM_COMPONENT_CHECKBOX;  // old (non-sun) name for compatibility !
 }
 
 
diff --git a/forms/source/component/CheckBox.hxx b/forms/source/component/CheckBox.hxx
index 8b13a018afcb..ea2e633a28ca 100644
--- a/forms/source/component/CheckBox.hxx
+++ b/forms/source/component/CheckBox.hxx
@@ -35,7 +35,7 @@ public:
 
     // XServiceInfo
     OUString SAL_CALL getImplementationName() override
-    { return OUString("com.sun.star.form.OCheckBoxModel"); }
+    { return "com.sun.star.form.OCheckBoxModel"; }
 
     virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
@@ -66,7 +66,7 @@ public:
 
     // XServiceInfo
     OUString SAL_CALL getImplementationName() override
-    { return OUString("com.sun.star.form.OCheckBoxControl"); }
+    { return "com.sun.star.form.OCheckBoxControl"; }
 
     virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 };
diff --git a/forms/source/component/ComboBox.cxx b/forms/source/component/ComboBox.cxx
index 03d46288a6bf..62a0b54b1e14 100644
--- a/forms/source/component/ComboBox.cxx
+++ b/forms/source/component/ComboBox.cxx
@@ -326,7 +326,7 @@ void OComboBoxModel::describeAggregateProperties( Sequence< Property >& _rAggreg
 
 OUString SAL_CALL OComboBoxModel::getServiceName()
 {
-    return OUString(FRM_COMPONENT_COMBOBOX);  // old (non-sun) name for compatibility !
+    return FRM_COMPONENT_COMBOBOX;  // old (non-sun) name for compatibility !
 }
 
 
diff --git a/forms/source/component/ComboBox.hxx b/forms/source/component/ComboBox.hxx
index dd5db15a010e..408b5b64e54f 100644
--- a/forms/source/component/ComboBox.hxx
+++ b/forms/source/component/ComboBox.hxx
@@ -78,7 +78,7 @@ public:
 
     // XServiceInfo
     OUString SAL_CALL getImplementationName() override
-    { return OUString("com.sun.star.form.OComboBoxModel"); }
+    { return "com.sun.star.form.OComboBoxModel"; }
 
     virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
@@ -135,7 +135,7 @@ public:
 
     // XServiceInfo
     OUString SAL_CALL getImplementationName() override
-    { return OUString("com.sun.star.form.OComboBoxControl"); }
+    { return "com.sun.star.form.OComboBoxControl"; }
 
     virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 };
diff --git a/forms/source/component/Currency.cxx b/forms/source/component/Currency.cxx
index a64cd35287cb..57f712b72f05 100644
--- a/forms/source/component/Currency.cxx
+++ b/forms/source/component/Currency.cxx
@@ -167,7 +167,7 @@ void OCurrencyModel::describeFixedProperties( Sequence< Property >& _rProps ) co
 
 OUString SAL_CALL OCurrencyModel::getServiceName()
 {
-    return OUString(FRM_COMPONENT_CURRENCYFIELD); // old (non-sun) name for compatibility !
+    return FRM_COMPONENT_CURRENCYFIELD; // old (non-sun) name for compatibility !
 }
 
 
diff --git a/forms/source/component/Currency.hxx b/forms/source/component/Currency.hxx
index df7b36328298..a0113fd1372e 100644
--- a/forms/source/component/Currency.hxx
+++ b/forms/source/component/Currency.hxx
@@ -36,7 +36,7 @@ public:
 
     // css::lang::XServiceInfo
     OUString SAL_CALL getImplementationName() override
-    { return OUString("com.sun.star.form.OCurrencyModel"); }
+    { return "com.sun.star.form.OCurrencyModel"; }
 
     virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
@@ -68,7 +68,7 @@ public:
     explicit OCurrencyControl(const css::uno::Reference< css::uno::XComponentContext>& _rxContext);
     // css::lang::XServiceInfo
     OUString SAL_CALL getImplementationName() override
-    { return OUString("com.sun.star.form.OCurrencyControl"); }
+    { return "com.sun.star.form.OCurrencyControl"; }
 
     virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 };
diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx
index ca2c07496fc1..a24e9eee91da 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -3696,7 +3696,7 @@ void SAL_CALL ODatabaseForm::propertyChange( const PropertyChangeEvent& evt )
 
 OUString SAL_CALL ODatabaseForm::getImplementationName()
 {
-    return OUString( "com.sun.star.comp.forms.ODatabaseForm" );
+    return "com.sun.star.comp.forms.ODatabaseForm";
 }
 
 
@@ -3729,7 +3729,7 @@ const sal_uInt16 DONTAPPLYFILTER    = 0x0002;
 
 OUString ODatabaseForm::getServiceName()
 {
-    return OUString(FRM_COMPONENT_FORM);  // old (non-sun) name for compatibility !
+    return FRM_COMPONENT_FORM;  // old (non-sun) name for compatibility !
 }
 
 void SAL_CALL ODatabaseForm::write(const Reference<XObjectOutputStream>& _rxOutStream)
diff --git a/forms/source/component/Date.cxx b/forms/source/component/Date.cxx
index 99d76d259495..fc6bc5ebfce7 100644
--- a/forms/source/component/Date.cxx
+++ b/forms/source/component/Date.cxx
@@ -146,7 +146,7 @@ css::uno::Sequence<OUString> SAL_CALL ODateModel::getSupportedServiceNames()
 
 OUString SAL_CALL ODateModel::getServiceName()
 {
-    return OUString(FRM_COMPONENT_DATEFIELD); // old (non-sun) name for compatibility !
+    return FRM_COMPONENT_DATEFIELD; // old (non-sun) name for compatibility !
 }
 
 // XPropertySet
diff --git a/forms/source/component/Date.hxx b/forms/source/component/Date.hxx
index 1074ff25a732..44ed97320ad5 100644
--- a/forms/source/component/Date.hxx
+++ b/forms/source/component/Date.hxx
@@ -51,7 +51,7 @@ public:
 
     // XServiceInfo
     OUString SAL_CALL getImplementationName() override
-    { return OUString("com.sun.star.form.ODateModel"); }
+    { return "com.sun.star.form.ODateModel"; }
 
     virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
@@ -98,7 +98,7 @@ public:
 
 // css::lang::XServiceInfo
     OUString SAL_CALL getImplementationName() override
-    { return OUString("com.sun.star.form.ODateControl"); }
+    { return "com.sun.star.form.ODateControl"; }
 
     virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 };
diff --git a/forms/source/component/Edit.cxx b/forms/source/component/Edit.cxx
index c5f82e7fc30a..3573224206b1 100644
--- a/forms/source/component/Edit.cxx
+++ b/forms/source/component/Edit.cxx
@@ -304,7 +304,7 @@ void OEditModel::disposing()
 
 OUString SAL_CALL OEditModel::getServiceName()
 {
-    return OUString(FRM_COMPONENT_EDIT);  // old (non-sun) name for compatibility !
+    return FRM_COMPONENT_EDIT;  // old (non-sun) name for compatibility !
 }
 
 // XServiceInfo
diff --git a/forms/source/component/Edit.hxx b/forms/source/component/Edit.hxx
index af552528333c..755ae41bc1c5 100644
--- a/forms/source/component/Edit.hxx
+++ b/forms/source/component/Edit.hxx
@@ -70,7 +70,7 @@ public:
 
     // XServiceInfo
     OUString SAL_CALL getImplementationName() override
-    { return OUString("com.sun.star.form.OEditModel"); }
+    { return "com.sun.star.form.OEditModel"; }
 
     virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
@@ -141,7 +141,7 @@ public:
 
 // css::lang::XServiceInfo
     OUString SAL_CALL getImplementationName() override
-    { return OUString("com.sun.star.form.OEditControl"); }
+    { return "com.sun.star.form.OEditControl"; }
 
     virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
diff --git a/forms/source/component/File.cxx b/forms/source/component/File.cxx
index b2fc1da00430..d8ac1a80ecbf 100644
--- a/forms/source/component/File.cxx
+++ b/forms/source/component/File.cxx
@@ -177,7 +177,7 @@ void OFileControlModel::describeFixedProperties( Sequence< Property >& _rProps )
 
 OUString SAL_CALL OFileControlModel::getServiceName()
 {
-    return OUString(FRM_COMPONENT_FILECONTROL);   // old (non-sun) name for compatibility !
+    return FRM_COMPONENT_FILECONTROL;   // old (non-sun) name for compatibility !
 }
 
 
diff --git a/forms/source/component/File.hxx b/forms/source/component/File.hxx
index a20eb945d2ab..651d830ace92 100644
--- a/forms/source/component/File.hxx
+++ b/forms/source/component/File.hxx
@@ -44,7 +44,7 @@ public:
 
     // XServiceInfo
     OUString SAL_CALL getImplementationName() override
-    { return OUString("com.sun.star.form.OFileControlModel"); }
+    { return "com.sun.star.form.OFileControlModel"; }
 
     virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
diff --git a/forms/source/component/Filter.cxx b/forms/source/component/Filter.cxx
index ccaa7f209687..8bc457ec3e93 100644
--- a/forms/source/component/Filter.cxx
+++ b/forms/source/component/Filter.cxx
@@ -874,7 +874,7 @@ namespace frm
 
     OUString SAL_CALL OFilterControl::getImplementationName(  )
     {
-        return OUString( "com.sun.star.comp.forms.OFilterControl" );
+        return "com.sun.star.comp.forms.OFilterControl";
     }
 
     sal_Bool SAL_CALL OFilterControl::supportsService( const OUString& ServiceName )
diff --git a/forms/source/component/FixedText.cxx b/forms/source/component/FixedText.cxx
index 34e74d094d70..0dcf18a7629c 100644
--- a/forms/source/component/FixedText.cxx
+++ b/forms/source/component/FixedText.cxx
@@ -83,7 +83,7 @@ void OFixedTextModel::describeAggregateProperties( Sequence< Property >& _rAggre
 
 OUString SAL_CALL OFixedTextModel::getServiceName()
 {
-    return OUString(FRM_COMPONENT_FIXEDTEXT); // old (non-sun) name for compatibility !
+    return FRM_COMPONENT_FIXEDTEXT; // old (non-sun) name for compatibility !
 }
 
 
diff --git a/forms/source/component/FixedText.hxx b/forms/source/component/FixedText.hxx
index 262aafb66768..58c2a8a07092 100644
--- a/forms/source/component/FixedText.hxx
+++ b/forms/source/component/FixedText.hxx
@@ -34,7 +34,7 @@ public:
 
 // XServiceInfo
     OUString SAL_CALL getImplementationName() override
-    { return OUString("com.sun.star.form.OFixedTextModel"); }
+    { return "com.sun.star.form.OFixedTextModel"; }
 
     virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx
index 0e5d7f157d56..178cf037312d 100644
--- a/forms/source/component/FormattedField.cxx
+++ b/forms/source/component/FormattedField.cxx
@@ -335,7 +335,7 @@ Sequence< Type > OFormattedModel::_getTypes()
 // XPersistObject
 OUString SAL_CALL OFormattedModel::getServiceName()
 {
-    return OUString(FRM_COMPONENT_EDIT);
+    return FRM_COMPONENT_EDIT;
 }
 
 // XPropertySet
diff --git a/forms/source/component/FormattedField.hxx b/forms/source/component/FormattedField.hxx
index 8d3f3d16c917..d0f1394f59be 100644
--- a/forms/source/component/FormattedField.hxx
+++ b/forms/source/component/FormattedField.hxx
@@ -67,7 +67,7 @@ class OFormattedModel final
 
         // XServiceInfo
         OUString SAL_CALL getImplementationName() override
-        { return OUString("com.sun.star.form.OFormattedModel"); }
+        { return "com.sun.star.form.OFormattedModel"; }
 
         virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
@@ -148,7 +148,7 @@ class OFormattedModel final
 
         // css::lang::XServiceInfo
         OUString SAL_CALL getImplementationName() override
-        { return OUString("com.sun.star.form.OFormattedControl"); }
+        { return "com.sun.star.form.OFormattedControl"; }
 
         virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
diff --git a/forms/source/component/FormattedFieldWrapper.cxx b/forms/source/component/FormattedFieldWrapper.cxx
index beebbac8a78f..1a7cf9446190 100644
--- a/forms/source/component/FormattedFieldWrapper.cxx
+++ b/forms/source/component/FormattedFieldWrapper.cxx
@@ -173,12 +173,12 @@ Any SAL_CALL OFormattedFieldWrapper::queryAggregation(const Type& _rType)
 OUString SAL_CALL OFormattedFieldWrapper::getServiceName()
 {
     // return the old compatibility name for an EditModel
-    return OUString(FRM_COMPONENT_EDIT);
+    return FRM_COMPONENT_EDIT;
 }
 
 OUString SAL_CALL OFormattedFieldWrapper::getImplementationName(  )
 {
-    return OUString("com.sun.star.comp.forms.OFormattedFieldWrapper_ForcedFormatted");
+    return "com.sun.star.comp.forms.OFormattedFieldWrapper_ForcedFormatted";
 }
 
 sal_Bool SAL_CALL OFormattedFieldWrapper::supportsService( const OUString& _rServiceName )
diff --git a/forms/source/component/FormsCollection.cxx b/forms/source/component/FormsCollection.cxx
index 841bc493e8a7..753deca90143 100644
--- a/forms/source/component/FormsCollection.cxx
+++ b/forms/source/component/FormsCollection.cxx
@@ -33,7 +33,7 @@ using namespace ::com::sun::star::util;
 
 OUString SAL_CALL OFormsCollection::getServiceName()
 {
-    return OUString("com.sun.star.form.Forms");
+    return "com.sun.star.form.Forms";
 }
 
 Sequence< sal_Int8 > SAL_CALL OFormsCollection::getImplementationId(  )
@@ -85,7 +85,7 @@ Any SAL_CALL OFormsCollection::queryAggregation(const Type& _rType)
 
 OUString SAL_CALL OFormsCollection::getImplementationName()
 {
-    return OUString("com.sun.star.form.OFormsCollection");
+    return "com.sun.star.form.OFormsCollection";
 }
 
 sal_Bool SAL_CALL OFormsCollection::supportsService( const OUString& _rServiceName )
diff --git a/forms/source/component/Grid.cxx b/forms/source/component/Grid.cxx
index 80294635082f..33ed91ec739e 100644
--- a/forms/source/component/Grid.cxx
+++ b/forms/source/component/Grid.cxx
@@ -754,7 +754,7 @@ void OGridControlModel::approveNewElement( const Reference< XPropertySet >& _rxO
 // XPersistObject
 OUString SAL_CALL OGridControlModel::getServiceName()
 {
-    return OUString(FRM_COMPONENT_GRID);  // old (non-sun) name for compatibility!
+    return FRM_COMPONENT_GRID;  // old (non-sun) name for compatibility!
 }
 
 void OGridControlModel::write(const Reference<XObjectOutputStream>& _rxOutStream)
diff --git a/forms/source/component/Grid.hxx b/forms/source/component/Grid.hxx
index 6afaeb171472..ae63722286d8 100644
--- a/forms/source/component/Grid.hxx
+++ b/forms/source/component/Grid.hxx
@@ -100,7 +100,7 @@ public:
 
     // XServiceInfo
     OUString SAL_CALL getImplementationName() override
-    { return OUString("com.sun.star.form.OGridControlModel"); }
+    { return "com.sun.star.form.OGridControlModel"; }
 
     virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
diff --git a/forms/source/component/GroupBox.cxx b/forms/source/component/GroupBox.cxx
index 510b993e5fe9..8e620e3bafc7 100644
--- a/forms/source/component/GroupBox.cxx
+++ b/forms/source/component/GroupBox.cxx
@@ -86,7 +86,7 @@ void OGroupBoxModel::describeAggregateProperties( Sequence< Property >& _rAggreg
 
 OUString SAL_CALL OGroupBoxModel::getServiceName()
 {
-    return OUString(FRM_COMPONENT_GROUPBOX);  // old (non-sun) name for compatibility !
+    return FRM_COMPONENT_GROUPBOX;  // old (non-sun) name for compatibility !
 }
 
 
diff --git a/forms/source/component/GroupBox.hxx b/forms/source/component/GroupBox.hxx
index 2e2233798e90..f761b77ab7bc 100644
--- a/forms/source/component/GroupBox.hxx
+++ b/forms/source/component/GroupBox.hxx
@@ -34,7 +34,7 @@ public:
 
     // XServiceInfo
     OUString SAL_CALL getImplementationName() override
-    { return OUString("com.sun.star.form.OGroupBoxModel"); }
+    { return "com.sun.star.form.OGroupBoxModel"; }
 
     virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
@@ -64,7 +64,7 @@ public:
 
     // XServiceInfo
     OUString SAL_CALL getImplementationName() override
-    { return OUString("com.sun.star.form.OGroupBoxControl"); }
+    { return "com.sun.star.form.OGroupBoxControl"; }
 
     virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 };
diff --git a/forms/source/component/Hidden.cxx b/forms/source/component/Hidden.cxx
index d127e30cc5ff..ba73b5c120bc 100644
--- a/forms/source/component/Hidden.cxx
+++ b/forms/source/component/Hidden.cxx
@@ -126,7 +126,7 @@ css::uno::Sequence<OUString> SAL_CALL OHiddenModel::getSupportedServiceNames()
 
 OUString SAL_CALL OHiddenModel::getServiceName()
 {
-    return OUString(FRM_COMPONENT_HIDDEN);    // old (non-sun) name for compatibility !
+    return FRM_COMPONENT_HIDDEN;    // old (non-sun) name for compatibility !
 }
 
 
diff --git a/forms/source/component/Hidden.hxx b/forms/source/component/Hidden.hxx
index 8eec7498835e..7ff7d860f917 100644
--- a/forms/source/component/Hidden.hxx
+++ b/forms/source/component/Hidden.hxx
@@ -42,7 +42,7 @@ public:
 
     // XServiceInfo
     OUString SAL_CALL getImplementationName() override
-    { return OUString("com.sun.star.form.OHiddenModel"); }
+    { return "com.sun.star.form.OHiddenModel"; }
 
     virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
diff --git a/forms/source/component/ImageButton.cxx b/forms/source/component/ImageButton.cxx
index d0b62fb4017f..63c627c93fe0 100644
--- a/forms/source/component/ImageButton.cxx
+++ b/forms/source/component/ImageButton.cxx
@@ -84,7 +84,7 @@ void OImageButtonModel::describeFixedProperties( Sequence< Property >& _rProps )
 
 OUString OImageButtonModel::getServiceName()
 {
-    return OUString(FRM_COMPONENT_IMAGEBUTTON);   // old (non-sun) name for compatibility !
+    return FRM_COMPONENT_IMAGEBUTTON;   // old (non-sun) name for compatibility !
 }
 
 void OImageButtonModel::write(const Reference<XObjectOutputStream>& _rxOutStream)
diff --git a/forms/source/component/ImageButton.hxx b/forms/source/component/ImageButton.hxx
index 37d2ef3cb608..8f618c47c13c 100644
--- a/forms/source/component/ImageButton.hxx
+++ b/forms/source/component/ImageButton.hxx
@@ -35,7 +35,7 @@ public:
 
 // css::lang::XServiceInfo
     OUString SAL_CALL getImplementationName() override
-    { return OUString("com.sun.star.form.OImageButtonModel"); }
+    { return "com.sun.star.form.OImageButtonModel"; }
 
     virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
@@ -66,7 +66,7 @@ public:
 
     // XServiceInfo
     OUString SAL_CALL getImplementationName() override
-    { return OUString("com.sun.star.form.OImageButtonControl"); }
+    { return "com.sun.star.form.OImageButtonControl"; }
 
     virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
diff --git a/forms/source/component/ImageControl.cxx b/forms/source/component/ImageControl.cxx
index 37b2eda2cb07..7f5d323fe691 100644
--- a/forms/source/component/ImageControl.cxx
+++ b/forms/source/component/ImageControl.cxx
@@ -339,7 +339,7 @@ void OImageControlModel::describeAggregateProperties( Sequence< Property >& /* [
 
 OUString OImageControlModel::getServiceName()
 {
-    return OUString(FRM_COMPONENT_IMAGECONTROL);  // old (non-sun) name for compatibility !
+    return FRM_COMPONENT_IMAGECONTROL;  // old (non-sun) name for compatibility !
 }
 
 
diff --git a/forms/source/component/ImageControl.hxx b/forms/source/component/ImageControl.hxx
index df6914825e47..01ae8018a24f 100644
--- a/forms/source/component/ImageControl.hxx
+++ b/forms/source/component/ImageControl.hxx
@@ -71,7 +71,7 @@ public:
 
     // XServiceInfo
     OUString SAL_CALL getImplementationName() override
-    { return OUString("com.sun.star.form.OImageControlModel"); }
+    { return "com.sun.star.form.OImageControlModel"; }
 
     virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
@@ -156,7 +156,7 @@ public:
 
     // XServiceInfo
     OUString SAL_CALL getImplementationName() override
-    { return OUString("com.sun.star.form.OImageControlControl"); }
+    { return "com.sun.star.form.OImageControlControl"; }
 
     virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx
index 9fd4406e7ded..c6abd1b8c882 100644
--- a/forms/source/component/ListBox.cxx
+++ b/forms/source/component/ListBox.cxx
@@ -548,7 +548,7 @@ namespace frm
 
     OUString SAL_CALL OListBoxModel::getServiceName()
     {
-        return OUString(FRM_COMPONENT_LISTBOX);   // old (non-sun) name for compatibility !
+        return FRM_COMPONENT_LISTBOX;   // old (non-sun) name for compatibility !
     }
 
 
diff --git a/forms/source/component/ListBox.hxx b/forms/source/component/ListBox.hxx
index 42a41d522444..bd9d7aac6c43 100644
--- a/forms/source/component/ListBox.hxx
+++ b/forms/source/component/ListBox.hxx
@@ -128,7 +128,7 @@ public:
 
 // XServiceInfo
     OUString SAL_CALL getImplementationName() override
-    { return OUString("com.sun.star.form.OListBoxModel"); }
+    { return "com.sun.star.form.OListBoxModel"; }
 
     virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
@@ -267,7 +267,7 @@ public:
 
 // XServiceInfo
     OUString SAL_CALL getImplementationName() override
-    { return OUString("com.sun.star.form.OListBoxControl"); }
+    { return "com.sun.star.form.OListBoxControl"; }
 
     virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
diff --git a/forms/source/component/Numeric.cxx b/forms/source/component/Numeric.cxx
index 73a8e2980df4..3aa5f14343f5 100644
--- a/forms/source/component/Numeric.cxx
+++ b/forms/source/component/Numeric.cxx
@@ -117,7 +117,7 @@ void ONumericModel::describeFixedProperties( Sequence< Property >& _rProps ) con
 
 OUString SAL_CALL ONumericModel::getServiceName()
 {
-    return OUString(FRM_COMPONENT_NUMERICFIELD);  // old (non-sun) name for compatibility !
+    return FRM_COMPONENT_NUMERICFIELD;  // old (non-sun) name for compatibility !
 }
 
 
diff --git a/forms/source/component/Numeric.hxx b/forms/source/component/Numeric.hxx
index 2175b5beb55c..6278b3e3b76c 100644
--- a/forms/source/component/Numeric.hxx
+++ b/forms/source/component/Numeric.hxx
@@ -37,7 +37,7 @@ public:
 
     // css::lang::XServiceInfo
     OUString SAL_CALL getImplementationName() override
-    { return OUString("com.sun.star.form.ONumericModel"); }
+    { return "com.sun.star.form.ONumericModel"; }
 
     virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
@@ -70,7 +70,7 @@ public:
 
     // css::lang::XServiceInfo
     OUString SAL_CALL getImplementationName() override
-    { return OUString("com.sun.star.form.ONumericControl"); }
+    { return "com.sun.star.form.ONumericControl"; }
 
     virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 };
diff --git a/forms/source/component/Pattern.cxx b/forms/source/component/Pattern.cxx
index d0567ab1953e..739b93b8d213 100644
--- a/forms/source/component/Pattern.cxx
+++ b/forms/source/component/Pattern.cxx
@@ -106,7 +106,7 @@ void OPatternModel::describeFixedProperties( Sequence< Property >& _rProps ) con
 
 OUString SAL_CALL OPatternModel::getServiceName()
 {
-    return OUString(FRM_COMPONENT_PATTERNFIELD);  // old (non-sun) name for compatibility !
+    return FRM_COMPONENT_PATTERNFIELD;  // old (non-sun) name for compatibility !
 }
 
 
diff --git a/forms/source/component/Pattern.hxx b/forms/source/component/Pattern.hxx
index d1405f481909..80ce81639255 100644
--- a/forms/source/component/Pattern.hxx
+++ b/forms/source/component/Pattern.hxx
@@ -43,7 +43,7 @@ public:
 
     // css::lang::XServiceInfo
     OUString SAL_CALL getImplementationName() override
-    { return OUString("com.sun.star.form.OPatternModel"); }
+    { return "com.sun.star.form.OPatternModel"; }
 
     virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
@@ -76,7 +76,7 @@ public:
 
     // css::lang::XServiceInfo
     OUString SAL_CALL getImplementationName() override
-    { return OUString("com.sun.star.form.OPatternControl"); }
+    { return "com.sun.star.form.OPatternControl"; }
 
     virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 };
diff --git a/forms/source/component/RadioButton.cxx b/forms/source/component/RadioButton.cxx
index 5505ee92ea85..0983da167967 100644
--- a/forms/source/component/RadioButton.cxx
+++ b/forms/source/component/RadioButton.cxx
@@ -247,7 +247,7 @@ void ORadioButtonModel::describeFixedProperties( Sequence< Property >& _rProps )
 
 OUString SAL_CALL ORadioButtonModel::getServiceName()
 {
-    return OUString(FRM_COMPONENT_RADIOBUTTON);   // old (non-sun) name for compatibility !
+    return FRM_COMPONENT_RADIOBUTTON;   // old (non-sun) name for compatibility !
 }
 
 
diff --git a/forms/source/component/RadioButton.hxx b/forms/source/component/RadioButton.hxx
index be671f616b48..ab4e996a8600 100644
--- a/forms/source/component/RadioButton.hxx
+++ b/forms/source/component/RadioButton.hxx
@@ -33,7 +33,7 @@ public:
 
     // XServiceInfo
     OUString SAL_CALL getImplementationName() override
-    { return OUString("com.sun.star.form.ORadioButtonModel"); }
+    { return "com.sun.star.form.ORadioButtonModel"; }
 
     virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
@@ -75,7 +75,7 @@ public:
 
     // XServiceInfo
     OUString SAL_CALL getImplementationName() override
-    { return OUString("com.sun.star.form.ORadioButtonControl"); }
+    { return "com.sun.star.form.ORadioButtonControl"; }
 
     virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 };
diff --git a/forms/source/component/Time.cxx b/forms/source/component/Time.cxx
index ae993b98584c..85ccbaaf425b 100644
--- a/forms/source/component/Time.cxx
+++ b/forms/source/component/Time.cxx
@@ -138,7 +138,7 @@ IMPLEMENT_DEFAULT_CLONING( OTimeModel )
 
 OUString SAL_CALL OTimeModel::getServiceName()
 {
-    return OUString(FRM_COMPONENT_TIMEFIELD); // old (non-sun) name for compatibility !
+    return FRM_COMPONENT_TIMEFIELD; // old (non-sun) name for compatibility !
 }
 
 // XPropertySet
diff --git a/forms/source/component/Time.hxx b/forms/source/component/Time.hxx
index 81c5b47c04be..cc9ef1136042 100644
--- a/forms/source/component/Time.hxx
+++ b/forms/source/component/Time.hxx
@@ -52,7 +52,7 @@ public:
 
     // css::lang::XServiceInfo
     OUString SAL_CALL getImplementationName() override
-    { return OUString("com.sun.star.form.OTimeModel"); }
+    { return "com.sun.star.form.OTimeModel"; }
 
     virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
@@ -97,7 +97,7 @@ public:
 
     // css::lang::XServiceInfo
     OUString SAL_CALL getImplementationName() override
-    { return OUString("com.sun.star.form.OTimeControl"); }
+    { return "com.sun.star.form.OTimeControl"; }
 
     virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 };
diff --git a/forms/source/component/navigationbar.cxx b/forms/source/component/navigationbar.cxx
index abc09ef73826..36893eaf1624 100644
--- a/forms/source/component/navigationbar.cxx
+++ b/forms/source/component/navigationbar.cxx
@@ -144,7 +144,7 @@ namespace frm
 
     OUString SAL_CALL ONavigationBarModel::getImplementationName()
     {
-        return OUString( "com.sun.star.comp.form.ONavigationBarModel" );
+        return "com.sun.star.comp.form.ONavigationBarModel";
     }
 
 
@@ -161,7 +161,7 @@ namespace frm
 
     OUString SAL_CALL ONavigationBarModel::getServiceName()
     {
-        return OUString(FRM_SUN_COMPONENT_NAVTOOLBAR);
+        return FRM_SUN_COMPONENT_NAVTOOLBAR;
     }
 
     #define PERSIST_TABSTOP         0x0001
diff --git a/forms/source/component/scrollbar.cxx b/forms/source/component/scrollbar.cxx
index 7878c161e7e4..2e153c3d71f3 100644
--- a/forms/source/component/scrollbar.cxx
+++ b/forms/source/component/scrollbar.cxx
@@ -109,7 +109,7 @@ namespace frm
 
     OUString SAL_CALL OScrollBarModel::getImplementationName()
     {
-        return OUString( "com.sun.star.comp.forms.OScrollBarModel" );
+        return "com.sun.star.comp.forms.OScrollBarModel";
     }
 
         // note that we're passing OControlModel as "base class". This is because
@@ -231,7 +231,7 @@ namespace frm
 
     OUString SAL_CALL OScrollBarModel::getServiceName()
     {
-        return OUString(FRM_SUN_COMPONENT_SCROLLBAR);
+        return FRM_SUN_COMPONENT_SCROLLBAR;
     }
 
 
diff --git a/forms/source/component/spinbutton.cxx b/forms/source/component/spinbutton.cxx
index e7699bfbb83c..9d6b618c3506 100644
--- a/forms/source/component/spinbutton.cxx
+++ b/forms/source/component/spinbutton.cxx
@@ -62,7 +62,7 @@ namespace frm
 
     OUString SAL_CALL OSpinButtonModel::getImplementationName()
     {
-        return OUString( "com.sun.star.comp.forms.OSpinButtonModel" );
+        return "com.sun.star.comp.forms.OSpinButtonModel";
     }
 
         // note that we're passing OControlModel as "base class". This is because
@@ -185,7 +185,7 @@ namespace frm
 
     OUString SAL_CALL OSpinButtonModel::getServiceName()
     {
-        return OUString(FRM_SUN_COMPONENT_SPINBUTTON);
+        return FRM_SUN_COMPONENT_SPINBUTTON;
     }
 
 
diff --git a/forms/source/richtext/richtextcontrol.cxx b/forms/source/richtext/richtextcontrol.cxx
index 5b8158fba565..7e1b9bebcfd9 100644
--- a/forms/source/richtext/richtextcontrol.cxx
+++ b/forms/source/richtext/richtextcontrol.cxx
@@ -215,7 +215,7 @@ namespace frm
 
     OUString SAL_CALL ORichTextControl::getImplementationName()
     {
-        return OUString( "com.sun.star.comp.form.ORichTextControl" );
+        return "com.sun.star.comp.form.ORichTextControl";
     }
 
     Sequence< OUString > SAL_CALL ORichTextControl::getSupportedServiceNames()
diff --git a/forms/source/richtext/richtextmodel.cxx b/forms/source/richtext/richtextmodel.cxx
index 7d0ff09eeed8..3d1e7a75e834 100644
--- a/forms/source/richtext/richtextmodel.cxx
+++ b/forms/source/richtext/richtextmodel.cxx
@@ -228,7 +228,7 @@ namespace frm
 
     OUString SAL_CALL ORichTextModel::getImplementationName()
     {
-        return OUString( "com.sun.star.comp.forms.ORichTextModel" );
+        return "com.sun.star.comp.forms.ORichTextModel";
     }
 
     Sequence< OUString > SAL_CALL ORichTextModel::getSupportedServiceNames()
@@ -497,7 +497,7 @@ namespace frm
 
     OUString SAL_CALL ORichTextModel::getServiceName()
     {
-        return OUString(FRM_SUN_COMPONENT_RICHTEXTCONTROL);
+        return FRM_SUN_COMPONENT_RICHTEXTCONTROL;
     }
 
 
diff --git a/forms/source/runtime/formoperations.cxx b/forms/source/runtime/formoperations.cxx
index eb4133ee5493..e8a6463a8f48 100644
--- a/forms/source/runtime/formoperations.cxx
+++ b/forms/source/runtime/formoperations.cxx
@@ -158,7 +158,7 @@ namespace frm
 
     OUString SAL_CALL FormOperations::getImplementationName(  )
     {
-        return OUString( "com.sun.star.comp.forms.FormOperations" );
+        return "com.sun.star.comp.forms.FormOperations";
     }
 
     sal_Bool SAL_CALL FormOperations::supportsService( const OUString& ServiceName )
diff --git a/forms/source/solar/component/navbarcontrol.cxx b/forms/source/solar/component/navbarcontrol.cxx
index f9f6fdbd8adb..680f3b84e312 100644
--- a/forms/source/solar/component/navbarcontrol.cxx
+++ b/forms/source/solar/component/navbarcontrol.cxx
@@ -162,7 +162,7 @@ namespace frm
 
     OUString SAL_CALL ONavigationBarControl::getImplementationName()
     {
-        return OUString( "com.sun.star.comp.form.ONavigationBarControl" );
+        return "com.sun.star.comp.form.ONavigationBarControl";
     }
 
 
diff --git a/forms/source/xforms/model.cxx b/forms/source/xforms/model.cxx
index 0b5b4cbd245f..433bbb89581b 100644
--- a/forms/source/xforms/model.cxx
+++ b/forms/source/xforms/model.cxx
@@ -600,7 +600,7 @@ Sequence<sal_Int8> Model::getImplementationId()
 
 OUString Model::getImplementationName()
 {
-    return OUString("com.sun.star.form.Model");
+    return "com.sun.star.form.Model";
 }
 
 sal_Bool Model::supportsService(OUString const & ServiceName)
diff --git a/forms/source/xforms/xforms_services.cxx b/forms/source/xforms/xforms_services.cxx
index b6f39fe5ae69..0550273bb7e7 100644
--- a/forms/source/xforms/xforms_services.cxx
+++ b/forms/source/xforms/xforms_services.cxx
@@ -36,7 +36,7 @@ class Implementation:
         css::lang::XServiceInfo>
 {
     OUString SAL_CALL getImplementationName() override
-    { return OUString("com.sun.star.form.XForms"); }
+    { return "com.sun.star.form.XForms"; }
 
     sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
     { return cppu::supportsService(this, ServiceName); }