automated removal of RTL_CONSTASCII_USTRINGPARAM for quoted OUStrings

Done with a perl regex:

s/OUString\s*\(\s*RTL_CONSTASCII_USTRINGPARAM\s*\((\s*"[^")]*?"\s*)\)\s*\)/OUString\($1\)/gms

Change-Id: Idf28320817cdcbea6d0f7ec06a9bf51bd2c3b3ec
Reviewed-on: https://gerrit.libreoffice.org/2832
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>

11 files changed, 75 insertions, 75 deletions

diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx
index 6ce06652e036..a0e64bc3c266 100644
--- a/svx/source/tbxctrls/extrusioncontrols.cxx
+++ b/svx/source/tbxctrls/extrusioncontrols.cxx
@@ -247,7 +247,7 @@ ExtrusionDirectionControl::ExtrusionDirectionControl(
 )   : svt::PopupWindowController(
         rServiceManager,
         Reference< frame::XFrame >(),
-        OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionDirectionFloater" ) )
+        OUString( ".uno:ExtrusionDirectionFloater" )
     )
 {
 }
@@ -265,7 +265,7 @@ ExtrusionDirectionControl::ExtrusionDirectionControl(
 
 OUString SAL_CALL ExtrusionDirectionControl_getImplementationName()
 {
-    return OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.svx.ExtrusionDirectionController" ));
+    return OUString( "com.sun.star.comp.svx.ExtrusionDirectionController" );
 }
 
 // --------------------------------------------------------------------
@@ -273,7 +273,7 @@ OUString SAL_CALL ExtrusionDirectionControl_getImplementationName()
 Sequence< OUString > SAL_CALL ExtrusionDirectionControl_getSupportedServiceNames() throw( RuntimeException )
 {
     Sequence< OUString > aSNS( 1 );
-    aSNS.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ToolbarController" ));
+    aSNS.getArray()[0] = OUString( "com.sun.star.frame.ToolbarController" );
     return aSNS;
 }
 
@@ -469,9 +469,9 @@ IMPL_LINK_NOARG(ExtrusionDepthWindow, SelectHdl)
 
             Any a;
             Sequence< PropertyValue > aArgs( 2 );
-            aArgs[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Depth" ));
+            aArgs[0].Name = rtl::OUString( "Depth" );
             aArgs[0].Value <<= mfDepth;
-            aArgs[1].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Metric" ));
+            aArgs[1].Name = rtl::OUString( "Metric" );
             aArgs[1].Value <<= static_cast<sal_Int32>( meUnit );
 
             mrController.dispatchCommand( aCommand, aArgs );
@@ -512,7 +512,7 @@ ExtrusionDepthController::ExtrusionDepthController(
 )   : svt::PopupWindowController(
         rServiceManager,
         Reference< frame::XFrame >(),
-        OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionDepthFloater" ) )
+        OUString( ".uno:ExtrusionDepthFloater" )
     )
 {
 }
@@ -531,7 +531,7 @@ ExtrusionDepthController::ExtrusionDepthController(
 
 OUString SAL_CALL ExtrusionDepthController_getImplementationName()
 {
-    return OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.svx.ExtrusionDepthController" ));
+    return OUString( "com.sun.star.comp.svx.ExtrusionDepthController" );
 }
 
 // --------------------------------------------------------------------
@@ -539,7 +539,7 @@ OUString SAL_CALL ExtrusionDepthController_getImplementationName()
 Sequence< OUString > SAL_CALL ExtrusionDepthController_getSupportedServiceNames() throw( RuntimeException )
 {
     Sequence< OUString > aSNS( 1 );
-    aSNS.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.PopupMenuController" ));
+    aSNS.getArray()[0] = OUString( "com.sun.star.frame.PopupMenuController" );
     return aSNS;
 }
 
@@ -774,7 +774,7 @@ ExtrusionLightingControl::ExtrusionLightingControl(
     const Reference< lang::XMultiServiceFactory >& rServiceManager
 )   : svt::PopupWindowController( rServiceManager,
                 Reference< frame::XFrame >(),
-                OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionDirectionFloater" ) )
+                OUString( ".uno:ExtrusionDirectionFloater" )
     )
 {
 }
@@ -792,7 +792,7 @@ ExtrusionLightingControl::ExtrusionLightingControl(
 
 OUString SAL_CALL ExtrusionLightingControl_getImplementationName()
 {
-    return OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.svx.ExtrusionLightingController" ));
+    return OUString( "com.sun.star.comp.svx.ExtrusionLightingController" );
 }
 
 // --------------------------------------------------------------------
@@ -800,7 +800,7 @@ OUString SAL_CALL ExtrusionLightingControl_getImplementationName()
 Sequence< OUString > SAL_CALL ExtrusionLightingControl_getSupportedServiceNames() throw( RuntimeException )
 {
     Sequence< OUString > aSNS( 1 );
-    aSNS.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ToolbarController" ));
+    aSNS.getArray()[0] = OUString( "com.sun.star.frame.ToolbarController" );
     return aSNS;
 }
 
@@ -919,7 +919,7 @@ ExtrusionSurfaceControl::ExtrusionSurfaceControl(
 :   svt::PopupWindowController(
         rServiceManager,
         Reference< frame::XFrame >(),
-        OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionSurfaceFloater" ) )
+        OUString( ".uno:ExtrusionSurfaceFloater" )
     )
 {
 }
@@ -937,7 +937,7 @@ ExtrusionSurfaceControl::ExtrusionSurfaceControl(
 
 OUString SAL_CALL ExtrusionSurfaceControl_getImplementationName()
 {
-    return OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.svx.ExtrusionSurfaceController" ));
+    return OUString( "com.sun.star.comp.svx.ExtrusionSurfaceController" );
 }
 
 // --------------------------------------------------------------------
@@ -945,7 +945,7 @@ OUString SAL_CALL ExtrusionSurfaceControl_getImplementationName()
 Sequence< OUString > SAL_CALL ExtrusionSurfaceControl_getSupportedServiceNames() throw( RuntimeException )
 {
     Sequence< OUString > aSNS( 1 );
-    aSNS.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ToolbarController" ));
+    aSNS.getArray()[0] = OUString( "com.sun.star.frame.ToolbarController" );
     return aSNS;
 }
 
@@ -1004,7 +1004,7 @@ SfxPopupWindowType ExtrusionColorControl::GetPopupWindowType() const
 SfxPopupWindow* ExtrusionColorControl::CreatePopupWindow()
 {
     SvxColorWindow_Impl* pColorWin = new SvxColorWindow_Impl(
-        rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:Extrusion3DColor" )),
+        rtl::OUString( ".uno:Extrusion3DColor" ),
         SID_EXTRUSION_3D_COLOR,
         m_xFrame,
         SVX_RESSTR( RID_SVXSTR_EXTRUSION_COLOR ),
diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx
index 877958250369..cfd9f5b3010e 100644
--- a/svx/source/tbxctrls/fillctrl.cxx
+++ b/svx/source/tbxctrls/fillctrl.cxx
@@ -68,14 +68,14 @@ SvxFillToolBoxControl::SvxFillToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId
     bIgnoreStatusUpdate( sal_False ),
     eLastXFS        ( XFILL_NONE )
 {
-    addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FillColor" )));
-    addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FillGradient" )));
-    addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FillHatch" )));
-    addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FillBitmap" )));
-    addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ColorTableState" )));
-    addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:GradientListState" )));
-    addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:HatchListState" )));
-    addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:BitmapListState" )));
+    addStatusListener( rtl::OUString( ".uno:FillColor" ));
+    addStatusListener( rtl::OUString( ".uno:FillGradient" ));
+    addStatusListener( rtl::OUString( ".uno:FillHatch" ));
+    addStatusListener( rtl::OUString( ".uno:FillBitmap" ));
+    addStatusListener( rtl::OUString( ".uno:ColorTableState" ));
+    addStatusListener( rtl::OUString( ".uno:GradientListState" ));
+    addStatusListener( rtl::OUString( ".uno:HatchListState" ));
+    addStatusListener( rtl::OUString( ".uno:BitmapListState" ));
 }
 
 //========================================================================
@@ -545,7 +545,7 @@ FillControl::~FillControl()
 IMPL_LINK_NOARG_INLINE_START(FillControl, DelayHdl)
 {
     SelectFillTypeHdl( NULL );
-    ( (SvxFillToolBoxControl*)GetData() )->updateStatus( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FillStyle" )));
+    ( (SvxFillToolBoxControl*)GetData() )->updateStatus( ::rtl::OUString( ".uno:FillStyle" ));
 //  ( (SvxFillToolBoxControl*)GetData() )->GetBindings().Invalidate( SID_ATTR_FILL_STYLE );
     return 0;
 }
@@ -673,12 +673,12 @@ IMPL_LINK( FillControl, SelectFillAttrHdl, ListBox *, pBox )
         Sequence< PropertyValue > aArgs( 1 );
 
         // First set the style
-        aArgs[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FillStyle" ));
+        aArgs[0].Name = ::rtl::OUString( "FillStyle" );
         aXFillStyleItem.QueryValue(  a );
         aArgs[0].Value = a;
         ( (SvxFillToolBoxControl*)GetData() )->IgnoreStatusUpdate( sal_True );
         ((SvxFillToolBoxControl*)GetData())->Dispatch(
-            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FillStyle" )), aArgs );
+            ::rtl::OUString( ".uno:FillStyle" ), aArgs );
         ( (SvxFillToolBoxControl*)GetData() )->IgnoreStatusUpdate( sal_False );
 
         switch( eXFS )
@@ -701,10 +701,10 @@ IMPL_LINK( FillControl, SelectFillAttrHdl, ListBox *, pBox )
 
                 XFillColorItem aXFillColorItem( aTmpStr, pLbFillAttr->GetSelectEntryColor() );
 
-                aArgs[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FillColor" ));
+                aArgs[0].Name = ::rtl::OUString( "FillColor" );
                 aXFillColorItem.QueryValue( a );
                 aArgs[0].Value = a;
-                ((SvxFillToolBoxControl*)GetData())->Dispatch( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FillColor" )),
+                ((SvxFillToolBoxControl*)GetData())->Dispatch( ::rtl::OUString( ".uno:FillColor" ),
                                                                aArgs );
             }
             break;
@@ -722,10 +722,10 @@ IMPL_LINK( FillControl, SelectFillAttrHdl, ListBox *, pBox )
                         XGradient aGradient = aItem.GetGradientList()->GetGradient( nPos )->GetGradient();
                         XFillGradientItem aXFillGradientItem( pLbFillAttr->GetSelectEntry(), aGradient );
 
-                        aArgs[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FillGradient" ));
+                        aArgs[0].Name = ::rtl::OUString( "FillGradient" );
                         aXFillGradientItem.QueryValue( a );
                         aArgs[0].Value = a;
-                        ((SvxFillToolBoxControl*)GetData())->Dispatch( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FillGradient" )),
+                        ((SvxFillToolBoxControl*)GetData())->Dispatch( ::rtl::OUString( ".uno:FillGradient" ),
                                                                        aArgs );
                     }
                 }
@@ -745,10 +745,10 @@ IMPL_LINK( FillControl, SelectFillAttrHdl, ListBox *, pBox )
                         XHatch aHatch = aItem.GetHatchList()->GetHatch( nPos )->GetHatch();
                         XFillHatchItem aXFillHatchItem( pLbFillAttr->GetSelectEntry(), aHatch );
 
-                        aArgs[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FillHatch" ));
+                        aArgs[0].Name = ::rtl::OUString( "FillHatch" );
                         aXFillHatchItem.QueryValue( a );
                         aArgs[0].Value = a;
-                        ((SvxFillToolBoxControl*)GetData())->Dispatch( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FillHatch" )),
+                        ((SvxFillToolBoxControl*)GetData())->Dispatch( ::rtl::OUString( ".uno:FillHatch" ),
                                                                        aArgs );
                     }
                 }
@@ -769,10 +769,10 @@ IMPL_LINK( FillControl, SelectFillAttrHdl, ListBox *, pBox )
                         const XBitmapEntry* pXBitmapEntry = aItem.GetBitmapList()->GetBitmap(nPos);
                         const XFillBitmapItem aXFillBitmapItem(pLbFillAttr->GetSelectEntry(), pXBitmapEntry->GetGraphicObject());
 
-                        aArgs[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FillBitmap" ));
+                        aArgs[0].Name = ::rtl::OUString( "FillBitmap" );
                         aXFillBitmapItem.QueryValue( a );
                         aArgs[0].Value = a;
-                        ((SvxFillToolBoxControl*)GetData())->Dispatch(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:FillBitmap")), aArgs);
+                        ((SvxFillToolBoxControl*)GetData())->Dispatch(::rtl::OUString(".uno:FillBitmap"), aArgs);
                     }
                 }
             }
diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx
index a35262f020dd..3f94d0ddcf0e 100644
--- a/svx/source/tbxctrls/fontworkgallery.cxx
+++ b/svx/source/tbxctrls/fontworkgallery.cxx
@@ -420,7 +420,7 @@ public:
 // -----------------------------------------------------------------------
 
 FontWorkAlignmentControl::FontWorkAlignmentControl( const Reference< lang::XMultiServiceFactory >& rServiceManager )
-: svt::PopupWindowController( rServiceManager, Reference< frame::XFrame >(), OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FontworkAlignment" ) ) )
+: svt::PopupWindowController( rServiceManager, Reference< frame::XFrame >(), OUString( ".uno:FontworkAlignment" ) )
 {
 }
 
@@ -437,7 +437,7 @@ FontWorkAlignmentControl::FontWorkAlignmentControl( const Reference< lang::XMult
 
 OUString SAL_CALL FontWorkAlignmentControl_getImplementationName()
 {
-    return OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.svx.FontworkAlignmentController" ));
+    return OUString( "com.sun.star.comp.svx.FontworkAlignmentController" );
 }
 
 // --------------------------------------------------------------------
@@ -445,7 +445,7 @@ OUString SAL_CALL FontWorkAlignmentControl_getImplementationName()
 Sequence< OUString > SAL_CALL FontWorkAlignmentControl_getSupportedServiceNames() throw( RuntimeException )
 {
     Sequence< OUString > aSNS( 1 );
-    aSNS.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ToolbarController" ));
+    aSNS.getArray()[0] = OUString( "com.sun.star.frame.ToolbarController" );
     return aSNS;
 }
 
@@ -610,7 +610,7 @@ IMPL_LINK_NOARG(FontWorkCharacterSpacingWindow, SelectHdl)
         aArgs[0].Name = msFontworkCharacterSpacing.copy(5);
         aArgs[0].Value <<= (sal_Int32)nCharacterSpacing;
 
-        mrController.dispatchCommand( OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FontworkCharacterSpacingDialog" )), aArgs );
+        mrController.dispatchCommand( OUString( ".uno:FontworkCharacterSpacingDialog" ), aArgs );
     }
     else if ( nSelection == 6 ) // KernCharacterPairs
     {
@@ -656,7 +656,7 @@ public:
 
 
 FontWorkCharacterSpacingControl::FontWorkCharacterSpacingControl( const Reference< lang::XMultiServiceFactory >& rServiceManager )
-: svt::PopupWindowController( rServiceManager, Reference< frame::XFrame >(), OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FontworkCharacterSpacingFloater" ) ) )
+: svt::PopupWindowController( rServiceManager, Reference< frame::XFrame >(), OUString( ".uno:FontworkCharacterSpacingFloater" ) )
 {
 }
 
@@ -673,7 +673,7 @@ FontWorkCharacterSpacingControl::FontWorkCharacterSpacingControl( const Referenc
 
 OUString SAL_CALL FontWorkCharacterSpacingControl_getImplementationName()
 {
-    return OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.svx.FontworkCharacterSpacingController" ));
+    return OUString( "com.sun.star.comp.svx.FontworkCharacterSpacingController" );
 }
 
 // --------------------------------------------------------------------
@@ -681,7 +681,7 @@ OUString SAL_CALL FontWorkCharacterSpacingControl_getImplementationName()
 Sequence< OUString > SAL_CALL FontWorkCharacterSpacingControl_getSupportedServiceNames() throw( RuntimeException )
 {
     Sequence< OUString > aSNS( 1 );
-    aSNS.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ToolbarController" ));
+    aSNS.getArray()[0] = OUString( "com.sun.star.frame.ToolbarController" );
     return aSNS;
 }
 
diff --git a/svx/source/tbxctrls/formatpaintbrushctrl.cxx b/svx/source/tbxctrls/formatpaintbrushctrl.cxx
index 008d89bf5ff6..6aeb599adab1 100644
--- a/svx/source/tbxctrls/formatpaintbrushctrl.cxx
+++ b/svx/source/tbxctrls/formatpaintbrushctrl.cxx
@@ -61,9 +61,9 @@ FormatPaintBrushToolBoxControl::~FormatPaintBrushToolBoxControl()
 void FormatPaintBrushToolBoxControl::impl_executePaintBrush()
 {
     Sequence< PropertyValue > aArgs( 1 );
-    aArgs[0].Name  = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PersistentCopy" ));
+    aArgs[0].Name  = rtl::OUString( "PersistentCopy" );
     aArgs[0].Value = makeAny( static_cast<sal_Bool>(m_bPersistentCopy) );
-    Dispatch( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormatPaintbrush" ))
+    Dispatch( rtl::OUString( ".uno:FormatPaintbrush" )
         , aArgs );
 }
 
diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx
index 86e5c5e17942..955d2847e71f 100644
--- a/svx/source/tbxctrls/grafctrl.cxx
+++ b/svx/source/tbxctrls/grafctrl.cxx
@@ -63,7 +63,7 @@ using namespace ::com::sun::star::lang;
 
 #define SYMBOL_TO_FIELD_OFFSET      4
 #define ITEMVALUE(ItemSet,Id,Cast)  ((const Cast&)(ItemSet).Get(Id)).GetValue()
-#define TOOLBOX_NAME                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "colorbar" ) )
+#define TOOLBOX_NAME                ::rtl::OUString( "colorbar" )
 
 TYPEINIT1_AUTOFACTORY( TbxImageItem, SfxUInt16Item );
 
@@ -355,7 +355,7 @@ void ImplGrafModeControl::Select()
     if ( !IsTravelSelect() )
     {
         Sequence< PropertyValue > aArgs( 1 );
-        aArgs[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "GrafMode" ));
+        aArgs[0].Name = rtl::OUString( "GrafMode" );
         aArgs[0].Value = makeAny( sal_Int16( GetSelectEntryPos() ));
 
         /*  #i33380# DR 2004-09-03 Moved the following line above the Dispatch() call.
@@ -365,7 +365,7 @@ void ImplGrafModeControl::Select()
 
         SfxToolBoxControl::Dispatch(
             Reference< XDispatchProvider >( mxFrame->getController(), UNO_QUERY ),
-            OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:GrafMode" )),
+            OUString( ".uno:GrafMode" ),
             aArgs );
     }
 }
diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx
index 7d26fdcb0a91..76f170f0d21f 100644
--- a/svx/source/tbxctrls/itemwin.cxx
+++ b/svx/source/tbxctrls/itemwin.cxx
@@ -130,11 +130,11 @@ void SvxLineBox::Select()
 
                     Any a;
                     Sequence< PropertyValue > aArgs( 1 );
-                    aArgs[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LineDash" ));
+                    aArgs[0].Name = ::rtl::OUString( "LineDash" );
                     aLineDashItem.QueryValue ( a );
                     aArgs[0].Value = a;
                     SfxToolBoxControl::Dispatch( Reference< XDispatchProvider >( mxFrame->getController(), UNO_QUERY ),
-                                                 ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:LineDash" )),
+                                                 ::rtl::OUString( ".uno:LineDash" ),
                                                  aArgs );
                 }
             }
@@ -144,11 +144,11 @@ void SvxLineBox::Select()
         XLineStyleItem aLineStyleItem( eXLS );
         Any a;
         Sequence< PropertyValue > aArgs( 1 );
-        aArgs[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "XLineStyle" ));
+        aArgs[0].Name = ::rtl::OUString( "XLineStyle" );
         aLineStyleItem.QueryValue ( a );
         aArgs[0].Value = a;
         SfxToolBoxControl::Dispatch( Reference< XDispatchProvider >( mxFrame->getController(), UNO_QUERY ),
-                                     ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:XLineStyle" )),
+                                     ::rtl::OUString( ".uno:XLineStyle" ),
                                      aArgs );
 
         nCurPos = GetSelectEntryPos();
@@ -474,11 +474,11 @@ void SvxMetricField::Modify()
 
     Any a;
     Sequence< PropertyValue > aArgs( 1 );
-    aArgs[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LineWidth" ));
+    aArgs[0].Name = ::rtl::OUString( "LineWidth" );
     aLineWidthItem.QueryValue( a );
     aArgs[0].Value = a;
     SfxToolBoxControl::Dispatch( Reference< XDispatchProvider >( mxFrame->getController(), UNO_QUERY ),
-                                 ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:LineWidth" )),
+                                 ::rtl::OUString( ".uno:LineWidth" ),
                                  aArgs );
 }
 
diff --git a/svx/source/tbxctrls/lboxctrl.cxx b/svx/source/tbxctrls/lboxctrl.cxx
index cbdbbfa89586..e0adc57f125e 100644
--- a/svx/source/tbxctrls/lboxctrl.cxx
+++ b/svx/source/tbxctrls/lboxctrl.cxx
@@ -294,9 +294,9 @@ SfxPopupWindow* SvxUndoRedoControl::CreatePopupWindow()
     DBG_ASSERT(( SID_UNDO == GetSlotId() || SID_REDO == GetSlotId() ), "mismatching ids" );
 
     if ( m_aCommandURL == ".uno:Undo" )
-        updateStatus( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:GetUndoStrings" )));
+        updateStatus( rtl::OUString( ".uno:GetUndoStrings" ));
     else
-        updateStatus( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:GetRedoStrings" )));
+        updateStatus( rtl::OUString( ".uno:GetRedoStrings" ));
 
     ToolBox& rBox = GetToolBox();
 
diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx
index 1827f9408dd3..2f26f7b52cb2 100644
--- a/svx/source/tbxctrls/linectrl.cxx
+++ b/svx/source/tbxctrls/linectrl.cxx
@@ -65,8 +65,8 @@ SvxLineStyleToolBoxControl::SvxLineStyleToolBoxControl( sal_uInt16 nSlotId,
     pDashItem       ( NULL ),
     bUpdate         ( sal_False )
 {
-    addStatusListener( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:LineDash" )));
-    addStatusListener( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DashListState" )));
+    addStatusListener( ::rtl::OUString( ".uno:LineDash" ));
+    addStatusListener( ::rtl::OUString( ".uno:DashListState" ));
 }
 
 //========================================================================
@@ -205,7 +205,7 @@ SvxLineWidthToolBoxControl::SvxLineWidthToolBoxControl(
     sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
     SfxToolBoxControl( nSlotId, nId, rTbx )
 {
-    addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:MetricUnit" )));
+    addStatusListener( rtl::OUString( ".uno:MetricUnit" ));
 }
 
 //========================================================================
@@ -272,7 +272,7 @@ SvxLineColorToolBoxControl::SvxLineColorToolBoxControl(
     sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
     SfxToolBoxControl( nSlotId, nId, rTbx )
 {
-    addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ColorTableState" )));
+    addStatusListener( rtl::OUString( ".uno:ColorTableState" ));
 }
 
 //========================================================================
@@ -412,7 +412,7 @@ void SvxLineEndWindow::implInit()
     // ValueSet mit Eintraegen der LineEndList fuellen
     FillValueSet();
 
-    AddStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:LineEndListState" )));
+    AddStatusListener( rtl::OUString( ".uno:LineEndListState" ));
 
     //ChangeHelpId( HID_POPUP_LINEENDSTYLE );
     aLineEndSet.Show();
@@ -464,13 +464,13 @@ IMPL_LINK_NOARG(SvxLineEndWindow, SelectHdl)
 
     if ( pLineStartItem )
     {
-        aArgs[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LineStart" ));
+        aArgs[0].Name = ::rtl::OUString( "LineStart" );
         pLineStartItem->QueryValue( a );
         aArgs[0].Value = a;
     }
     else
     {
-        aArgs[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LineEnd" ));
+        aArgs[0].Name = ::rtl::OUString( "LineEnd" );
         pLineEndItem->QueryValue( a );
         aArgs[0].Value = a;
     }
@@ -481,7 +481,7 @@ IMPL_LINK_NOARG(SvxLineEndWindow, SelectHdl)
     aLineEndSet.SetNoSelection();
 
     SfxToolBoxControl::Dispatch( Reference< XDispatchProvider >( mxFrame->getController(), UNO_QUERY ),
-                                 ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:LineEndStyle" )),
+                                 ::rtl::OUString( ".uno:LineEndStyle" ),
                                  aArgs );
 
     delete pLineEndItem;
diff --git a/svx/source/tbxctrls/tbunocontroller.cxx b/svx/source/tbxctrls/tbunocontroller.cxx
index d2c7b9dea304..0968974377fe 100644
--- a/svx/source/tbxctrls/tbunocontroller.cxx
+++ b/svx/source/tbxctrls/tbunocontroller.cxx
@@ -119,7 +119,7 @@ void SvxFontSizeBox_Impl::Select()
         float fSelVal     = float( nSelVal ) / 10;
 
         uno::Sequence< beans::PropertyValue > aArgs( 1 );
-        aArgs[0].Name  = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FontHeight.Height" ));
+        aArgs[0].Name  = ::rtl::OUString( "FontHeight.Height" );
         aArgs[0].Value = uno::makeAny( fSelVal );
 
         /*  #i33380# DR 2004-09-03 Moved the following line above the Dispatch() call.
@@ -242,10 +242,10 @@ FontHeightToolBoxControl::FontHeightToolBoxControl(
     const uno::Reference< lang::XMultiServiceFactory >& rServiceManager ) :
     svt::ToolboxController( rServiceManager,
                             uno::Reference< frame::XFrame >(),
-                            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FontHeight" )) ),
+                            ::rtl::OUString( ".uno:FontHeight" ) ),
     m_pBox( NULL )
 {
-    addStatusListener( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:CharFontName" )));
+    addStatusListener( ::rtl::OUString( ".uno:CharFontName" ));
 }
 
 FontHeightToolBoxControl::~FontHeightToolBoxControl()
@@ -303,7 +303,7 @@ uno::Sequence< ::rtl::OUString > FontHeightToolBoxControl::getSupportedServiceNa
 throw()
 {
     uno::Sequence< ::rtl::OUString > aSNS( 1 );
-    aSNS.getArray()[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ToolbarController" ));
+    aSNS.getArray()[0] = ::rtl::OUString( "com.sun.star.frame.ToolbarController" );
     return aSNS;
 }
 
@@ -402,7 +402,7 @@ void FontHeightToolBoxControl::dispatchCommand(
         uno::Reference< frame::XDispatch >      xDispatch;
         uno::Reference< util::XURLTransformer > xURLTransformer = getURLTransformer();
 
-        aURL.Complete = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FontHeight" ));
+        aURL.Complete = ::rtl::OUString( ".uno:FontHeight" );
         xURLTransformer->parseStrict( aURL );
         xDispatch = xDispatchProvider->queryDispatch( aURL, ::rtl::OUString(), 0 );
         if ( xDispatch.is() )
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
index 7a020ed10ffe..4e4cf1fc925b 100644
--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -148,7 +148,7 @@ long FindTextFieldControl::PreNotify( NotifyEvent& rNEvt )
                 if (xPropSet.is())
                 {
                     css::uno::Reference< css::frame::XLayoutManager > xLayoutManager;
-                    css::uno::Any aValue = xPropSet->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" ) ) );
+                    css::uno::Any aValue = xPropSet->getPropertyValue( ::rtl::OUString( "LayoutManager" ) );
                     aValue >>= xLayoutManager;
                     if (xLayoutManager.is())
                     {
@@ -360,7 +360,7 @@ css::uno::Sequence< ::rtl::OUString > SAL_CALL FindTextToolbarController::getSup
 css::uno::Sequence< ::rtl::OUString >  FindTextToolbarController::getSupportedServiceNames_Static() throw()
 {
     css::uno::Sequence< ::rtl::OUString > aSNS( 1 );
-    aSNS.getArray()[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ToolbarController" ) );
+    aSNS.getArray()[0] = ::rtl::OUString( "com.sun.star.frame.ToolbarController" );
     return aSNS;
 }
 
@@ -698,7 +698,7 @@ void SAL_CALL ExitSearchToolboxController::execute( sal_Int16 /*KeyModifier*/ )
     if (xPropSet.is())
     {
         css::uno::Reference< css::frame::XLayoutManager > xLayoutManager;
-        css::uno::Any aValue = xPropSet->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" ) ) );
+        css::uno::Any aValue = xPropSet->getPropertyValue( ::rtl::OUString( "LayoutManager" ) );
         aValue >>= xLayoutManager;
         if (xLayoutManager.is())
         {
@@ -778,8 +778,8 @@ css::uno::Sequence< ::rtl::OUString > SAL_CALL FindbarDispatcher::getSupportedSe
 css::uno::Sequence< ::rtl::OUString >  FindbarDispatcher::getSupportedServiceNames_Static() throw()
 {
     css::uno::Sequence< ::rtl::OUString > aSNS( 2 );
-    aSNS.getArray()[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.svx.FindbarDispatcher" ));
-    aSNS.getArray()[1] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ProtocolHandler" ));
+    aSNS.getArray()[0] = ::rtl::OUString( "com.sun.star.comp.svx.FindbarDispatcher" );
+    aSNS.getArray()[1] = ::rtl::OUString( "com.sun.star.frame.ProtocolHandler" );
     return aSNS;
 }
 
@@ -823,7 +823,7 @@ void SAL_CALL FindbarDispatcher::dispatch( const css::util::URL& aURL, const css
             return;
 
         css::uno::Reference< css::frame::XLayoutManager > xLayoutManager;
-        css::uno::Any aValue = xPropSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" )) );
+        css::uno::Any aValue = xPropSet->getPropertyValue( ::rtl::OUString( "LayoutManager" ) );
         aValue >>= xLayoutManager;
         if (!xLayoutManager.is())
             return;
diff --git a/svx/source/tbxctrls/verttexttbxctrl.cxx b/svx/source/tbxctrls/verttexttbxctrl.cxx
index e877eed176ae..0d353b196d9f 100644
--- a/svx/source/tbxctrls/verttexttbxctrl.cxx
+++ b/svx/source/tbxctrls/verttexttbxctrl.cxx
@@ -34,14 +34,14 @@ SvxCTLTextTbxCtrl::SvxCTLTextTbxCtrl(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox
     SvxVertCTLTextTbxCtrl( nSlotId, nId, rTbx )
 {
     SetVert(sal_False);
-    addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:CTLFontState" )));
+    addStatusListener( rtl::OUString( ".uno:CTLFontState" ));
 }
 
 SvxVertTextTbxCtrl::SvxVertTextTbxCtrl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
     SvxVertCTLTextTbxCtrl( nSlotId, nId, rTbx )
 {
     SetVert(sal_True);
-    addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:VerticalTextState" )));
+    addStatusListener( rtl::OUString( ".uno:VerticalTextState" ));
 }
 
 /* ---------------------------------------------------------------------------*/