More RT_CONSTASCII_USTRINGPARAM removals

This time with sd/.../ui/unoidl

15 files changed, 161 insertions, 168 deletions

diff --git a/sd/source/ui/unoidl/DrawController.cxx b/sd/source/ui/unoidl/DrawController.cxx
index b68628f93982..6e485819e638 100644
--- a/sd/source/ui/unoidl/DrawController.cxx
+++ b/sd/source/ui/unoidl/DrawController.cxx
@@ -237,19 +237,18 @@ OUString SAL_CALL DrawController::getImplementationName(  ) throw(RuntimeExcepti
     // Do not throw an excepetion at the moment.  This leads to a crash
     // under Solaris on relead.  See issue i70929 for details.
     //    ThrowIfDisposed();
-    return OUString( RTL_CONSTASCII_USTRINGPARAM( "DrawController" ) );
+    return OUString("DrawController") ;
 }
 
 
 
-static OUString ssServiceName (RTL_CONSTASCII_USTRINGPARAM(
-    "com.sun.star.drawing.DrawingDocumentDrawView"));
+static OUString ssServiceName( "com.sun.star.drawing.DrawingDocumentDrawView");
 
 sal_Bool SAL_CALL DrawController::supportsService (
     const OUString& rsServiceName)
     throw(RuntimeException)
 {
-    // Do not throw an excepetion at the moment.  This leads to a crash
+    // Do not throw an exception at the moment.  This leads to a crash
     // under Solaris on relead.  See issue i70929 for details.
     //    ThrowIfDisposed();
     return rsServiceName.equals(ssServiceName);
@@ -525,8 +524,7 @@ void DrawController::FireSwitchCurrentPage (SdPage* pNewCurrentPage) throw()
         catch (const uno::Exception&)
         {
             OSL_FAIL(
-                (::rtl::OString("sd::SdUnoDrawView::FireSwitchCurrentPage(), "
-                    "exception caught: ") +
+                ("sd::SdUnoDrawView::FireSwitchCurrentPage(), exception caught: " +
                     ::rtl::OUStringToOString(
                         comphelper::anyToString( cppu::getCaughtException() ),
                         RTL_TEXTENCODING_UTF8 )).getStr() );
@@ -640,55 +638,54 @@ void DrawController::FillPropertyTable (
     ::std::vector<beans::Property>& rProperties)
 {
     rProperties.push_back(
-        beans::Property(
-            OUString( RTL_CONSTASCII_USTRINGPARAM("VisibleArea") ),
+        beans::Property("VisibleArea",
             PROPERTY_WORKAREA,
             ::getCppuType((const ::com::sun::star::awt::Rectangle*)0),
             beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY));
     rProperties.push_back(
         beans::Property(
-            OUString( RTL_CONSTASCII_USTRINGPARAM("SubController") ),
+            "SubController",
             PROPERTY_SUB_CONTROLLER,
             ::getCppuType((const Reference<drawing::XDrawSubController>*)0),
             beans::PropertyAttribute::BOUND));
     rProperties.push_back(
         beans::Property(
-            OUString( RTL_CONSTASCII_USTRINGPARAM("CurrentPage") ),
+            "CurrentPage",
             PROPERTY_CURRENTPAGE,
             ::getCppuType((const Reference< drawing::XDrawPage > *)0),
             beans::PropertyAttribute::BOUND ));
     rProperties.push_back(
-        beans::Property( OUString( RTL_CONSTASCII_USTRINGPARAM("IsLayerMode") ),
+        beans::Property("IsLayerMode",
             PROPERTY_LAYERMODE,
             ::getCppuBooleanType(),
             beans::PropertyAttribute::BOUND ));
     rProperties.push_back(
-        beans::Property( OUString( RTL_CONSTASCII_USTRINGPARAM("IsMasterPageMode") ),
+        beans::Property("IsMasterPageMode",
             PROPERTY_MASTERPAGEMODE,
             ::getCppuBooleanType(),
             beans::PropertyAttribute::BOUND ));
     rProperties.push_back(
-        beans::Property( OUString( RTL_CONSTASCII_USTRINGPARAM("ActiveLayer") ),
+        beans::Property("ActiveLayer",
             PROPERTY_ACTIVE_LAYER,
             ::getCppuBooleanType(),
             beans::PropertyAttribute::BOUND ));
     rProperties.push_back(
-        beans::Property( OUString( RTL_CONSTASCII_USTRINGPARAM("ZoomValue") ),
+        beans::Property("ZoomValue",
             PROPERTY_ZOOMVALUE,
             ::getCppuType((const sal_Int16*)0),
             beans::PropertyAttribute::BOUND ));
     rProperties.push_back(
-        beans::Property( OUString( RTL_CONSTASCII_USTRINGPARAM("ZoomType") ),
+        beans::Property("ZoomType",
             PROPERTY_ZOOMTYPE,
             ::getCppuType((const sal_Int16*)0),
             beans::PropertyAttribute::BOUND ));
     rProperties.push_back(
-        beans::Property( OUString( RTL_CONSTASCII_USTRINGPARAM("ViewOffset") ),
+        beans::Property("ViewOffset",
             PROPERTY_VIEWOFFSET,
             ::getCppuType((const ::com::sun::star::awt::Point*)0),
             beans::PropertyAttribute::BOUND ));
     rProperties.push_back(
-        beans::Property( OUString( RTL_CONSTASCII_USTRINGPARAM("DrawViewMode") ),
+        beans::Property("DrawViewMode",
             PROPERTY_DRAWVIEWMODE,
             ::getCppuType((const ::com::sun::star::awt::Point*)0),
             beans::PropertyAttribute::BOUND|beans::PropertyAttribute::READONLY|beans::PropertyAttribute::MAYBEVOID ));
@@ -807,7 +804,7 @@ sal_Bool DrawController::convertFastPropertyValue (
         }
         catch (const beans::UnknownPropertyException&)
         {
-            // The prperty is unknown and thus an illegal argument to this method.
+            // The property is unknown and thus an illegal argument to this method.
             throw com::sun::star::lang::IllegalArgumentException();
         }
     }
@@ -911,8 +908,7 @@ void DrawController::ThrowIfDisposed (void) const
     {
         OSL_TRACE ("Calling disposed DrawController object. Throwing exception:");
         throw lang::DisposedException (
-            OUString(RTL_CONSTASCII_USTRINGPARAM(
-                "DrawController object has already been disposed")),
+            "DrawController object has already been disposed",
             const_cast<uno::XWeak*>(static_cast<const uno::XWeak*>(this)));
     }
 }
diff --git a/sd/source/ui/unoidl/SdUnoDrawView.cxx b/sd/source/ui/unoidl/SdUnoDrawView.cxx
index 08faa86d03de..519b29af2a2f 100644
--- a/sd/source/ui/unoidl/SdUnoDrawView.cxx
+++ b/sd/source/ui/unoidl/SdUnoDrawView.cxx
@@ -620,7 +620,7 @@ Any SdUnoDrawView::getDrawViewMode() const
 // XServiceInfo
 OUString SAL_CALL SdUnoDrawView::getImplementationName(  ) throw (RuntimeException)
 {
-    return OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.sd.SdUnoDrawView") );
+    return OUString( "com.sun.star.comp.sd.SdUnoDrawView") ;
 }
 
 sal_Bool SAL_CALL SdUnoDrawView::supportsService( const OUString& ServiceName ) throw (RuntimeException)
@@ -630,7 +630,7 @@ sal_Bool SAL_CALL SdUnoDrawView::supportsService( const OUString& ServiceName )
 
 Sequence< OUString > SAL_CALL SdUnoDrawView::getSupportedServiceNames(  ) throw (RuntimeException)
 {
-    OUString aSN( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.DrawingDocumentDrawView") );
+    OUString aSN("com.sun.star.drawing.DrawingDocumentDrawView");
     uno::Sequence< OUString > aSeq( &aSN, 1 );
     return aSeq;
 }
diff --git a/sd/source/ui/unoidl/SdUnoOutlineView.cxx b/sd/source/ui/unoidl/SdUnoOutlineView.cxx
index aad7db402869..01bc4790697a 100644
--- a/sd/source/ui/unoidl/SdUnoOutlineView.cxx
+++ b/sd/source/ui/unoidl/SdUnoOutlineView.cxx
@@ -213,7 +213,7 @@ Any SAL_CALL SdUnoOutlineView::getFastPropertyValue (
 // XServiceInfo
 OUString SAL_CALL SdUnoOutlineView::getImplementationName(  ) throw (RuntimeException)
 {
-    return OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.sd.SdUnoOutlineView") );
+    return OUString("com.sun.star.comp.sd.SdUnoOutlineView");
 }
 
 sal_Bool SAL_CALL SdUnoOutlineView::supportsService( const OUString& ServiceName ) throw (RuntimeException)
@@ -223,7 +223,7 @@ sal_Bool SAL_CALL SdUnoOutlineView::supportsService( const OUString& ServiceName
 
 Sequence< OUString > SAL_CALL SdUnoOutlineView::getSupportedServiceNames(  ) throw (RuntimeException)
 {
-    OUString aSN( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.OutlineView") );
+    OUString aSN( "com.sun.star.presentation.OutlineView" );
     uno::Sequence< OUString > aSeq( &aSN, 1 );
     return aSeq;
 }
diff --git a/sd/source/ui/unoidl/SdUnoSlideView.cxx b/sd/source/ui/unoidl/SdUnoSlideView.cxx
index 3a09e020858e..99ef0b022697 100644
--- a/sd/source/ui/unoidl/SdUnoSlideView.cxx
+++ b/sd/source/ui/unoidl/SdUnoSlideView.cxx
@@ -92,8 +92,7 @@ sal_Bool SAL_CALL SdUnoSlideView::select (const Any& aSelection)
         {
             try
             {
-                Any aNumber = xSet->getPropertyValue(
-                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Number")));
+                Any aNumber = xSet->getPropertyValue("Number");
                 sal_Int32 nPageNumber = 0;
                 aNumber >>= nPageNumber;
                 nPageNumber -=1; // Transform 1-based page numbers to 0-based ones.
@@ -167,7 +166,7 @@ void SAL_CALL SdUnoSlideView::setCurrentPage (
     if (xProperties.is())
     {
         sal_uInt16 nPageNumber(0);
-        if (xProperties->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Number"))) >>= nPageNumber)
+        if (xProperties->getPropertyValue("Number") >>= nPageNumber)
         {
             mrSlideSorter.GetController().GetCurrentSlideManager()->SwitchCurrentSlide(
                 nPageNumber-1,
@@ -227,7 +226,7 @@ Any SAL_CALL SdUnoSlideView::getFastPropertyValue (
 // XServiceInfo
 OUString SAL_CALL SdUnoSlideView::getImplementationName(  ) throw (RuntimeException)
 {
-    return OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.sd.SdUnoSlideView") );
+    return OUString( "com.sun.star.comp.sd.SdUnoSlideView" );
 }
 
 sal_Bool SAL_CALL SdUnoSlideView::supportsService( const OUString& ServiceName ) throw (RuntimeException)
@@ -237,7 +236,7 @@ sal_Bool SAL_CALL SdUnoSlideView::supportsService( const OUString& ServiceName )
 
 Sequence< OUString > SAL_CALL SdUnoSlideView::getSupportedServiceNames(  ) throw (RuntimeException)
 {
-    OUString aSN( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.SlidesView") );
+    OUString aSN( "com.sun.star.presentation.SlidesView" );
     uno::Sequence< OUString > aSeq( &aSN, 1 );
     return aSeq;
 }
diff --git a/sd/source/ui/unoidl/UnoDocumentSettings.cxx b/sd/source/ui/unoidl/UnoDocumentSettings.cxx
index 80754a16de4f..fa1ba0fe61de 100644
--- a/sd/source/ui/unoidl/UnoDocumentSettings.cxx
+++ b/sd/source/ui/unoidl/UnoDocumentSettings.cxx
@@ -348,8 +348,7 @@ uno::Sequence<beans::PropertyValue>
     try {
         // create Settings/ sub storage.
         uno::Reference< embed::XStorage > xSubStorage;
-        xSubStorage = xStorage->openStorageElement(
-            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Settings" ) ),
+        xSubStorage = xStorage->openStorageElement( "Settings" ,
             embed::ElementModes::WRITE | embed::ElementModes::TRUNCATE );
         if( !xSubStorage.is() )
             return aRet;
@@ -373,7 +372,7 @@ uno::Sequence<beans::PropertyValue>
                     rtl::OUString aResult;
                     if( pList->SaveTo( xSubStorage, aName.makeStringAndClear(), &aResult ) )
                     {
-                        rtl::OUString aRealPath( RTL_CONSTASCII_USTRINGPARAM( "Settings/" ) );
+                        rtl::OUString aRealPath( "Settings/" );
                         aRealPath += aResult;
                         aRet[i].Value <<= aRealPath;
                     }
@@ -1228,7 +1227,7 @@ void SAL_CALL DocumentSettings::firePropertiesChangeEvent( const Sequence< OUStr
 OUString SAL_CALL DocumentSettings::getImplementationName(  )
     throw(RuntimeException)
 {
-    return OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Draw.DocumentSettings"));
+    return OUString( "com.sun.star.comp.Draw.DocumentSettings" );
 }
 
 sal_Bool SAL_CALL DocumentSettings::supportsService( const OUString& ServiceName )
@@ -1250,14 +1249,14 @@ Sequence< OUString > SAL_CALL DocumentSettings::getSupportedServiceNames(  )
     throw(RuntimeException)
 {
     Sequence< OUString > aSeq( 2 );
-    aSeq[0] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.Settings") );
+    aSeq[0] = "com.sun.star.document.Settings" ;
     if( mpModel->IsImpressDocument() )
     {
-        aSeq[1] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.DocumentSettings") );
+        aSeq[1] = "com.sun.star.presentation.DocumentSettings" ;
     }
     else
     {
-        aSeq[1] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.DocumentSettings") );
+        aSeq[1] = "com.sun.star.drawing.DocumentSettings" ;
     }
 
     return aSeq;
diff --git a/sd/source/ui/unoidl/randomnode.cxx b/sd/source/ui/unoidl/randomnode.cxx
index a24a9c788fd0..6bacede16c76 100644
--- a/sd/source/ui/unoidl/randomnode.cxx
+++ b/sd/source/ui/unoidl/randomnode.cxx
@@ -185,7 +185,7 @@ Reference< XInterface > SAL_CALL RandomNode_createInstance( const Reference< XMu
 
 OUString RandomNode__getImplementationName() throw( RuntimeException )
 {
-    return OUString( RTL_CONSTASCII_USTRINGPARAM( "sd::RandomAnimationNode" ) );
+    return OUString( "sd::RandomAnimationNode" ) ;
 }
 
 // --------------------------------------------------------------------
@@ -609,8 +609,7 @@ Reference< XEnumeration > SAL_CALL RandomAnimationNode::createEnumeration()
         // no presets? give empty node!
         Reference< XMultiServiceFactory > xServiceFactory( comphelper::getProcessServiceFactory() );
         Reference< XEnumerationAccess > aEmptyEnumAccess(
-            xServiceFactory->createInstance(
-                OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.animations.ParallelTimeContainer" ))),
+            xServiceFactory->createInstance( "com.sun.star.animations.ParallelTimeContainer" ),
             UNO_QUERY );
 
         if( aEmptyEnumAccess.is() )
diff --git a/sd/source/ui/unoidl/sddetect.cxx b/sd/source/ui/unoidl/sddetect.cxx
index 4e8d46861e97..4280288333ee 100644
--- a/sd/source/ui/unoidl/sddetect.cxx
+++ b/sd/source/ui/unoidl/sddetect.cxx
@@ -232,7 +232,7 @@ SdFilterDetect::~SdFilterDetect()
                         // error during storage creation means _here_ that the medium
                         // is broken, but we can not handle it in medium since unpossibility
                         // to create a storage does not _always_ means that the medium is broken
-                        aMedium.SetError( aMedium.GetLastStorageCreationState(), ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
+                        aMedium.SetError( aMedium.GetLastStorageCreationState(),  OSL_LOG_PREFIX  );
                         if ( xInteraction.is() )
                         {
                             OUString empty;
@@ -409,7 +409,7 @@ SdFilterDetect::~SdFilterDetect()
     {
         // if input stream wasn't part of the descriptor, now it should be, otherwise the content would be opend twice
         lDescriptor.realloc( nPropertyCount + 1 );
-        lDescriptor[nPropertyCount].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("InputStream"));
+        lDescriptor[nPropertyCount].Name = "InputStream";
         lDescriptor[nPropertyCount].Value <<= xStream;
         nPropertyCount++;
     }
@@ -418,7 +418,7 @@ SdFilterDetect::~SdFilterDetect()
     {
         // if input stream wasn't part of the descriptor, now it should be, otherwise the content would be opend twice
         lDescriptor.realloc( nPropertyCount + 1 );
-        lDescriptor[nPropertyCount].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UCBContent"));
+        lDescriptor[nPropertyCount].Name = "UCBContent";
         lDescriptor[nPropertyCount].Value <<= xContent;
         nPropertyCount++;
     }
@@ -428,7 +428,7 @@ SdFilterDetect::~SdFilterDetect()
         if ( nIndexOfReadOnlyFlag == -1 )
         {
             lDescriptor.realloc( nPropertyCount + 1 );
-            lDescriptor[nPropertyCount].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReadOnly"));
+            lDescriptor[nPropertyCount].Name = "ReadOnly";
             lDescriptor[nPropertyCount].Value <<= bReadOnly;
             nPropertyCount++;
         }
@@ -439,7 +439,7 @@ SdFilterDetect::~SdFilterDetect()
     if ( !bRepairPackage && bRepairAllowed )
     {
         lDescriptor.realloc( nPropertyCount + 1 );
-        lDescriptor[nPropertyCount].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RepairPackage"));
+        lDescriptor[nPropertyCount].Name = "RepairPackage";
         lDescriptor[nPropertyCount].Value <<= bRepairAllowed;
         nPropertyCount++;
 
@@ -453,7 +453,7 @@ SdFilterDetect::~SdFilterDetect()
         if ( nIndexOfTemplateFlag == -1 )
         {
             lDescriptor.realloc( nPropertyCount + 1 );
-            lDescriptor[nPropertyCount].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AsTemplate"));
+            lDescriptor[nPropertyCount].Name = "AsTemplate";
             lDescriptor[nPropertyCount].Value <<= bOpenAsTemplate;
             nPropertyCount++;
         }
@@ -467,7 +467,7 @@ SdFilterDetect::~SdFilterDetect()
         if ( nIndexOfDocumentTitle == -1 )
         {
             lDescriptor.realloc( nPropertyCount + 1 );
-            lDescriptor[nPropertyCount].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DocumentTitle"));
+            lDescriptor[nPropertyCount].Name = "DocumentTitle";
             lDescriptor[nPropertyCount].Value <<= aDocumentTitle;
             nPropertyCount++;
         }
@@ -514,14 +514,14 @@ UNOSEQUENCE< rtl::OUString > SAL_CALL SdFilterDetect::getSupportedServiceNames()
 UNOSEQUENCE< rtl::OUString > SdFilterDetect::impl_getStaticSupportedServiceNames()
 {
     UNOSEQUENCE< rtl::OUString > seqServiceNames( 1 );
-    seqServiceNames.getArray() [0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ExtendedTypeDetection"  ));
+    seqServiceNames.getArray() [0] = "com.sun.star.frame.ExtendedTypeDetection"  ;
     return seqServiceNames ;
 }
 
 /* Helper for XServiceInfo */
 rtl::OUString SdFilterDetect::impl_getStaticImplementationName()
 {
-    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.draw.FormatDetector" ));
+    return rtl::OUString( "com.sun.star.comp.draw.FormatDetector" );
 }
 
 /* Helper for registry */
diff --git a/sd/source/ui/unoidl/unocpres.cxx b/sd/source/ui/unoidl/unocpres.cxx
index b0216207f791..4280f39ac4b1 100644
--- a/sd/source/ui/unoidl/unocpres.cxx
+++ b/sd/source/ui/unoidl/unocpres.cxx
@@ -75,7 +75,7 @@ UNO3_GETIMPLEMENTATION_IMPL( SdXCustomPresentation );
 OUString SAL_CALL SdXCustomPresentation::getImplementationName()
     throw(uno::RuntimeException)
 {
-    return OUString( RTL_CONSTASCII_USTRINGPARAM("SdXCustomPresentation") );
+    return OUString( "SdXCustomPresentation" ) ;
 }
 
 sal_Bool SAL_CALL SdXCustomPresentation::supportsService( const OUString& ServiceName )
@@ -87,7 +87,7 @@ sal_Bool SAL_CALL SdXCustomPresentation::supportsService( const OUString& Servic
 uno::Sequence< OUString > SAL_CALL SdXCustomPresentation::getSupportedServiceNames()
     throw(uno::RuntimeException)
 {
-    OUString aSN( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.CustomPresentation") );
+    OUString aSN( "com.sun.star.presentation.CustomPresentation" );
     uno::Sequence< OUString > aSeq( &aSN, 1 );
     return aSeq;
 }
@@ -304,7 +304,7 @@ SdXCustomPresentationAccess::~SdXCustomPresentationAccess() throw()
 OUString SAL_CALL SdXCustomPresentationAccess::getImplementationName()
     throw(uno::RuntimeException)
 {
-    return OUString( RTL_CONSTASCII_USTRINGPARAM("SdXCustomPresentationAccess") );
+    return OUString( "SdXCustomPresentationAccess" );
 }
 
 sal_Bool SAL_CALL SdXCustomPresentationAccess::supportsService( const OUString& ServiceName )
@@ -316,7 +316,7 @@ sal_Bool SAL_CALL SdXCustomPresentationAccess::supportsService( const OUString&
 uno::Sequence< OUString > SAL_CALL SdXCustomPresentationAccess::getSupportedServiceNames()
     throw(uno::RuntimeException)
 {
-    const OUString aNS( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.CustomPresentationAccess") );
+    const OUString aNS( "com.sun.star.presentation.CustomPresentationAccess" );
     uno::Sequence< OUString > aSeq( &aNS, 1 );
     return aSeq;
 }
diff --git a/sd/source/ui/unoidl/unodoc.cxx b/sd/source/ui/unoidl/unodoc.cxx
index 12e81ae6011d..28d5f9e2ddfc 100644
--- a/sd/source/ui/unoidl/unodoc.cxx
+++ b/sd/source/ui/unoidl/unodoc.cxx
@@ -46,14 +46,14 @@ using namespace ::com::sun::star;
 
 ::rtl::OUString SAL_CALL SdDrawingDocument_getImplementationName() throw( uno::RuntimeException )
 {
-    return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Draw.DrawingDocument" ) );
+    return rtl::OUString( "com.sun.star.comp.Draw.DrawingDocument" );
 }
 
 uno::Sequence< rtl::OUString > SAL_CALL SdDrawingDocument_getSupportedServiceNames() throw( uno::RuntimeException )
 {
     uno::Sequence< rtl::OUString > aSeq( 2 );
-    aSeq[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.DrawingDocument"));
-    aSeq[1] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.DrawingDocumentFactory"));
+    aSeq[0] = "com.sun.star.drawing.DrawingDocument";
+    aSeq[1] = "com.sun.star.drawing.DrawingDocumentFactory";
 
     return aSeq;
 }
@@ -75,14 +75,14 @@ uno::Reference< uno::XInterface > SAL_CALL SdDrawingDocument_createInstance(
 
 ::rtl::OUString SAL_CALL SdPresentationDocument_getImplementationName() throw( uno::RuntimeException )
 {
-    return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Draw.PresentationDocument" ) );
+    return rtl::OUString( "com.sun.star.comp.Draw.PresentationDocument" );
 }
 
 uno::Sequence< rtl::OUString > SAL_CALL SdPresentationDocument_getSupportedServiceNames() throw( uno::RuntimeException )
 {
     uno::Sequence< rtl::OUString > aSeq( 2 );
-    aSeq[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.DrawingDocumentFactory"));
-    aSeq[1] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.PresentationDocument"));
+    aSeq[0] = "com.sun.star.drawing.DrawingDocumentFactory";
+    aSeq[1] = "com.sun.star.presentation.PresentationDocument";
 
     return aSeq;
 }
diff --git a/sd/source/ui/unoidl/unolayer.cxx b/sd/source/ui/unoidl/unolayer.cxx
index 986455440e02..125e2f4e0130 100644
--- a/sd/source/ui/unoidl/unolayer.cxx
+++ b/sd/source/ui/unoidl/unolayer.cxx
@@ -122,23 +122,23 @@ OUString SdLayer::convertToExternalName( const String& rName )
     const String aCompare( rName );
     if( rName == String( SdResId( STR_LAYER_BCKGRND ) ) )
     {
-        return OUString( RTL_CONSTASCII_USTRINGPARAM(sUNO_LayerName_background) );
+        return OUString( sUNO_LayerName_background );
     }
     else if( rName == String( SdResId( STR_LAYER_BCKGRNDOBJ ) ) )
     {
-        return OUString( RTL_CONSTASCII_USTRINGPARAM(sUNO_LayerName_background_objects) );
+        return OUString( sUNO_LayerName_background_objects );
     }
     else if( rName == String( SdResId( STR_LAYER_LAYOUT ) ) )
     {
-        return OUString( RTL_CONSTASCII_USTRINGPARAM(sUNO_LayerName_layout) );
+        return OUString( sUNO_LayerName_layout );
     }
     else if( rName == String( SdResId( STR_LAYER_CONTROLS ) ) )
     {
-        return OUString( RTL_CONSTASCII_USTRINGPARAM(sUNO_LayerName_controls) );
+        return OUString( sUNO_LayerName_controls );
     }
     else if( rName == String( SdResId( STR_LAYER_MEASURELINES ) ) )
     {
-        return OUString( RTL_CONSTASCII_USTRINGPARAM(sUNO_LayerName_measurelines) );
+        return OUString( sUNO_LayerName_measurelines );
     }
     else
     {
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 9190eb3ccc4c..f031a5b65f11 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -617,7 +617,7 @@ uno::Reference < container::XIndexAccess > SAL_CALL SdXImpressDocument::getViewD
 
         if( !rList.empty() )
         {
-            xRet = uno::Reference < container::XIndexAccess >::query(::comphelper::getProcessServiceFactory()->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.IndexedPropertyValues"))));
+            xRet = uno::Reference < container::XIndexAccess >::query(::comphelper::getProcessServiceFactory()->createInstance("com.sun.star.document.IndexedPropertyValues"));
 
 
             uno::Reference < container::XIndexContainer > xCont( xRet, uno::UNO_QUERY );
@@ -1094,51 +1094,51 @@ uno::Sequence< OUString > SAL_CALL SdXImpressDocument::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.drawing.Background"));
-    aSNS[i++] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.Settings"));
-    aSNS[i++] = OUString( RTL_CONSTASCII_USTRINGPARAM(sUNO_Service_ImageMapRectangleObject));
-    aSNS[i++] = OUString( RTL_CONSTASCII_USTRINGPARAM(sUNO_Service_ImageMapCircleObject));
-    aSNS[i++] = OUString( RTL_CONSTASCII_USTRINGPARAM(sUNO_Service_ImageMapPolygonObject));
-    aSNS[i++] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.NamespaceMap"));
+    aSNS[i++] = "com.sun.star.drawing.DashTable";
+    aSNS[i++] = "com.sun.star.drawing.GradientTable";
+    aSNS[i++] = "com.sun.star.drawing.HatchTable";
+    aSNS[i++] = "com.sun.star.drawing.BitmapTable";
+    aSNS[i++] = "com.sun.star.drawing.TransparencyGradientTable";
+    aSNS[i++] = "com.sun.star.drawing.MarkerTable";
+    aSNS[i++] = "com.sun.star.text.NumberingRules";
+    aSNS[i++] = "com.sun.star.drawing.Background";
+    aSNS[i++] = "com.sun.star.document.Settings";
+    aSNS[i++] = sUNO_Service_ImageMapRectangleObject;
+    aSNS[i++] = sUNO_Service_ImageMapCircleObject;
+    aSNS[i++] = sUNO_Service_ImageMapPolygonObject;
+    aSNS[i++] = "com.sun.star.xml.NamespaceMap";
 
     // Support creation of GraphicObjectResolver and EmbeddedObjectResolver
-    aSNS[i++] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.ExportGraphicObjectResolver"));
-    aSNS[i++] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.ImportGraphicObjectResolver"));
-    aSNS[i++] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.ExportEmbeddedObjectResolver"));
-    aSNS[i++] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.ImportEmbeddedObjectResolver"));
-    aSNS[i++] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.TableShape"));
+    aSNS[i++] = "com.sun.star.document.ExportGraphicObjectResolver";
+    aSNS[i++] = "com.sun.star.document.ImportGraphicObjectResolver";
+    aSNS[i++] = "com.sun.star.document.ExportEmbeddedObjectResolver";
+    aSNS[i++] = "com.sun.star.document.ImportEmbeddedObjectResolver";
+    aSNS[i++] = "com.sun.star.drawing.TableShape";
 
     if(mbImpressDoc)
     {
-        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( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.DocumentSettings"));
-        aSNS[i++] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.FooterShape"));
-        aSNS[i++] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.HeaderShape"));
-        aSNS[i++] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.SlideNumberShape"));
-        aSNS[i++] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.DateTimeShape"));
-        aSNS[i++] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.CalcShape"));
-        aSNS[i++] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.MediaShape"));
+        aSNS[i++] = "com.sun.star.presentation.TitleTextShape";
+        aSNS[i++] = "com.sun.star.presentation.OutlinerShape";
+        aSNS[i++] = "com.sun.star.presentation.SubtitleShape";
+        aSNS[i++] = "com.sun.star.presentation.GraphicObjectShape";
+        aSNS[i++] = "com.sun.star.presentation.ChartShape";
+        aSNS[i++] = "com.sun.star.presentation.PageShape";
+        aSNS[i++] = "com.sun.star.presentation.OLE2Shape";
+        aSNS[i++] = "com.sun.star.presentation.TableShape";
+        aSNS[i++] = "com.sun.star.presentation.OrgChartShape";
+        aSNS[i++] = "com.sun.star.presentation.NotesShape";
+        aSNS[i++] = "com.sun.star.presentation.HandoutShape";
+        aSNS[i++] = "com.sun.star.presentation.DocumentSettings";
+        aSNS[i++] = "com.sun.star.presentation.FooterShape";
+        aSNS[i++] = "com.sun.star.presentation.HeaderShape";
+        aSNS[i++] = "com.sun.star.presentation.SlideNumberShape";
+        aSNS[i++] = "com.sun.star.presentation.DateTimeShape";
+        aSNS[i++] = "com.sun.star.presentation.CalcShape";
+        aSNS[i++] = "com.sun.star.presentation.MediaShape";
     }
     else
     {
-        aSNS[i++] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.DocumentSettings"));
+        aSNS[i++] = "com.sun.star.drawing.DocumentSettings";
     }
 
     DBG_ASSERT( i == aSNS.getLength(), "Sequence overrun!" );
@@ -1150,7 +1150,7 @@ uno::Sequence< OUString > SAL_CALL SdXImpressDocument::getAvailableServiceNames(
 OUString SAL_CALL SdXImpressDocument::getImplementationName()
     throw(uno::RuntimeException)
 {
-    return OUString( RTL_CONSTASCII_USTRINGPARAM("SdXImpressDocument"));
+    return OUString( "SdXImpressDocument" );
 }
 
 sal_Bool SAL_CALL SdXImpressDocument::supportsService( const OUString& ServiceName )
@@ -1176,14 +1176,14 @@ uno::Sequence< OUString > SAL_CALL SdXImpressDocument::getSupportedServiceNames(
     uno::Sequence< OUString > aSeq( 4 );
     OUString* pServices = aSeq.getArray();
 
-    *pServices++ = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.OfficeDocument"));
-    *pServices++ = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.GenericDrawingDocument"));
-    *pServices++ = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.DrawingDocumentFactory"));
+    *pServices++ = "com.sun.star.document.OfficeDocument";
+    *pServices++ = "com.sun.star.drawing.GenericDrawingDocument";
+    *pServices++ = "com.sun.star.drawing.DrawingDocumentFactory";
 
     if( mbImpressDoc )
-        *pServices++ = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.PresentationDocument"));
+        *pServices++ = "com.sun.star.presentation.PresentationDocument";
     else
-        *pServices++ = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.DrawingDocument"));
+        *pServices++ = "com.sun.star.drawing.DrawingDocument";
 
     return aSeq;
 }
@@ -1453,7 +1453,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SdXImpressDocument::getRenderer(
         }
         aRenderer.realloc( 1 );
 
-        aRenderer[ 0 ].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "PageSize" ) );
+        aRenderer[ 0 ].Name = "PageSize" ;
         aRenderer[ 0 ].Value <<= aPageSize;
     }
     return aRenderer;
@@ -1559,9 +1559,9 @@ void ImplPDFExportComments( uno::Reference< drawing::XDrawPage > xPage, vcl::PDF
 
 void ImplPDFExportShapeInteraction( uno::Reference< drawing::XShape > xShape, SdDrawDocument& rDoc, vcl::PDFExtOutDevData& rPDFExtOutDevData )
 {
-    const rtl::OUString sGroup   ( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.GroupShape" ) );
-    const rtl::OUString sOnClick ( RTL_CONSTASCII_USTRINGPARAM( "OnClick" ) );
-    const rtl::OUString sBookmark( RTL_CONSTASCII_USTRINGPARAM( "Bookmark" ) );
+    const rtl::OUString sGroup   ( "com.sun.star.drawing.GroupShape");
+    const rtl::OUString sOnClick ( "OnClick" );
+    const rtl::OUString sBookmark( "Bookmark" );
 
     if ( xShape->getShapeType().equals( sGroup ) )
     {
@@ -1907,7 +1907,7 @@ void SAL_CALL SdXImpressDocument::render( sal_Int32 nRenderer, const uno::Any& r
 
                                         // if necessary, the master page interactions will be exported first
                                         sal_Bool bIsBackgroundObjectsVisible = sal_False;   // #i39428# IsBackgroundObjectsVisible not available for Draw
-                                        const rtl::OUString sIsBackgroundObjectsVisible( RTL_CONSTASCII_USTRINGPARAM( "IsBackgroundObjectsVisible" ) );
+                                        const rtl::OUString sIsBackgroundObjectsVisible( "IsBackgroundObjectsVisible" );
                                         if ( xPagePropSet->getPropertySetInfo( )->hasPropertyByName( sIsBackgroundObjectsVisible ) )
                                             xPagePropSet->getPropertyValue( sIsBackgroundObjectsVisible ) >>= bIsBackgroundObjectsVisible;
                                         if ( mbImpressDoc && bIsBackgroundObjectsVisible && !pPDFExtOutDevData->GetIsExportNotesPages() )
@@ -1945,8 +1945,8 @@ void SAL_CALL SdXImpressDocument::render( sal_Int32 nRenderer, const uno::Any& r
                                         // exporting transition effects to pdf
                                         if ( mbImpressDoc && !pPDFExtOutDevData->GetIsExportNotesPages() && pPDFExtOutDevData->GetIsExportTransitionEffects() )
                                         {
-                                            const rtl::OUString sEffect( RTL_CONSTASCII_USTRINGPARAM( "Effect" ) );
-                                            const rtl::OUString sSpeed ( RTL_CONSTASCII_USTRINGPARAM( "Speed" ) );
+                                            const rtl::OUString sEffect( "Effect" );
+                                            const rtl::OUString sSpeed ( "Speed" );
                                             sal_Int32 nTime = 800;
                                             presentation::AnimationSpeed aAs;
                                             if ( xPagePropSet->getPropertySetInfo( )->hasPropertyByName( sSpeed ) )
@@ -2500,7 +2500,7 @@ const char pSdDrawPagesAccessService[] = "com.sun.star.drawing.DrawPages";
 
 OUString SAL_CALL SdDrawPagesAccess::getImplementationName(  ) throw(uno::RuntimeException)
 {
-    return OUString( RTL_CONSTASCII_USTRINGPARAM( "SdDrawPagesAccess" ) );
+    return OUString( "SdDrawPagesAccess" );
 }
 
 sal_Bool SAL_CALL SdDrawPagesAccess::supportsService( const OUString& ServiceName ) throw(uno::RuntimeException)
@@ -2510,7 +2510,7 @@ sal_Bool SAL_CALL SdDrawPagesAccess::supportsService( const OUString& ServiceNam
 
 uno::Sequence< OUString > SAL_CALL SdDrawPagesAccess::getSupportedServiceNames(  ) throw(uno::RuntimeException)
 {
-    OUString aService( RTL_CONSTASCII_USTRINGPARAM( pSdDrawPagesAccessService ) );
+    OUString aService( pSdDrawPagesAccessService );
     uno::Sequence< OUString > aSeq( &aService, 1 );
     return aSeq;
 }
@@ -2769,7 +2769,7 @@ const char pSdMasterPagesAccessService[] = "com.sun.star.drawing.MasterPages";
 
 OUString SAL_CALL SdMasterPagesAccess::getImplementationName(  ) throw(uno::RuntimeException)
 {
-    return OUString( RTL_CONSTASCII_USTRINGPARAM( "SdMasterPagesAccess" ) );
+    return OUString( "SdMasterPagesAccess" );
 }
 
 sal_Bool SAL_CALL SdMasterPagesAccess::supportsService( const OUString& ServiceName ) throw(uno::RuntimeException)
@@ -2779,7 +2779,7 @@ sal_Bool SAL_CALL SdMasterPagesAccess::supportsService( const OUString& ServiceN
 
 uno::Sequence< OUString > SAL_CALL SdMasterPagesAccess::getSupportedServiceNames(  ) throw(uno::RuntimeException)
 {
-    OUString aService( RTL_CONSTASCII_USTRINGPARAM( pSdMasterPagesAccessService ) );
+    OUString aService( pSdMasterPagesAccessService );
     uno::Sequence< OUString > aSeq( &aService, 1 );
     return aSeq;
 }
@@ -2957,7 +2957,7 @@ SdPage* SdDocLinkTargets::FindPage( const OUString& rName ) const throw()
 OUString SAL_CALL SdDocLinkTargets::getImplementationName()
     throw(uno::RuntimeException)
 {
-    return OUString( RTL_CONSTASCII_USTRINGPARAM("SdDocLinkTargets") );
+    return OUString( "SdDocLinkTargets" );
 }
 
 sal_Bool SAL_CALL SdDocLinkTargets::supportsService( const OUString& ServiceName )
@@ -2969,7 +2969,7 @@ sal_Bool SAL_CALL SdDocLinkTargets::supportsService( const OUString& ServiceName
 uno::Sequence< OUString > SAL_CALL SdDocLinkTargets::getSupportedServiceNames()
     throw(uno::RuntimeException)
 {
-    const OUString aSN( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.LinkTargets") );
+    const OUString aSN( "com.sun.star.document.LinkTargets" );
     uno::Sequence< OUString > aSeq( &aSN, 1 );
     return aSeq;
 }
diff --git a/sd/source/ui/unoidl/unomodule.cxx b/sd/source/ui/unoidl/unomodule.cxx
index d572b17b5f2b..676fdd9cca8e 100644
--- a/sd/source/ui/unoidl/unomodule.cxx
+++ b/sd/source/ui/unoidl/unomodule.cxx
@@ -44,13 +44,13 @@ using namespace ::com::sun::star;
 
 ::rtl::OUString SAL_CALL SdUnoModule_getImplementationName() throw( uno::RuntimeException )
 {
-    return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Draw.DrawingModule" ) );
+    return rtl::OUString( "com.sun.star.comp.Draw.DrawingModule" );
 }
 
 uno::Sequence< rtl::OUString > SAL_CALL SdUnoModule_getSupportedServiceNames() throw( uno::RuntimeException )
 {
     uno::Sequence< rtl::OUString > aSeq( 1 );
-    aSeq[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.ModuleDispatcher"));
+    aSeq[0] = "com.sun.star.drawing.ModuleDispatcher";
     return aSeq;
 }
 
diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx
index c4f2566c8c84..a414aa39c2e5 100644
--- a/sd/source/ui/unoidl/unoobj.cxx
+++ b/sd/source/ui/unoidl/unoobj.cxx
@@ -1156,21 +1156,21 @@ uno::Reference< container::XNameReplace > SAL_CALL SdXShape::getEvents(  ) throw
 }
 
 SdUnoEventsAccess::SdUnoEventsAccess( SdXShape* pShape ) throw()
-: maStrOnClick( RTL_CONSTASCII_USTRINGPARAM("OnClick") ),
-  maStrServiceName( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.documents.Events") ),
-  maStrEventType( RTL_CONSTASCII_USTRINGPARAM("EventType") ),
-  maStrPresentation( RTL_CONSTASCII_USTRINGPARAM("Presentation") ),
-  maStrLibrary(RTL_CONSTASCII_USTRINGPARAM("Library")),
-  maStrMacroName(RTL_CONSTASCII_USTRINGPARAM("MacroName")),
-  maStrClickAction( RTL_CONSTASCII_USTRINGPARAM("ClickAction") ),
-  maStrBookmark( RTL_CONSTASCII_USTRINGPARAM("Bookmark") ),
-  maStrEffect( RTL_CONSTASCII_USTRINGPARAM("Effect") ),
-  maStrPlayFull( RTL_CONSTASCII_USTRINGPARAM("PlayFull") ),
-  maStrVerb( RTL_CONSTASCII_USTRINGPARAM("Verb") ),
-  maStrSoundURL( RTL_CONSTASCII_USTRINGPARAM("SoundURL") ),
-  maStrSpeed( RTL_CONSTASCII_USTRINGPARAM("Speed") ),
-  maStrStarBasic( RTL_CONSTASCII_USTRINGPARAM("StarBasic") ),
-  maStrScript( RTL_CONSTASCII_USTRINGPARAM("Script") ),
+: maStrOnClick( "OnClick" ),
+  maStrServiceName( "com.sun.star.documents.Events" ),
+  maStrEventType( "EventType" ),
+  maStrPresentation( "Presentation" ),
+  maStrLibrary("Library"),
+  maStrMacroName("MacroName"),
+  maStrClickAction( "ClickAction" ),
+  maStrBookmark( "Bookmark" ),
+  maStrEffect( "Effect" ),
+  maStrPlayFull( "PlayFull" ),
+  maStrVerb( "Verb" ),
+  maStrSoundURL( "SoundURL" ),
+  maStrSpeed( "Speed" ),
+  maStrStarBasic( "StarBasic" ),
+  maStrScript( "Script" ),
   mpShape( pShape ), mxShape( pShape )
 {
 }
@@ -1453,7 +1453,7 @@ void SAL_CALL SdUnoEventsAccess::replaceByName( const OUString& aName, const uno
 
                 if ( aStrLibrary == "StarOffice" )
                 {
-                    sBuffer.append( OUString( RTL_CONSTASCII_USTRINGPARAM( "BASIC" ) ) );
+                    sBuffer.append( "BASIC" );
                 }
                 else
                 {
@@ -1573,7 +1573,7 @@ uno::Any SAL_CALL SdUnoEventsAccess::getByName( const OUString& aName )
             pProperties->State = beans::PropertyState_DIRECT_VALUE;
             pProperties++;
 
-            aAny <<= OUString( RTL_CONSTASCII_USTRINGPARAM( "StarOffice" ) );
+            aAny <<= OUString( "StarOffice" );
             pProperties->Name = maStrLibrary;
             pProperties->Handle = -1;
             pProperties->Value = aAny;
@@ -1713,7 +1713,7 @@ sal_Bool SAL_CALL SdUnoEventsAccess::hasElements(  ) throw(uno::RuntimeException
 OUString SAL_CALL SdUnoEventsAccess::getImplementationName(  )
     throw(uno::RuntimeException)
 {
-    return OUString( RTL_CONSTASCII_USTRINGPARAM( "SdUnoEventsAccess" ) );
+    return OUString( "SdUnoEventsAccess" );
 }
 
 sal_Bool SAL_CALL SdUnoEventsAccess::supportsService( const OUString& ServiceName )
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index 69bbdaf65b3a..f9c06690eab1 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -1363,17 +1363,17 @@ Reference< drawing::XShape >  SdGenericDrawPage::_CreateShape( SdrObject *pObj )
                 if( GetPage()->GetPageKind() == PK_NOTES && GetPage()->IsMasterPage() )
                 {
                     // fake a empty PageShape if its a title shape on the master page
-                    pShape->SetShapeType(OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.PageShape")));
+                    pShape->SetShapeType("com.sun.star.presentation.PageShape");
                 }
                 else
                 {
-                    pShape->SetShapeType(OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.TitleTextShape")));
+                    pShape->SetShapeType("com.sun.star.presentation.TitleTextShape");
                 }
                 eKind = PRESOBJ_NONE;
                 break;
             case OBJ_OUTLINETEXT:
                 pShape = new SvxShapeText( pObj );
-                pShape->SetShapeType(OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.OutlinerShape")));
+                pShape->SetShapeType("com.sun.star.presentation.OutlinerShape");
                 eKind = PRESOBJ_NONE;
                 break;
             }
@@ -1387,60 +1387,60 @@ Reference< drawing::XShape >  SdGenericDrawPage::_CreateShape( SdrObject *pObj )
 
         if( eKind != PRESOBJ_NONE )
         {
-            String aShapeType( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation."));
+            OUString aShapeType("com.sun.star.presentation.");
 
             switch( eKind )
             {
             case PRESOBJ_TITLE:
-                aShapeType += String( RTL_CONSTASCII_USTRINGPARAM("TitleTextShape") );
+                aShapeType += "TitleTextShape";
                 break;
             case PRESOBJ_OUTLINE:
-                aShapeType += String( RTL_CONSTASCII_USTRINGPARAM("OutlinerShape") );
+                aShapeType += "OutlinerShape";
                 break;
             case PRESOBJ_TEXT:
-                aShapeType += String( RTL_CONSTASCII_USTRINGPARAM("SubtitleShape") );
+                aShapeType += "SubtitleShape";
                 break;
             case PRESOBJ_GRAPHIC:
-                aShapeType += String( RTL_CONSTASCII_USTRINGPARAM("GraphicObjectShape") );
+                aShapeType += "GraphicObjectShape";
                 break;
             case PRESOBJ_OBJECT:
-                aShapeType += String( RTL_CONSTASCII_USTRINGPARAM("OLE2Shape") );
+                aShapeType += "OLE2Shape";
                 break;
             case PRESOBJ_CHART:
-                aShapeType += String( RTL_CONSTASCII_USTRINGPARAM("ChartShape") );
+                aShapeType += "ChartShape";
                 break;
             case PRESOBJ_ORGCHART:
-                aShapeType += String( RTL_CONSTASCII_USTRINGPARAM("OrgChartShape") );
+                aShapeType += "OrgChartShape";
                 break;
             case PRESOBJ_CALC:
-                aShapeType += String( RTL_CONSTASCII_USTRINGPARAM("CalcShape") );
+                aShapeType += "CalcShape";
                 break;
             case PRESOBJ_TABLE:
-                aShapeType += String( RTL_CONSTASCII_USTRINGPARAM("TableShape") );
+                aShapeType += "TableShape";
                 break;
             case PRESOBJ_MEDIA:
-                aShapeType += String( RTL_CONSTASCII_USTRINGPARAM("MediaShape") );
+                aShapeType += "MediaShape";
                 break;
             case PRESOBJ_PAGE:
-                aShapeType += String( RTL_CONSTASCII_USTRINGPARAM("PageShape") );
+                aShapeType += "PageShape";
                 break;
             case PRESOBJ_HANDOUT:
-                aShapeType += String( RTL_CONSTASCII_USTRINGPARAM("HandoutShape") );
+                aShapeType += "HandoutShape";
                 break;
             case PRESOBJ_NOTES:
-                aShapeType += String( RTL_CONSTASCII_USTRINGPARAM("NotesShape") );
+                aShapeType += "NotesShape";
                 break;
             case PRESOBJ_FOOTER:
-                aShapeType += String( RTL_CONSTASCII_USTRINGPARAM("FooterShape") );
+                aShapeType += "FooterShape";
                 break;
             case PRESOBJ_HEADER:
-                aShapeType += String( RTL_CONSTASCII_USTRINGPARAM("HeaderShape") );
+                aShapeType += "HeaderShape";
                 break;
             case PRESOBJ_SLIDENUMBER:
-                aShapeType += String( RTL_CONSTASCII_USTRINGPARAM("SlideNumberShape") );
+                aShapeType += "SlideNumberShape";
                 break;
             case PRESOBJ_DATETIME:
-                aShapeType += String( RTL_CONSTASCII_USTRINGPARAM("DateTimeShape") );
+                aShapeType += "DateTimeShape";
                 break;
             case PRESOBJ_NONE:
             case PRESOBJ_IMAGE:
@@ -2004,7 +2004,7 @@ SdrObject* SdPageLinkTargets::FindObject( const String& rName ) const throw()
 OUString SAL_CALL SdPageLinkTargets::getImplementationName()
     throw(uno::RuntimeException)
 {
-    return OUString( RTL_CONSTASCII_USTRINGPARAM("SdPageLinkTargets") );
+    return OUString( "SdPageLinkTargets" );
 }
 
 sal_Bool SAL_CALL SdPageLinkTargets::supportsService( const OUString& ServiceName )
@@ -2016,7 +2016,7 @@ sal_Bool SAL_CALL SdPageLinkTargets::supportsService( const OUString& ServiceNam
 Sequence< OUString > SAL_CALL SdPageLinkTargets::getSupportedServiceNames()
     throw(uno::RuntimeException)
 {
-    const OUString aSN( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.LinkTargets") );
+    const OUString aSN( "com.sun.star.document.LinkTargets" );
     Sequence< OUString > aSeq( &aSN, 1);
     return aSeq;
 }
@@ -2145,7 +2145,7 @@ OUString getPageApiName( SdPage* pPage )
         if( aPageName.isEmpty() )
         {
             OUStringBuffer sBuffer;
-            sBuffer.appendAscii( RTL_CONSTASCII_STRINGPARAM( sEmptyPageName ) );
+            sBuffer.appendAscii( sEmptyPageName );
             const sal_Int32 nPageNum = ( ( pPage->GetPageNum() - 1 ) >> 1 ) + 1;
             sBuffer.append( nPageNum );
             aPageName = sBuffer.makeStringAndClear();
@@ -2227,7 +2227,7 @@ String SdDrawPage::getUiNameFromPageApiName( const OUString& rApiName )
 // XServiceInfo
 OUString SAL_CALL SdDrawPage::getImplementationName() throw(uno::RuntimeException)
 {
-    return OUString( RTL_CONSTASCII_USTRINGPARAM("SdDrawPage") );
+    return OUString( "SdDrawPage" );
 }
 
 Sequence< OUString > SAL_CALL SdDrawPage::getSupportedServiceNames() throw(uno::RuntimeException)
@@ -2786,7 +2786,7 @@ Sequence< sal_Int8 > SAL_CALL SdMasterPage::getImplementationId() throw(uno::Run
 // XServiceInfo
 OUString SAL_CALL SdMasterPage::getImplementationName() throw(uno::RuntimeException)
 {
-    return OUString( RTL_CONSTASCII_USTRINGPARAM("SdMasterPage") );
+    return OUString( "SdMasterPage" );
 }
 
 Sequence< OUString > SAL_CALL SdMasterPage::getSupportedServiceNames() throw(uno::RuntimeException)
diff --git a/sd/source/ui/unoidl/unopback.cxx b/sd/source/ui/unoidl/unopback.cxx
index edd4eaf121a9..02654d0fd4f1 100644
--- a/sd/source/ui/unoidl/unopback.cxx
+++ b/sd/source/ui/unoidl/unopback.cxx
@@ -207,8 +207,8 @@ uno::Sequence< OUString > SAL_CALL SdUnoPageBackground::getSupportedServiceNames
     uno::Sequence< OUString > aNameSequence( 2 );
     OUString* pStrings = aNameSequence.getArray();
 
-    *pStrings++ = OUString( RTL_CONSTASCII_USTRINGPARAM( sUNO_Service_PageBackground ) );
-    *pStrings   = OUString( RTL_CONSTASCII_USTRINGPARAM( sUNO_Service_FillProperties ) );
+    *pStrings++ = OUString( sUNO_Service_PageBackground );
+    *pStrings   = OUString( sUNO_Service_FillProperties );
 
     return aNameSequence;
 }