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>

16 files changed, 65 insertions, 66 deletions

diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx
index 150094dd4650..21cf4d5b43fb 100644
--- a/svx/source/unodraw/UnoGraphicExporter.cxx
+++ b/svx/source/unodraw/UnoGraphicExporter.cxx
@@ -193,14 +193,14 @@ namespace svx
         throw()
     {
         Sequence< OUString > aSupportedServiceNames( 1 );
-        aSupportedServiceNames[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.GraphicExportFilter" ) );
+        aSupportedServiceNames[0] = OUString( "com.sun.star.drawing.GraphicExportFilter" );
         return aSupportedServiceNames;
     }
 
     SVX_DLLPUBLIC OUString SAL_CALL GraphicExporter_getImplementationName()
         throw()
     {
-        return OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Draw.GraphicExporter" ) );
+        return OUString( "com.sun.star.comp.Draw.GraphicExporter" );
     }
 
     /** creates a bitmap that is optionaly transparent from a metafile
@@ -517,12 +517,12 @@ void GraphicExporter::ParseSettings( const Sequence< PropertyValue >& aDescripto
                 else if( pDataValues->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Width" ) ) )  // for compatibility reasons, deprecated
                 {
                     pDataValues->Value >>= rSettings.mnWidth;
-                    pDataValues->Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "PixelWidth" ) );
+                    pDataValues->Name = OUString( "PixelWidth" );
                 }
                 else if( pDataValues->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Height" ) ) ) // for compatibility reasons, deprecated
                 {
                     pDataValues->Value >>= rSettings.mnHeight;
-                    pDataValues->Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "PixelHeight" ) );
+                    pDataValues->Name = OUString( "PixelHeight" );
                 }
                 else if ( pDataValues->Name == "ExportOnlyBackground" )
                 {
diff --git a/svx/source/unodraw/UnoNamespaceMap.cxx b/svx/source/unodraw/UnoNamespaceMap.cxx
index 33c4e811ac30..3be929155bd7 100644
--- a/svx/source/unodraw/UnoNamespaceMap.cxx
+++ b/svx/source/unodraw/UnoNamespaceMap.cxx
@@ -82,14 +82,14 @@ namespace svx
         throw()
     {
         Sequence< ::rtl::OUString > aSupportedServiceNames( 1 );
-        aSupportedServiceNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.xml.NamespaceMap" ) );
+        aSupportedServiceNames[0] = ::rtl::OUString( "com.sun.star.xml.NamespaceMap" );
         return aSupportedServiceNames;
     }
 
     ::rtl::OUString SAL_CALL NamespaceMap_getImplementationName()
         throw()
     {
-        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Svx.NamespaceMap" ) );
+        return ::rtl::OUString( "com.sun.star.comp.Svx.NamespaceMap" );
     }
 
 
diff --git a/svx/source/unodraw/XPropertyTable.cxx b/svx/source/unodraw/XPropertyTable.cxx
index c6b9063930b4..5258eb8fc86e 100644
--- a/svx/source/unodraw/XPropertyTable.cxx
+++ b/svx/source/unodraw/XPropertyTable.cxx
@@ -309,7 +309,7 @@ uno::Type SAL_CALL SvxUnoXColorTable::getElementType()
 // XServiceInfo
 OUString SAL_CALL SvxUnoXColorTable::getImplementationName(  ) throw( uno::RuntimeException )
 {
-    return OUString( RTL_CONSTASCII_USTRINGPARAM( "SvxUnoXColorTable" ) );
+    return OUString( "SvxUnoXColorTable" );
 }
 
 uno::Sequence<  OUString > SAL_CALL SvxUnoXColorTable::getSupportedServiceNames(  ) throw( uno::RuntimeException)
@@ -383,7 +383,7 @@ uno::Type SAL_CALL SvxUnoXLineEndTable::getElementType()
 // XServiceInfo
 OUString SAL_CALL SvxUnoXLineEndTable::getImplementationName(  ) throw( uno::RuntimeException )
 {
-    return OUString( RTL_CONSTASCII_USTRINGPARAM( "SvxUnoXLineEndTable" ) );
+    return OUString( "SvxUnoXLineEndTable" );
 }
 
 uno::Sequence<  OUString > SAL_CALL SvxUnoXLineEndTable::getSupportedServiceNames(  ) throw( uno::RuntimeException)
@@ -465,7 +465,7 @@ uno::Type SAL_CALL SvxUnoXDashTable::getElementType()
 // XServiceInfo
 OUString SAL_CALL SvxUnoXDashTable::getImplementationName(  ) throw( uno::RuntimeException )
 {
-    return OUString( RTL_CONSTASCII_USTRINGPARAM( "SvxUnoXDashTable" ) );
+    return OUString( "SvxUnoXDashTable" );
 }
 
 uno::Sequence<  OUString > SAL_CALL SvxUnoXDashTable::getSupportedServiceNames(  ) throw( uno::RuntimeException)
@@ -542,7 +542,7 @@ uno::Type SAL_CALL SvxUnoXHatchTable::getElementType()
 // XServiceInfo
 OUString SAL_CALL SvxUnoXHatchTable::getImplementationName(  ) throw( uno::RuntimeException )
 {
-    return OUString( RTL_CONSTASCII_USTRINGPARAM( "SvxUnoXHatchTable" ) );
+    return OUString( "SvxUnoXHatchTable" );
 }
 
 uno::Sequence<  OUString > SAL_CALL SvxUnoXHatchTable::getSupportedServiceNames(  ) throw( uno::RuntimeException)
@@ -631,7 +631,7 @@ uno::Type SAL_CALL SvxUnoXGradientTable::getElementType()
 // XServiceInfo
 OUString SAL_CALL SvxUnoXGradientTable::getImplementationName(  ) throw( uno::RuntimeException )
 {
-    return OUString( RTL_CONSTASCII_USTRINGPARAM( "SvxUnoXGradientTable" ) );
+    return OUString( "SvxUnoXGradientTable" );
 }
 
 uno::Sequence<  OUString > SAL_CALL SvxUnoXGradientTable::getSupportedServiceNames(  ) throw( uno::RuntimeException)
@@ -699,7 +699,7 @@ uno::Type SAL_CALL SvxUnoXBitmapTable::getElementType()
 // XServiceInfo
 OUString SAL_CALL SvxUnoXBitmapTable::getImplementationName(  ) throw( uno::RuntimeException )
 {
-    return OUString( RTL_CONSTASCII_USTRINGPARAM( "SvxUnoXBitmapTable" ) );
+    return OUString( "SvxUnoXBitmapTable" );
 }
 
 uno::Sequence<  OUString > SAL_CALL SvxUnoXBitmapTable::getSupportedServiceNames(  ) throw( uno::RuntimeException)
diff --git a/svx/source/unodraw/tableshape.cxx b/svx/source/unodraw/tableshape.cxx
index 72cc07b9ab2f..62af47f7d31a 100644
--- a/svx/source/unodraw/tableshape.cxx
+++ b/svx/source/unodraw/tableshape.cxx
@@ -39,7 +39,7 @@ using namespace ::com::sun::star::beans;
 SvxTableShape::SvxTableShape( SdrObject* pObj ) throw()
 :   SvxShape( pObj, getSvxMapProvider().GetMap(SVXMAP_TABLE), getSvxMapProvider().GetPropertySet(SVXMAP_TABLE, SdrObject::GetGlobalDrawObjectItemPool()) )
 {
-    SetShapeType( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.TableShape" ) ) );
+    SetShapeType( rtl::OUString( "com.sun.star.drawing.TableShape" ) );
 }
 
 //----------------------------------------------------------------------
diff --git a/svx/source/unodraw/unobtabl.cxx b/svx/source/unodraw/unobtabl.cxx
index bc8e7dff52ff..0697b7023959 100644
--- a/svx/source/unodraw/unobtabl.cxx
+++ b/svx/source/unodraw/unobtabl.cxx
@@ -80,14 +80,14 @@ bool SvxUnoBitmapTable::isValid( const NameOrIndex* pItem ) const
 
 OUString SAL_CALL SvxUnoBitmapTable::getImplementationName() throw( uno::RuntimeException )
 {
-    return OUString( RTL_CONSTASCII_USTRINGPARAM("SvxUnoBitmapTable") );
+    return OUString("SvxUnoBitmapTable");
 }
 
 uno::Sequence< OUString > SAL_CALL SvxUnoBitmapTable::getSupportedServiceNames(  )
     throw( uno::RuntimeException )
 {
     uno::Sequence< OUString > aSNS( 1 );
-    aSNS.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.BitmapTable" ));
+    aSNS.getArray()[0] = OUString("com.sun.star.drawing.BitmapTable" );
     return aSNS;
 }
 
diff --git a/svx/source/unodraw/unoctabl.cxx b/svx/source/unodraw/unoctabl.cxx
index 2bfc7db866c1..f80416a134fe 100644
--- a/svx/source/unodraw/unoctabl.cxx
+++ b/svx/source/unodraw/unoctabl.cxx
@@ -51,7 +51,7 @@ public:
 
     static OUString getImplementationName_Static() throw()
     {
-        return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.SvxUnoColorTable"));
+        return OUString("com.sun.star.drawing.SvxUnoColorTable");
     }
 
     static uno::Sequence< OUString >  getSupportedServiceNames_Static(void) throw();
@@ -98,7 +98,7 @@ sal_Bool SAL_CALL SvxUnoColorTable::supportsService( const  OUString& ServiceNam
 
 OUString SAL_CALL SvxUnoColorTable::getImplementationName() throw( uno::RuntimeException )
 {
-    return OUString( RTL_CONSTASCII_USTRINGPARAM("SvxUnoColorTable") );
+    return OUString("SvxUnoColorTable");
 }
 
 uno::Sequence< OUString > SAL_CALL SvxUnoColorTable::getSupportedServiceNames()
@@ -110,7 +110,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoColorTable::getSupportedServiceNames()
 uno::Sequence< OUString > SvxUnoColorTable::getSupportedServiceNames_Static(void) throw()
 {
     uno::Sequence< OUString > aSNS( 1 );
-    aSNS.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.ColorTable" ));
+    aSNS.getArray()[0] = OUString("com.sun.star.drawing.ColorTable" );
     return aSNS;
 }
 
diff --git a/svx/source/unodraw/unodtabl.cxx b/svx/source/unodraw/unodtabl.cxx
index 1db5395b8281..e6e89129f06c 100644
--- a/svx/source/unodraw/unodtabl.cxx
+++ b/svx/source/unodraw/unodtabl.cxx
@@ -61,14 +61,14 @@ SvxUnoDashTable::~SvxUnoDashTable() throw()
 
 OUString SAL_CALL SvxUnoDashTable::getImplementationName() throw( uno::RuntimeException )
 {
-    return OUString( RTL_CONSTASCII_USTRINGPARAM("SvxUnoDashTable") );
+    return OUString("SvxUnoDashTable");
 }
 
 uno::Sequence< OUString > SAL_CALL SvxUnoDashTable::getSupportedServiceNames(  )
     throw( uno::RuntimeException )
 {
     uno::Sequence< OUString > aSNS( 1 );
-    aSNS.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.DashTable" ));
+    aSNS.getArray()[0] = OUString("com.sun.star.drawing.DashTable" );
     return aSNS;
 }
 
diff --git a/svx/source/unodraw/unogtabl.cxx b/svx/source/unodraw/unogtabl.cxx
index deb2e1d2d656..5cc1f9bf225c 100644
--- a/svx/source/unodraw/unogtabl.cxx
+++ b/svx/source/unodraw/unogtabl.cxx
@@ -60,14 +60,14 @@ SvxUnoGradientTable::~SvxUnoGradientTable() throw()
 
 OUString SAL_CALL SvxUnoGradientTable::getImplementationName() throw( uno::RuntimeException )
 {
-    return OUString( RTL_CONSTASCII_USTRINGPARAM("SvxUnoGradientTable") );
+    return OUString("SvxUnoGradientTable");
 }
 
 uno::Sequence< OUString > SAL_CALL SvxUnoGradientTable::getSupportedServiceNames(  )
     throw( uno::RuntimeException )
 {
     uno::Sequence< OUString > aSNS( 1 );
-    aSNS.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.GradientTable" ));
+    aSNS.getArray()[0] = OUString("com.sun.star.drawing.GradientTable" );
     return aSNS;
 }
 
diff --git a/svx/source/unodraw/unohtabl.cxx b/svx/source/unodraw/unohtabl.cxx
index 8f3f67778999..2e4b1ba7ec73 100644
--- a/svx/source/unodraw/unohtabl.cxx
+++ b/svx/source/unodraw/unohtabl.cxx
@@ -60,14 +60,14 @@ SvxUnoHatchTable::~SvxUnoHatchTable() throw()
 
 OUString SAL_CALL SvxUnoHatchTable::getImplementationName() throw( uno::RuntimeException )
 {
-    return OUString( RTL_CONSTASCII_USTRINGPARAM("SvxUnoHatchTable") );
+    return OUString("SvxUnoHatchTable");
 }
 
 uno::Sequence< OUString > SAL_CALL SvxUnoHatchTable::getSupportedServiceNames(  )
     throw( uno::RuntimeException )
 {
     uno::Sequence< OUString > aSNS( 1 );
-    aSNS.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.HatchTable" ));
+    aSNS.getArray()[0] = OUString("com.sun.star.drawing.HatchTable" );
     return aSNS;
 }
 
diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx
index d3b12680ab85..bd51521aa30b 100644
--- a/svx/source/unodraw/unomod.cxx
+++ b/svx/source/unodraw/unomod.cxx
@@ -130,23 +130,23 @@ sal_Bool SvxUnoDrawMSFactory::createEvent( const SdrModel* pDoc, const SdrHint*
 
 // #115423#
 //      case HINT_PAGECHG:              // Page geaendert
-//          aEvent.EventName = OUString( RTL_CONSTASCII_USTRINGPARAM( "PageModified" ) );
+//          aEvent.EventName = OUString( "PageModified" );
 //          pPage = pSdrHint->GetPage();
 //          break;
         case HINT_PAGEORDERCHG:         // Reihenfolge der Seiten (Zeichenseiten oder Masterpages) geaendert (Insert/Remove/ChangePos)
-            aEvent.EventName = OUString( RTL_CONSTASCII_USTRINGPARAM( "PageOrderModified" ) );
+            aEvent.EventName = OUString( "PageOrderModified" );
             pPage = pSdrHint->GetPage();
             break;
         case HINT_OBJCHG:               // Objekt geaendert
-            aEvent.EventName = OUString( RTL_CONSTASCII_USTRINGPARAM( "ShapeModified" ) );
+            aEvent.EventName = OUString( "ShapeModified" );
             pObj = pSdrHint->GetObject();
             break;
         case HINT_OBJINSERTED:          // Neues Zeichenobjekt eingefuegt
-            aEvent.EventName = OUString( RTL_CONSTASCII_USTRINGPARAM( "ShapeInserted" ) );
+            aEvent.EventName = OUString( "ShapeInserted" );
             pObj = pSdrHint->GetObject();
             break;
         case HINT_OBJREMOVED:           // Zeichenobjekt aus Liste entfernt
-            aEvent.EventName = OUString( RTL_CONSTASCII_USTRINGPARAM( "ShapeRemoved" ) );
+            aEvent.EventName = OUString( "ShapeRemoved" );
             pObj = pSdrHint->GetObject();
             break;
 //                HINT_DEFAULTTABCHG,   // Default Tabulatorweite geaendert
@@ -509,28 +509,28 @@ uno::Sequence< OUString > SAL_CALL SvxUnoDrawingModel::getAvailableServiceNames(
 
     sal_uInt16 i = 0;
 
-    aSNS[i++] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.DashTable"));
-    aSNS[i++] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.GradientTable"));
-    aSNS[i++] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.HatchTable"));
-    aSNS[i++] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.BitmapTable"));
-    aSNS[i++] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.TransparencyGradientTable"));
-    aSNS[i++] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.MarkerTable"));
-    aSNS[i++] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.NumberingRules"));
-    aSNS[i++] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.image.ImageMapRectangleObject"));
-    aSNS[i++] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.image.ImageMapCircleObject"));
-    aSNS[i++] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.image.ImageMapPolygonObject"));
-
-    aSNS[i++] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.TitleTextShape"));
-    aSNS[i++] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.OutlinerShape"));
-    aSNS[i++] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.SubtitleShape"));
-    aSNS[i++] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.GraphicObjectShape"));
-    aSNS[i++] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.ChartShape"));
-    aSNS[i++] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.PageShape"));
-    aSNS[i++] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.OLE2Shape"));
-    aSNS[i++] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.TableShape"));
-    aSNS[i++] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.OrgChartShape"));
-    aSNS[i++] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.NotesShape"));
-    aSNS[i++] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.HandoutShape"));
+    aSNS[i++] = OUString("com.sun.star.drawing.DashTable");
+    aSNS[i++] = OUString("com.sun.star.drawing.GradientTable");
+    aSNS[i++] = OUString("com.sun.star.drawing.HatchTable");
+    aSNS[i++] = OUString("com.sun.star.drawing.BitmapTable");
+    aSNS[i++] = OUString("com.sun.star.drawing.TransparencyGradientTable");
+    aSNS[i++] = OUString("com.sun.star.drawing.MarkerTable");
+    aSNS[i++] = OUString("com.sun.star.text.NumberingRules");
+    aSNS[i++] = OUString("com.sun.star.image.ImageMapRectangleObject");
+    aSNS[i++] = OUString("com.sun.star.image.ImageMapCircleObject");
+    aSNS[i++] = OUString("com.sun.star.image.ImageMapPolygonObject");
+
+    aSNS[i++] = OUString("com.sun.star.presentation.TitleTextShape");
+    aSNS[i++] = OUString("com.sun.star.presentation.OutlinerShape");
+    aSNS[i++] = OUString("com.sun.star.presentation.SubtitleShape");
+    aSNS[i++] = OUString("com.sun.star.presentation.GraphicObjectShape");
+    aSNS[i++] = OUString("com.sun.star.presentation.ChartShape");
+    aSNS[i++] = OUString("com.sun.star.presentation.PageShape");
+    aSNS[i++] = OUString("com.sun.star.presentation.OLE2Shape");
+    aSNS[i++] = OUString("com.sun.star.presentation.TableShape");
+    aSNS[i++] = OUString("com.sun.star.presentation.OrgChartShape");
+    aSNS[i++] = OUString("com.sun.star.presentation.NotesShape");
+    aSNS[i++] = OUString("com.sun.star.presentation.HandoutShape");
 
     DBG_ASSERT( i == aSNS.getLength(), "Sequence overrun!" );
 
@@ -541,7 +541,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoDrawingModel::getAvailableServiceNames(
 OUString SAL_CALL SvxUnoDrawingModel::getImplementationName()
     throw(uno::RuntimeException)
 {
-    return OUString( RTL_CONSTASCII_USTRINGPARAM("SvxUnoDrawingModel"));
+    return OUString("SvxUnoDrawingModel");
 }
 
 sal_Bool SAL_CALL SvxUnoDrawingModel::supportsService( const OUString& ServiceName )
@@ -693,7 +693,7 @@ const char pSvxUnoDrawPagesAccessService[] = "com.sun.star.drawing.DrawPages";
 
 OUString SAL_CALL SvxUnoDrawPagesAccess::getImplementationName(  ) throw(uno::RuntimeException)
 {
-    return OUString( RTL_CONSTASCII_USTRINGPARAM( "SvxUnoDrawPagesAccess" ) );
+    return OUString( "SvxUnoDrawPagesAccess" );
 }
 
 sal_Bool SAL_CALL SvxUnoDrawPagesAccess::supportsService( const OUString& ServiceName ) throw(uno::RuntimeException)
diff --git a/svx/source/unodraw/unomtabl.cxx b/svx/source/unodraw/unomtabl.cxx
index ce70254b0303..1e3d5a16f990 100644
--- a/svx/source/unodraw/unomtabl.cxx
+++ b/svx/source/unodraw/unomtabl.cxx
@@ -143,14 +143,14 @@ sal_Bool SAL_CALL SvxUnoMarkerTable::supportsService( const  OUString& ServiceNa
 
 OUString SAL_CALL SvxUnoMarkerTable::getImplementationName() throw( uno::RuntimeException )
 {
-    return OUString( RTL_CONSTASCII_USTRINGPARAM("SvxUnoMarkerTable") );
+    return OUString("SvxUnoMarkerTable");
 }
 
 uno::Sequence< OUString > SAL_CALL SvxUnoMarkerTable::getSupportedServiceNames(  )
     throw( uno::RuntimeException )
 {
     uno::Sequence< OUString > aSNS( 1 );
-    aSNS.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.MarkerTable" ));
+    aSNS.getArray()[0] = OUString("com.sun.star.drawing.MarkerTable" );
     return aSNS;
 }
 
diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx
index 0ab54524627e..cb13fb859e77 100644
--- a/svx/source/unodraw/unopage.cxx
+++ b/svx/source/unodraw/unopage.cxx
@@ -847,7 +847,7 @@ SdrObject *SvxDrawPage::CreateSdrObject( const Reference< drawing::XShape > & xS
 //----------------------------------------------------------------------
 OUString SAL_CALL SvxDrawPage::getImplementationName() throw( uno::RuntimeException )
 {
-    return OUString( RTL_CONSTASCII_USTRINGPARAM("SvxDrawPage"));
+    return OUString("SvxDrawPage");
 }
 
 sal_Bool SAL_CALL SvxDrawPage::supportsService( const OUString& ServiceName )
@@ -859,7 +859,7 @@ sal_Bool SAL_CALL SvxDrawPage::supportsService( const OUString& ServiceName )
 uno::Sequence< OUString > SAL_CALL SvxDrawPage::getSupportedServiceNames() throw( uno::RuntimeException )
 {
     uno::Sequence< OUString > aSeq( 1 );
-    aSeq.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.ShapeCollection" ));
+    aSeq.getArray()[0] = OUString("com.sun.star.drawing.ShapeCollection" );
     return aSeq;
 }
 
diff --git a/svx/source/unodraw/unopool.cxx b/svx/source/unodraw/unopool.cxx
index bfa37ab3b7a2..48dd8b4a36ac 100644
--- a/svx/source/unodraw/unopool.cxx
+++ b/svx/source/unodraw/unopool.cxx
@@ -408,14 +408,14 @@ sal_Bool SAL_CALL SvxUnoDrawPool::supportsService( const  OUString& ServiceName
 
 OUString SAL_CALL SvxUnoDrawPool::getImplementationName() throw( uno::RuntimeException )
 {
-    return OUString( RTL_CONSTASCII_USTRINGPARAM("SvxUnoDrawPool") );
+    return OUString("SvxUnoDrawPool");
 }
 
 uno::Sequence< OUString > SAL_CALL SvxUnoDrawPool::getSupportedServiceNames(  )
     throw( uno::RuntimeException )
 {
     uno::Sequence< OUString > aSNS( 1 );
-    aSNS.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.Defaults" ));
+    aSNS.getArray()[0] = OUString("com.sun.star.drawing.Defaults" );
     return aSNS;
 }
 
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 1193242b98bf..6a945ba9a195 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -1690,8 +1690,7 @@ void SAL_CALL SvxShape::_setPropertyValue( const OUString& rPropertyName, const
         if( (pMap->nFlags & beans::PropertyAttribute::READONLY ) != 0 )
             throw beans::PropertyVetoException(
                 ( rtl::OUString(
-                    RTL_CONSTASCII_USTRINGPARAM(
-                        "Readonly property can't be set: " ) )
+                        "Readonly property can't be set: " )
                   + rPropertyName ),
                 uno::Reference< drawing::XShape >( this ) );
 
diff --git a/svx/source/unodraw/unoshcol.cxx b/svx/source/unodraw/unoshcol.cxx
index 485dd16a7294..1c8102129b55 100644
--- a/svx/source/unodraw/unoshcol.cxx
+++ b/svx/source/unodraw/unoshcol.cxx
@@ -220,7 +220,7 @@ sal_Bool SAL_CALL SvxShapeCollection::hasElements() throw( uno::RuntimeException
 
 ::rtl::OUString SvxShapeCollection::getImplementationName_Static()
 {
-    return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.SvxShapeCollection") );
+    return ::rtl::OUString("com.sun.star.drawing.SvxShapeCollection");
 }
 
 sal_Bool SAL_CALL SvxShapeCollection::supportsService( const ::rtl::OUString& ServiceName )
@@ -237,8 +237,8 @@ uno::Sequence< ::rtl::OUString > SAL_CALL SvxShapeCollection::getSupportedServic
 uno::Sequence< ::rtl::OUString > SvxShapeCollection::getSupportedServiceNames_Static()
 {
     uno::Sequence< ::rtl::OUString > aSeq(2);
-    aSeq.getArray()[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.Shapes") );
-    aSeq.getArray()[1] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.ShapeCollection") );
+    aSeq.getArray()[0] = ::rtl::OUString("com.sun.star.drawing.Shapes");
+    aSeq.getArray()[1] = ::rtl::OUString("com.sun.star.drawing.ShapeCollection");
     return aSeq;
 }
 
diff --git a/svx/source/unodraw/unottabl.cxx b/svx/source/unodraw/unottabl.cxx
index d76c6375ed8b..26c532f7e7e3 100644
--- a/svx/source/unodraw/unottabl.cxx
+++ b/svx/source/unodraw/unottabl.cxx
@@ -60,14 +60,14 @@ SvxUnoTransGradientTable::~SvxUnoTransGradientTable() throw()
 
 OUString SAL_CALL SvxUnoTransGradientTable::getImplementationName() throw( uno::RuntimeException )
 {
-    return OUString( RTL_CONSTASCII_USTRINGPARAM("SvxUnoTransGradientTable") );
+    return OUString("SvxUnoTransGradientTable");
 }
 
 uno::Sequence< OUString > SAL_CALL SvxUnoTransGradientTable::getSupportedServiceNames(  )
     throw( uno::RuntimeException )
 {
     uno::Sequence< OUString > aSNS( 1 );
-    aSNS.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.TransparencyGradientTable" ));
+    aSNS.getArray()[0] = OUString("com.sun.star.drawing.TransparencyGradientTable" );
     return aSNS;
 }