targeted string re-work

Change-Id: If929937d8b1243032983b8b379f067a47d2717a4

12 files changed, 58 insertions, 58 deletions

diff --git a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx
index 9c0fd9ad09bd..1661740120db 100644
--- a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx
+++ b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx
@@ -98,7 +98,7 @@ namespace toolkit
 
                 GridColumn* const pGridColumn = GridColumn::getImplementation( xClone );
                 if ( pGridColumn == NULL )
-                    throw RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "invalid clone source implementation" ) ), *this );
+                    throw RuntimeException( "invalid clone source implementation", *this );
                     // that's indeed a RuntimeException, not an IllegalArgumentException or some such:
                     // a DefaultGridColumnModel implementation whose columns are not GridColumn implementations
                     // is borked.
@@ -140,7 +140,7 @@ namespace toolkit
 
         GridColumn* const pGridColumn = GridColumn::getImplementation( i_column );
         if ( pGridColumn == NULL )
-            throw IllegalArgumentException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "invalid column implementation" ) ), *this, 1 );
+            throw IllegalArgumentException( "invalid column implementation", *this, 1 );
 
         m_aColumns.push_back( i_column );
         sal_Int32 index = m_aColumns.size() - 1;
@@ -313,7 +313,7 @@ namespace toolkit
     //------------------------------------------------------------------------------------------------------------------
     ::rtl::OUString SAL_CALL DefaultGridColumnModel::getImplementationName(  ) throw (RuntimeException)
     {
-        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.comp.toolkit.DefaultGridColumnModel" ) );
+        return ::rtl::OUString( "org.openoffice.comp.toolkit.DefaultGridColumnModel" );
     }
 
     //------------------------------------------------------------------------------------------------------------------
diff --git a/toolkit/source/controls/grid/gridcontrol.cxx b/toolkit/source/controls/grid/gridcontrol.cxx
index 80d7fcaa462f..97ceeff06739 100644
--- a/toolkit/source/controls/grid/gridcontrol.cxx
+++ b/toolkit/source/controls/grid/gridcontrol.cxx
@@ -286,7 +286,7 @@ UnoGridControl::~UnoGridControl()
 //----------------------------------------------------------------------------------------------------------------------
 OUString UnoGridControl::GetComponentServiceName()
 {
-    return OUString(RTL_CONSTASCII_USTRINGPARAM("Grid"));
+    return OUString("Grid");
 }
 
 //----------------------------------------------------------------------------------------------------------------------
@@ -320,7 +320,7 @@ namespace
         try
         {
             Reference< XContainer > const xColModel(
-                xModelProps->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ColumnModel" ) ) ),
+                xModelProps->getPropertyValue( ::rtl::OUString( "ColumnModel" ) ),
                 UNO_QUERY_THROW );
             if ( i_add )
                 xColModel->addContainerListener( i_listener.get() );
@@ -328,7 +328,7 @@ namespace
                 xColModel->removeContainerListener( i_listener.get() );
 
             Reference< XGridDataModel > const xDataModel(
-                xModelProps->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "GridDataModel" ) ) ),
+                xModelProps->getPropertyValue( ::rtl::OUString( "GridDataModel" ) ),
                 UNO_QUERY_THROW
             );
             Reference< XMutableGridDataModel > const xMutableDataModel( xDataModel, UNO_QUERY );
diff --git a/toolkit/source/controls/roadmapcontrol.cxx b/toolkit/source/controls/roadmapcontrol.cxx
index 9bff7bf44157..299ef11b881a 100644
--- a/toolkit/source/controls/roadmapcontrol.cxx
+++ b/toolkit/source/controls/roadmapcontrol.cxx
@@ -196,7 +196,7 @@ static void lcl_throwIndexOutOfBoundsException( )
         if ( !xRoadmapItem.is() )
             lcl_throwIllegalArgumentException();
         Reference< XServiceInfo > xServiceInfo( xRoadmapItem, UNO_QUERY );
-        sal_Bool bIsRoadmapItem = xServiceInfo->supportsService( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.RoadmapItem")) );
+        sal_Bool bIsRoadmapItem = xServiceInfo->supportsService( ::rtl::OUString("com.sun.star.awt.RoadmapItem") );
         if ( !bIsRoadmapItem )
             lcl_throwIllegalArgumentException();
     }
@@ -210,12 +210,12 @@ static void lcl_throwIndexOutOfBoundsException( )
         if ( xProps.is() )
         {
             sal_Int32 LocID = 0;
-            Any aValue = xPropertySet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ID")) );
+            Any aValue = xPropertySet->getPropertyValue( ::rtl::OUString("ID") );
             aValue >>= LocID;
             if (LocID < 0)              // index may not be smaller than zero
             {
                 aAny <<= GetUniqueID();
-                xPropertySet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ID")), aAny );
+                xPropertySet->setPropertyValue( ::rtl::OUString("ID"), aAny );
             }
         }
     }
@@ -238,7 +238,7 @@ static void lcl_throwIndexOutOfBoundsException( )
               {
                 CurRoadmapItem = *i;
                 Reference< XPropertySet > xPropertySet( CurRoadmapItem, UNO_QUERY );
-                aAny = xPropertySet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ID")) );
+                aAny = xPropertySet->getPropertyValue( ::rtl::OUString("ID") );
                 aAny >>= n_CurItemID;
                 if (n_CurItemID == CurID)
                 {
@@ -398,7 +398,7 @@ sal_Bool SAL_CALL UnoRoadmapControl::setModel(const Reference< XControlModel >&
     // -------------------------------------------------------------------
     ::rtl::OUString UnoRoadmapControl::GetComponentServiceName()
     {
-        return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Roadmap"));
+        return ::rtl::OUString("Roadmap");
     }
 
 
diff --git a/toolkit/source/controls/roadmapentry.cxx b/toolkit/source/controls/roadmapentry.cxx
index 15556a457642..3e653cbb153d 100644
--- a/toolkit/source/controls/roadmapentry.cxx
+++ b/toolkit/source/controls/roadmapentry.cxx
@@ -38,22 +38,22 @@ ORoadmapEntry::ORoadmapEntry() : ORoadmapEntry_Base( )
 {
     // registerProperty or registerMayBeVoidProperty or registerPropertyNoMember
 
-    registerProperty( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Label")), RM_PROPERTY_ID_LABEL,
+    registerProperty( ::rtl::OUString("Label"), RM_PROPERTY_ID_LABEL,
                       ::com::sun::star::beans::PropertyAttribute::BOUND |
                       ::com::sun::star::beans::PropertyAttribute::CONSTRAINED,
                       & m_sLabel, ::getCppuType( &m_sLabel ) );
     m_nID = -1;
-    registerProperty( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ID")), RM_PROPERTY_ID_ID,
+    registerProperty( ::rtl::OUString("ID"), RM_PROPERTY_ID_ID,
                       ::com::sun::star::beans::PropertyAttribute::BOUND |
                       ::com::sun::star::beans::PropertyAttribute::CONSTRAINED,
                       & m_nID, ::getCppuType( &m_nID ) );
     m_bEnabled = sal_True;
-    registerProperty( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Enabled")), RM_PROPERTY_ID_ENABLED,
+    registerProperty( ::rtl::OUString("Enabled"), RM_PROPERTY_ID_ENABLED,
                     ::com::sun::star::beans::PropertyAttribute::BOUND |
                     ::com::sun::star::beans::PropertyAttribute::MAYBEDEFAULT,
                     & m_bEnabled, ::getCppuType( &m_bEnabled ) );
 
-    registerProperty( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Interactive")), RM_PROPERTY_ID_INTERACTIVE,
+    registerProperty( ::rtl::OUString("Interactive"), RM_PROPERTY_ID_INTERACTIVE,
                     ::com::sun::star::beans::PropertyAttribute::BOUND |
                     ::com::sun::star::beans::PropertyAttribute::MAYBEDEFAULT,
                     & m_bInteractive, ::getCppuType( &m_bInteractive ) );
@@ -89,7 +89,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( ORoadmapEntry, ORoadmapEntry_Base, ::comphelpe
 
 ::rtl::OUString SAL_CALL ORoadmapEntry::getImplementationName(  ) throw (::com::sun::star::uno::RuntimeException)
 {
-    ::rtl::OUString aStr(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.toolkit.RoadmapItem"));
+    ::rtl::OUString aStr("com.sun.star.comp.toolkit.RoadmapItem");
     return aStr;
 }
 
@@ -102,7 +102,7 @@ sal_Bool SAL_CALL ORoadmapEntry::supportsService( const ::rtl::OUString& Service
 {
     ::com::sun::star::uno::Sequence< ::rtl::OUString > aRet(1);
     ::rtl::OUString* pArray = aRet.getArray();
-    pArray[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.RoadmapItem"));
+    pArray[0] = ::rtl::OUString("com.sun.star.awt.RoadmapItem");
     return aRet;
 }
 //--------------------------------------------------------------------------
diff --git a/toolkit/source/controls/stdtabcontroller.cxx b/toolkit/source/controls/stdtabcontroller.cxx
index 72c28a0fd650..7a3e09dbb705 100644
--- a/toolkit/source/controls/stdtabcontroller.cxx
+++ b/toolkit/source/controls/stdtabcontroller.cxx
@@ -119,7 +119,7 @@ sal_Bool StdTabController::ImplCreateComponentSequence(
             if ( pTabs )
             {
                 // opt: String fuer TabStop als Konstante
-                static const ::rtl::OUString aTabStopName( RTL_CONSTASCII_USTRINGPARAM("Tabstop") );
+                static const ::rtl::OUString aTabStopName( "Tabstop" );
 
                 Reference< XPropertySet >  xPSet( xCtrl->getModel(), UNO_QUERY );
                 Reference< XPropertySetInfo >  xInfo = xPSet->getPropertySetInfo();
diff --git a/toolkit/source/controls/tkscrollbar.cxx b/toolkit/source/controls/tkscrollbar.cxx
index 004fe62bb2e1..08efbe7f0bc5 100644
--- a/toolkit/source/controls/tkscrollbar.cxx
+++ b/toolkit/source/controls/tkscrollbar.cxx
@@ -103,7 +103,7 @@ namespace toolkit
 
     ::rtl::OUString UnoScrollBarControl::GetComponentServiceName()
     {
-        return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScrollBar"));
+        return ::rtl::OUString("ScrollBar");
     }
 
     // ::com::sun::star::uno::XInterface
diff --git a/toolkit/source/controls/tksimpleanimation.cxx b/toolkit/source/controls/tksimpleanimation.cxx
index 4661144a5cb2..746076bc17c4 100644
--- a/toolkit/source/controls/tksimpleanimation.cxx
+++ b/toolkit/source/controls/tksimpleanimation.cxx
@@ -100,7 +100,7 @@ namespace toolkit
     ::rtl::OUString SAL_CALL UnoSimpleAnimationControlModel::getImplementationName()
         throw( uno::RuntimeException )
     {
-        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.toolkit.UnoSimpleAnimationControlModel" ) );
+        return ::rtl::OUString( "com.sun.star.comp.toolkit.UnoSimpleAnimationControlModel" );
     }
 
     //--------------------------------------------------------------------
@@ -128,14 +128,14 @@ namespace toolkit
     //--------------------------------------------------------------------
     ::rtl::OUString UnoSimpleAnimationControl::GetComponentServiceName()
     {
-        return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SimpleAnimation"));
+        return ::rtl::OUString("SimpleAnimation");
     }
 
     //--------------------------------------------------------------------
     ::rtl::OUString SAL_CALL UnoSimpleAnimationControl::getImplementationName()
         throw( uno::RuntimeException )
     {
-        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.toolkit.UnoSimpleAnimationControl" ) );
+        return ::rtl::OUString( "com.sun.star.comp.toolkit.UnoSimpleAnimationControl" );
     }
 
     //--------------------------------------------------------------------
diff --git a/toolkit/source/controls/tkspinbutton.cxx b/toolkit/source/controls/tkspinbutton.cxx
index eda76c4dcee9..79fecb0451cb 100644
--- a/toolkit/source/controls/tkspinbutton.cxx
+++ b/toolkit/source/controls/tkspinbutton.cxx
@@ -120,7 +120,7 @@ namespace toolkit
     //--------------------------------------------------------------------
     ::rtl::OUString SAL_CALL UnoSpinButtonModel::getImplementationName(  ) throw(RuntimeException)
     {
-        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.toolkit.UnoSpinButtonModel" ) );
+        return ::rtl::OUString( "com.sun.star.comp.toolkit.UnoSpinButtonModel" );
     }
 
     //--------------------------------------------------------------------
@@ -145,7 +145,7 @@ namespace toolkit
     //--------------------------------------------------------------------
     ::rtl::OUString UnoSpinButtonControl::GetComponentServiceName()
     {
-        return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SpinButton"));
+        return ::rtl::OUString("SpinButton");
     }
 
     //--------------------------------------------------------------------
@@ -183,7 +183,7 @@ namespace toolkit
     //--------------------------------------------------------------------
     ::rtl::OUString SAL_CALL UnoSpinButtonControl::getImplementationName(  ) throw(RuntimeException)
     {
-        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.toolkit.UnoSpinButtonControl" ) );
+        return ::rtl::OUString( "com.sun.star.comp.toolkit.UnoSpinButtonControl" );
     }
 
     //--------------------------------------------------------------------
diff --git a/toolkit/source/controls/tkthrobber.cxx b/toolkit/source/controls/tkthrobber.cxx
index 74b078ebacfc..413e9584d46e 100644
--- a/toolkit/source/controls/tkthrobber.cxx
+++ b/toolkit/source/controls/tkthrobber.cxx
@@ -98,7 +98,7 @@ namespace toolkit
     ::rtl::OUString SAL_CALL UnoThrobberControlModel::getImplementationName()
         throw( uno::RuntimeException )
     {
-        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.toolkit.UnoThrobberControlModel" ) );
+        return ::rtl::OUString( "com.sun.star.comp.toolkit.UnoThrobberControlModel" );
     }
 
     //--------------------------------------------------------------------
@@ -126,7 +126,7 @@ namespace toolkit
     //--------------------------------------------------------------------
     ::rtl::OUString UnoThrobberControl::GetComponentServiceName()
     {
-        return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Throbber"));
+        return ::rtl::OUString("Throbber");
     }
 
     //--------------------------------------------------------------------
@@ -153,7 +153,7 @@ namespace toolkit
     ::rtl::OUString SAL_CALL UnoThrobberControl::getImplementationName()
         throw( uno::RuntimeException )
     {
-        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.toolkit.UnoThrobberControl" ) );
+        return ::rtl::OUString( "com.sun.star.comp.toolkit.UnoThrobberControl" );
     }
 
     //--------------------------------------------------------------------
diff --git a/toolkit/source/controls/tree/treecontrol.cxx b/toolkit/source/controls/tree/treecontrol.cxx
index 72a14eba0816..4182723b0dc4 100644
--- a/toolkit/source/controls/tree/treecontrol.cxx
+++ b/toolkit/source/controls/tree/treecontrol.cxx
@@ -148,7 +148,7 @@ UnoTreeControl::UnoTreeControl( const Reference< XMultiServiceFactory >& i_facto
 
 OUString UnoTreeControl::GetComponentServiceName()
 {
-    return OUString(RTL_CONSTASCII_USTRINGPARAM("Tree"));
+    return OUString("Tree");
 }
 
 // -------------------------------------------------------------------
diff --git a/toolkit/source/controls/unocontrol.cxx b/toolkit/source/controls/unocontrol.cxx
index cec8c40fe56e..ef5ecb727b08 100644
--- a/toolkit/source/controls/unocontrol.cxx
+++ b/toolkit/source/controls/unocontrol.cxx
@@ -268,7 +268,7 @@ bool UnoControl::ImplCheckLocalize( ::rtl::OUString& _rPossiblyLocalizable )
     {
         Reference< XPropertySet > xPropSet( mxModel, UNO_QUERY_THROW );
         Reference< resource::XStringResourceResolver > xStringResourceResolver(
-            xPropSet->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ResourceResolver" ) ) ),
+            xPropSet->getPropertyValue( ::rtl::OUString( "ResourceResolver" ) ),
             UNO_QUERY
         );
         if ( xStringResourceResolver.is() )
@@ -1121,7 +1121,7 @@ void UnoControl::createPeer( const Reference< XToolkit >& rxToolkit, const Refer
     if ( !mxModel.is() )
     {
         RuntimeException aException;
-        aException.Message = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("createPeer: no model!"));
+        aException.Message = ::rtl::OUString("createPeer: no model!");
         aException.Context = (XAggregation*)(::cppu::OWeakAggObject*)this;
         throw( aException );
     }
@@ -1389,7 +1389,7 @@ sal_Bool UnoControl::setModel( const Reference< XControlModel >& rxModel ) throw
             Sequence< ::rtl::OUString> aNames = lcl_ImplGetPropertyNames( xPropSet );
             xPropSet->addPropertiesChangeListener( aNames, xListener );
 
-            mpData->bLocalizationSupport = xPSI->hasPropertyByName( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ResourceResolver" ) ) );
+            mpData->bLocalizationSupport = xPSI->hasPropertyByName( ::rtl::OUString( "ResourceResolver" ) );
         }
         catch( const Exception& )
         {
@@ -1430,7 +1430,7 @@ void UnoControl::setDesignMode( sal_Bool bOn ) throw(RuntimeException)
         disposeAccessibleContext();
 
         aModeChangeEvent.Source = *this;
-        aModeChangeEvent.NewMode = mbDesignMode ? ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("design")) : ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("alive" ));
+        aModeChangeEvent.NewMode = mbDesignMode ? ::rtl::OUString("design") : ::rtl::OUString("alive" );
     }
 
     // ajust the visibility of our window
@@ -1474,7 +1474,7 @@ sal_Bool UnoControl::supportsService( const ::rtl::OUString& rServiceName ) thro
 
 Sequence< ::rtl::OUString > UnoControl::getSupportedServiceNames(  ) throw(RuntimeException)
 {
-    ::rtl::OUString sName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControl" ) );
+    ::rtl::OUString sName( "com.sun.star.awt.UnoControl" );
     return Sequence< ::rtl::OUString >( &sName, 1 );
 }
 
diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx
index d82e1eb51953..f9925632d9a7 100644
--- a/toolkit/source/controls/unocontrols.cxx
+++ b/toolkit/source/controls/unocontrols.cxx
@@ -76,7 +76,7 @@ using ::com::sun::star::uno::Reference;
 using namespace ::toolkit;
 
 #define IMPL_SERVICEINFO_DERIVED( ImplName, BaseClass, ServiceName ) \
-    ::rtl::OUString SAL_CALL ImplName::getImplementationName(  ) throw(::com::sun::star::uno::RuntimeException) { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "stardiv.Toolkit." #ImplName )); } \
+    ::rtl::OUString SAL_CALL ImplName::getImplementationName(  ) throw(::com::sun::star::uno::RuntimeException) { return ::rtl::OUString( "stardiv.Toolkit." #ImplName ); } \
     ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL ImplName::getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException) \
                             { \
                                 ::com::sun::star::uno::Sequence< ::rtl::OUString > aNames = BaseClass::getSupportedServiceNames( ); \
@@ -117,7 +117,7 @@ ImageHelper::getGraphicFromURL_nothrow( const ::rtl::OUString& _rURL )
         if ( aContext.createComponent( "com.sun.star.graphic.GraphicProvider", xProvider ) )
         {
             uno::Sequence< beans::PropertyValue > aMediaProperties(1);
-            aMediaProperties[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "URL" ) );
+            aMediaProperties[0].Name = ::rtl::OUString( "URL" );
             aMediaProperties[0].Value <<= _rURL;
             xGraphic = xProvider->queryGraphic( aMediaProperties );
         }
@@ -226,13 +226,13 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( UnoEditControl, UnoControlBase, UnoEditControl
 ::rtl::OUString UnoEditControl::GetComponentServiceName()
 {
     // by default, we want a simple edit field
-    ::rtl::OUString sName( RTL_CONSTASCII_USTRINGPARAM("Edit") );
+    ::rtl::OUString sName( "Edit" );
 
     // but maybe we are to display multi-line text?
     uno::Any aVal = ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_MULTILINE ) );
     sal_Bool b = sal_Bool();
     if ( ( aVal >>= b ) && b )
-        sName= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MultiLineEdit"));
+        sName= ::rtl::OUString("MultiLineEdit");
 
     return sName;
 }
@@ -566,7 +566,7 @@ UnoFileControl::UnoFileControl( const Reference< XMultiServiceFactory >& i_facto
 
 ::rtl::OUString UnoFileControl::GetComponentServiceName()
 {
-    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("filecontrol"));
+    return ::rtl::OUString("filecontrol");
 }
 
 //  ----------------------------------------------------
@@ -710,7 +710,7 @@ UnoButtonControl::UnoButtonControl( const uno::Reference< lang::XMultiServiceFac
 
 ::rtl::OUString UnoButtonControl::GetComponentServiceName()
 {
-    ::rtl::OUString aName( RTL_CONSTASCII_USTRINGPARAM("pushbutton") );
+    ::rtl::OUString aName( "pushbutton" );
     uno::Any aVal = ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_PUSHBUTTONTYPE ) );
     sal_Int16 n = sal_Int16();
     if ( ( aVal >>= n ) && n )
@@ -718,11 +718,11 @@ UnoButtonControl::UnoButtonControl( const uno::Reference< lang::XMultiServiceFac
         // Use PushButtonType later when available...
         switch ( n )
         {
-            case 1 /*PushButtonType::OK*/:      aName= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("okbutton"));
+            case 1 /*PushButtonType::OK*/:      aName= ::rtl::OUString("okbutton");
                                                 break;
-            case 2 /*PushButtonType::CANCEL*/:  aName= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("cancelbutton"));
+            case 2 /*PushButtonType::CANCEL*/:  aName= ::rtl::OUString("cancelbutton");
                                                 break;
-            case 3 /*PushButtonType::HELP*/:    aName= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("helpbutton"));
+            case 3 /*PushButtonType::HELP*/:    aName= ::rtl::OUString("helpbutton");
                                                 break;
             default:
             {
@@ -932,7 +932,7 @@ UnoImageControlControl::UnoImageControlControl( const Reference< XMultiServiceFa
 
 ::rtl::OUString UnoImageControlControl::GetComponentServiceName()
 {
-    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("fixedimage"));
+    return ::rtl::OUString("fixedimage");
 }
 
 void UnoImageControlControl::dispose() throw(uno::RuntimeException)
@@ -1025,7 +1025,7 @@ UnoRadioButtonControl::UnoRadioButtonControl( const Reference< XMultiServiceFact
 
 ::rtl::OUString UnoRadioButtonControl::GetComponentServiceName()
 {
-    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("radiobutton"));
+    return ::rtl::OUString("radiobutton");
 }
 
 void UnoRadioButtonControl::dispose() throw(uno::RuntimeException)
@@ -1234,7 +1234,7 @@ UnoCheckBoxControl::UnoCheckBoxControl( const uno::Reference< lang::XMultiServic
 
 ::rtl::OUString UnoCheckBoxControl::GetComponentServiceName()
 {
-    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("checkbox"));
+    return ::rtl::OUString("checkbox");
 }
 
 void UnoCheckBoxControl::dispose() throw(uno::RuntimeException)
@@ -1427,7 +1427,7 @@ UnoFixedHyperlinkControl::UnoFixedHyperlinkControl( const Reference< XMultiServi
 
 ::rtl::OUString UnoFixedHyperlinkControl::GetComponentServiceName()
 {
-    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("fixedhyperlink"));
+    return ::rtl::OUString("fixedhyperlink");
 }
 
 // uno::XInterface
@@ -1608,7 +1608,7 @@ UnoFixedTextControl::UnoFixedTextControl( const Reference< XMultiServiceFactory
 
 ::rtl::OUString UnoFixedTextControl::GetComponentServiceName()
 {
-    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("fixedtext"));
+    return ::rtl::OUString("fixedtext");
 }
 
 // uno::XInterface
@@ -1741,7 +1741,7 @@ UnoGroupBoxControl::UnoGroupBoxControl( const Reference< XMultiServiceFactory >&
 
 ::rtl::OUString UnoGroupBoxControl::GetComponentServiceName()
 {
-    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("groupbox"));
+    return ::rtl::OUString("groupbox");
 }
 
 sal_Bool UnoGroupBoxControl::isTransparent() throw(uno::RuntimeException)
@@ -2309,7 +2309,7 @@ UnoListBoxControl::UnoListBoxControl( const Reference< XMultiServiceFactory >& i
 
 ::rtl::OUString UnoListBoxControl::GetComponentServiceName()
 {
-    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("listbox"));
+    return ::rtl::OUString("listbox");
 }
 IMPL_SERVICEINFO_DERIVED( UnoListBoxControl, UnoControlBase, szServiceName2_UnoControlListBox )
 
@@ -2810,7 +2810,7 @@ IMPL_SERVICEINFO_DERIVED( UnoComboBoxControl, UnoEditControl, szServiceName2_Uno
 
 ::rtl::OUString UnoComboBoxControl::GetComponentServiceName()
 {
-    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("combobox"));
+    return ::rtl::OUString("combobox");
 }
 
 void UnoComboBoxControl::dispose() throw(uno::RuntimeException)
@@ -3259,7 +3259,7 @@ UnoDateFieldControl::UnoDateFieldControl( const Reference< XMultiServiceFactory
 
 ::rtl::OUString UnoDateFieldControl::GetComponentServiceName()
 {
-    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("datefield"));
+    return ::rtl::OUString("datefield");
 }
 
 // uno::XInterface
@@ -3500,7 +3500,7 @@ UnoTimeFieldControl::UnoTimeFieldControl( const Reference< XMultiServiceFactory
 
 ::rtl::OUString UnoTimeFieldControl::GetComponentServiceName()
 {
-    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("timefield"));
+    return ::rtl::OUString("timefield");
 }
 
 // uno::XInterface
@@ -3701,7 +3701,7 @@ UnoNumericFieldControl::UnoNumericFieldControl( const Reference< XMultiServiceFa
 
 ::rtl::OUString UnoNumericFieldControl::GetComponentServiceName()
 {
-    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("numericfield"));
+    return ::rtl::OUString("numericfield");
 }
 
 // uno::XInterface
@@ -3903,7 +3903,7 @@ UnoCurrencyFieldControl::UnoCurrencyFieldControl( const Reference< XMultiService
 
 ::rtl::OUString UnoCurrencyFieldControl::GetComponentServiceName()
 {
-    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("longcurrencyfield"));
+    return ::rtl::OUString("longcurrencyfield");
 }
 
 // uno::XInterface
@@ -4096,7 +4096,7 @@ UnoPatternFieldControl::UnoPatternFieldControl( const Reference< XMultiServiceFa
 
 ::rtl::OUString UnoPatternFieldControl::GetComponentServiceName()
 {
-    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("patternfield"));
+    return ::rtl::OUString("patternfield");
 }
 
 void UnoPatternFieldControl::ImplSetPeerProperty( const ::rtl::OUString& rPropName, const uno::Any& rVal )
@@ -4243,7 +4243,7 @@ UnoProgressBarControl::UnoProgressBarControl( const Reference< XMultiServiceFact
 
 ::rtl::OUString UnoProgressBarControl::GetComponentServiceName()
 {
-    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ProgressBar"));
+    return ::rtl::OUString("ProgressBar");
 }
 
 // uno::XInterface
@@ -4374,7 +4374,7 @@ UnoFixedLineControl::UnoFixedLineControl( const Reference< XMultiServiceFactory
 
 ::rtl::OUString UnoFixedLineControl::GetComponentServiceName()
 {
-    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FixedLine"));
+    return ::rtl::OUString("FixedLine");
 }
 
 sal_Bool UnoFixedLineControl::isTransparent() throw(uno::RuntimeException)