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>

6 files changed, 83 insertions, 105 deletions

diff --git a/embedserv/source/embed/docholder.cxx b/embedserv/source/embed/docholder.cxx
index acd4d57ec440..d78d01702e17 100644
--- a/embedserv/source/embed/docholder.cxx
+++ b/embedserv/source/embed/docholder.cxx
@@ -120,24 +120,21 @@ void DocumentHolder::LoadDocInFrame( sal_Bool bPluginMode )
         aAny <<= uno::Reference<uno::XInterface>(
             m_xDocument, uno::UNO_QUERY);
         aSeq[0] = beans::PropertyValue(
-            rtl::OUString(
-                RTL_CONSTASCII_USTRINGPARAM("Model")),
+            rtl::OUString("Model"),
             -1,
             aAny,
             beans::PropertyState_DIRECT_VALUE);
 
         aAny <<= sal_False;
         aSeq[1] = beans::PropertyValue(
-            rtl::OUString(
-                RTL_CONSTASCII_USTRINGPARAM("ReadOnly")),
+            rtl::OUString("ReadOnly"),
             -1,
             aAny,
             beans::PropertyState_DIRECT_VALUE);
 
         aAny <<= (sal_Bool) sal_True;
         aSeq[2] = beans::PropertyValue(
-            rtl::OUString(
-                RTL_CONSTASCII_USTRINGPARAM("NoAutoSave")),
+            rtl::OUString("NoAutoSave"),
             -1,
             aAny,
             beans::PropertyState_DIRECT_VALUE);
@@ -147,8 +144,7 @@ void DocumentHolder::LoadDocInFrame( sal_Bool bPluginMode )
             aSeq.realloc( ++nLen );
             aAny <<= (sal_Int16) 3;
             aSeq[nLen-1] = beans::PropertyValue(
-                rtl::OUString(
-                    RTL_CONSTASCII_USTRINGPARAM("PluginMode")),
+                rtl::OUString("PluginMode"),
                 -1,
                 aAny,
                 beans::PropertyState_DIRECT_VALUE);
@@ -157,24 +153,21 @@ void DocumentHolder::LoadDocInFrame( sal_Bool bPluginMode )
         aSeq.realloc( nLen+=2 );
         aAny <<= xHandler;
         aSeq[nLen-2] = beans::PropertyValue(
-            rtl::OUString(
-                RTL_CONSTASCII_USTRINGPARAM("InteractionHandler")),
+            rtl::OUString("InteractionHandler"),
             -1,
             aAny,
             beans::PropertyState_DIRECT_VALUE);
 
         aAny <<= m_nMacroExecMode;
         aSeq[nLen-1] = beans::PropertyValue(
-            rtl::OUString(
-                RTL_CONSTASCII_USTRINGPARAM("MacroExecutionMode")),
+            rtl::OUString("MacroExecutionMode"),
             -1,
             aAny,
             beans::PropertyState_DIRECT_VALUE);
 
         xComponentLoader->loadComponentFromURL(
-            rtl::OUString(
-                RTL_CONSTASCII_USTRINGPARAM("private:object")),
-            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_self")),
+            rtl::OUString("private:object"),
+            rtl::OUString("_self"),
             0,
             aSeq);
 
@@ -375,7 +368,7 @@ HRESULT DocumentHolder::InPlaceActivate(
             if( xPS.is() )
             {
                 aAny = xPS->getPropertyValue(
-                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LayoutManager")));
+                    rtl::OUString("LayoutManager"));
                 aAny >>= m_xLayoutManager;
             }
 
@@ -392,8 +385,8 @@ HRESULT DocumentHolder::InPlaceActivate(
             if(m_xLayoutManager.is()) {
                 uno::Reference< ::com::sun::star::ui::XUIElement > xUIEl(
                     m_xLayoutManager->getElement(
-                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-                            "private:resource/menubar/menubar"))));
+                        rtl::OUString(
+                            "private:resource/menubar/menubar")));
                 OSL_ENSURE(xUIEl.is(),"no menubar");
                 uno::Reference<awt::XSystemDependentMenuPeer> xSDMP(
                     xUIEl->getRealInterface(),
@@ -405,8 +398,7 @@ HRESULT DocumentHolder::InPlaceActivate(
                     m_nMenuHandle = HMENU(tmp);
                 m_xLayoutManager->hideElement(
                     rtl::OUString(
-                        RTL_CONSTASCII_USTRINGPARAM(
-                            "private:resource/menubar/menubar" )));
+                            "private:resource/menubar/menubar" ));
             }
         }
 
@@ -744,7 +736,7 @@ void DocumentHolder::SetDocument( const uno::Reference< frame::XModel >& xDoc, s
     {
         // set the document mode to embedded
         uno::Sequence< beans::PropertyValue > aSeq(1);
-        aSeq[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "SetEmbedded" ));
+        aSeq[0].Name = ::rtl::OUString( "SetEmbedded" );
         aSeq[0].Value <<= sal_True;
         m_xDocument->attachResource(::rtl::OUString(),aSeq);
     }
@@ -805,7 +797,7 @@ uno::Reference< frame::XFrame > DocumentHolder::DocumentFrame()
         // this is so only for outplace activation
         if( xFrame.is() )
             m_xFrame = xFrame->findFrame(
-                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_blank")),0);
+                rtl::OUString("_blank"),0);
 
         uno::Reference< util::XCloseBroadcaster > xBroadcaster(
             m_xFrame, uno::UNO_QUERY );
@@ -881,11 +873,11 @@ void DocumentHolder::show()
             if ( xProps.is() )
             {
                 uno::Reference< frame::XLayoutManager > xLayoutManager;
-                xProps->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" )) ) >>= xLayoutManager;
+                xProps->getPropertyValue( rtl::OUString( "LayoutManager" ) ) >>= xLayoutManager;
                 uno::Reference< beans::XPropertySet > xLMProps( xLayoutManager, uno::UNO_QUERY );
                 if ( xLMProps.is() )
                 {
-                    xLMProps->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "MenuBarCloser" )),
+                    xLMProps->setPropertyValue( ::rtl::OUString( "MenuBarCloser" ),
                                                 uno::makeAny( uno::Reference< frame::XStatusListener >() ) );
                 }
             }
@@ -981,8 +973,7 @@ void DocumentHolder::setTitle(const rtl::OUString& aDocumentName)
                 for(sal_Int32 j = 0; j < aSeq.getLength(); ++j)
                 {
                     if(aSeq[j].Name ==
-                       rtl::OUString(
-                           RTL_CONSTASCII_USTRINGPARAM("FilterName")))
+                       rtl::OUString("FilterName"))
                     {
                         aSeq[j].Value >>= aFilterName;
                         break;
@@ -994,8 +985,8 @@ void DocumentHolder::setTitle(const rtl::OUString& aDocumentName)
             {
                 uno::Reference<container::XNameAccess> xNameAccess(
                     m_xFactory->createInstance(
-                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-                            "com.sun.star.document.FilterFactory"))),
+                        rtl::OUString(
+                            "com.sun.star.document.FilterFactory")),
                     uno::UNO_QUERY);
                 try {
                     if(xNameAccess.is() &&
@@ -1003,8 +994,7 @@ void DocumentHolder::setTitle(const rtl::OUString& aDocumentName)
                     {
                         for(sal_Int32 j = 0; j < aSeq.getLength(); ++j)
                             if(aSeq[j].Name ==
-                               rtl::OUString(
-                                   RTL_CONSTASCII_USTRINGPARAM("UIName")))
+                               rtl::OUString("UIName"))
                             {
                                 aSeq[j].Value >>= m_aFilterName;
                                 break;
@@ -1031,7 +1021,7 @@ void DocumentHolder::setTitle(const rtl::OUString& aDocumentName)
             aAny <<= aTotalName;
             try {
                 xPropSet->setPropertyValue(
-                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title")),
+                    rtl::OUString("Title"),
                     aAny);
             }
             catch( const uno::Exception& ) {
diff --git a/embedserv/source/embed/ed_idataobj.cxx b/embedserv/source/embed/ed_idataobj.cxx
index c62f6eae8cbe..d76d3aa3bc65 100644
--- a/embedserv/source/embed/ed_idataobj.cxx
+++ b/embedserv/source/embed/ed_idataobj.cxx
@@ -49,13 +49,13 @@ sal_uInt64 EmbedDocument_Impl::getMetaFileHandle_Impl( sal_Bool isEnhMeta )
         {
             aFlavor.MimeType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
                                                 "application/x-openoffice-emf;windows_formatname=\"Image EMF\"" ) );
-            aFlavor.HumanPresentableName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Enhanced Windows MetaFile" ) );
+            aFlavor.HumanPresentableName = ::rtl::OUString( "Enhanced Windows MetaFile" );
         }
         else
         {
             aFlavor.MimeType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
                                                 "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" ) );
-            aFlavor.HumanPresentableName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Windows GDIMetaFile" ) );
+            aFlavor.HumanPresentableName = ::rtl::OUString( "Windows GDIMetaFile" );
         }
 
         aFlavor.DataType = getCppuType( (const sal_uInt64*) 0 );
diff --git a/embedserv/source/embed/ed_ipersiststr.cxx b/embedserv/source/embed/ed_ipersiststr.cxx
index 3ff0ab75b390..aad96c614439 100644
--- a/embedserv/source/embed/ed_ipersiststr.cxx
+++ b/embedserv/source/embed/ed_ipersiststr.cxx
@@ -206,19 +206,19 @@ uno::Sequence< beans::PropertyValue > EmbedDocument_Impl::fillArgsForLoading_Imp
     uno::Sequence< beans::PropertyValue > aArgs( 3 );
 
     sal_Int32 nInd = 0; // must not be bigger than the preset size
-    aArgs[nInd].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "FilterName" ) );
+    aArgs[nInd].Name = ::rtl::OUString( "FilterName" );
     aArgs[nInd++].Value <<= getFilterNameFromGUID_Impl( &m_guid );
 
     if ( xStream.is() )
     {
-        aArgs[nInd].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "InputStream" ) );
+        aArgs[nInd].Name = ::rtl::OUString( "InputStream" );
         aArgs[nInd++].Value <<= xStream;
-        aArgs[nInd].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "URL" ) );
-        aArgs[nInd++].Value <<= ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "private:stream" ) );
+        aArgs[nInd].Name = ::rtl::OUString( "URL" );
+        aArgs[nInd++].Value <<= ::rtl::OUString( "private:stream" );
     }
     else
     {
-        aArgs[nInd].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "URL" ) );
+        aArgs[nInd].Name = ::rtl::OUString( "URL" );
 
         rtl::OUString sDocUrl;
         if ( pFilePath )
@@ -237,7 +237,7 @@ uno::Sequence< beans::PropertyValue > EmbedDocument_Impl::fillArgsForLoading_Imp
 
     aArgs.realloc( nInd );
 
-    // aArgs[].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "ReadOnly" ) );
+    // aArgs[].Name = ::rtl::OUString( "ReadOnly" );
     // aArgs[].Value <<= sal_False; //( ( nStreamMode & ( STGM_READWRITE | STGM_WRITE ) ) ? sal_True : sal_False );
 
     return aArgs;
@@ -247,12 +247,12 @@ uno::Sequence< beans::PropertyValue > EmbedDocument_Impl::fillArgsForStoring_Imp
 {
     uno::Sequence< beans::PropertyValue > aArgs( xStream.is() ? 2 : 1 );
 
-    aArgs[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "FilterName" ) );
+    aArgs[0].Name = ::rtl::OUString( "FilterName" );
     aArgs[0].Value <<= getFilterNameFromGUID_Impl( &m_guid );
 
     if ( xStream.is() )
     {
-        aArgs[1].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "OutputStream" ) );
+        aArgs[1].Name = ::rtl::OUString( "OutputStream" );
         aArgs[1].Value <<= xStream;
     }
 
@@ -631,7 +631,7 @@ STDMETHODIMP EmbedDocument_Impl::Save( IStorage *pStgSave, BOOL fSameAsLoad )
     {
         try
         {
-            xStorable->storeToURL( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "private:stream" ) ),
+            xStorable->storeToURL( ::rtl::OUString( "private:stream" ),
                                         fillArgsForStoring_Impl( xTempOut ) );
             hr = copyXTempOutToIStream( xTempOut, pTargetStream );
             if ( SUCCEEDED( hr ) )
diff --git a/embedserv/source/embed/guid.cxx b/embedserv/source/embed/guid.cxx
index b7520cd51552..6827d650db4e 100644
--- a/embedserv/source/embed/guid.cxx
+++ b/embedserv/source/embed/guid.cxx
@@ -27,34 +27,34 @@
 ::rtl::OUString getStorageTypeFromGUID_Impl( GUID* guid )
 {
     if ( *guid == OID_WriterTextServer )
-        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "soffice.StarWriterDocument.6" ) );
+        return ::rtl::OUString( "soffice.StarWriterDocument.6" );
 
     if ( *guid == OID_WriterOASISTextServer )
-        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "LibreOffice.WriterDocument.1" ) );
+        return ::rtl::OUString( "LibreOffice.WriterDocument.1" );
 
     if ( *guid == OID_CalcServer )
-        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "soffice.StarCalcDocument.6" ) );
+        return ::rtl::OUString( "soffice.StarCalcDocument.6" );
 
     if ( *guid == OID_CalcOASISServer )
-        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "LibreOffice.CalcDocument.1" ) );
+        return ::rtl::OUString( "LibreOffice.CalcDocument.1" );
 
     if ( *guid == OID_DrawingServer )
-        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "soffice.StarDrawDocument.6" ) );
+        return ::rtl::OUString( "soffice.StarDrawDocument.6" );
 
     if ( *guid == OID_DrawingOASISServer )
-        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "LibreOffice.DrawDocument.1" ) );
+        return ::rtl::OUString( "LibreOffice.DrawDocument.1" );
 
     if ( *guid == OID_PresentationServer )
-        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "soffice.StarImpressDocument.6" ) );
+        return ::rtl::OUString( "soffice.StarImpressDocument.6" );
 
     if ( *guid == OID_PresentationOASISServer )
-        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "LibreOffice.ImpressDocument.1" ) );
+        return ::rtl::OUString( "LibreOffice.ImpressDocument.1" );
 
     if ( *guid == OID_MathServer )
-        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "soffice.StarMathDocument.6" ) );
+        return ::rtl::OUString( "soffice.StarMathDocument.6" );
 
     if ( *guid == OID_MathOASISServer )
-        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "LibreOffice.MathDocument.1" ) );
+        return ::rtl::OUString( "LibreOffice.MathDocument.1" );
 
     return ::rtl::OUString();
 }
@@ -62,34 +62,34 @@
 ::rtl::OUString getServiceNameFromGUID_Impl( GUID* guid )
 {
     if ( *guid == OID_WriterTextServer )
-        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Writer.TextDocument" ) );
+        return ::rtl::OUString( "com.sun.star.comp.Writer.TextDocument" );
 
     if ( *guid == OID_WriterOASISTextServer )
-        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Writer.TextDocument" ) );
+        return ::rtl::OUString( "com.sun.star.comp.Writer.TextDocument" );
 
     if ( *guid == OID_CalcServer )
-        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Calc.SpreadsheetDocument" ) );
+        return ::rtl::OUString( "com.sun.star.comp.Calc.SpreadsheetDocument" );
 
     if ( *guid == OID_CalcOASISServer )
-        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Calc.SpreadsheetDocument" ) );
+        return ::rtl::OUString( "com.sun.star.comp.Calc.SpreadsheetDocument" );
 
     if ( *guid == OID_DrawingServer )
-        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Draw.DrawingDocument" ) );
+        return ::rtl::OUString( "com.sun.star.comp.Draw.DrawingDocument" );
 
     if ( *guid == OID_DrawingOASISServer )
-        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Draw.DrawingDocument" ) );
+        return ::rtl::OUString( "com.sun.star.comp.Draw.DrawingDocument" );
 
     if ( *guid == OID_PresentationServer )
-        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Draw.PresentationDocument" ) );
+        return ::rtl::OUString( "com.sun.star.comp.Draw.PresentationDocument" );
 
     if ( *guid == OID_PresentationOASISServer )
-        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Draw.PresentationDocument" ) );
+        return ::rtl::OUString( "com.sun.star.comp.Draw.PresentationDocument" );
 
     if ( *guid == OID_MathServer )
-        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Math.FormulaDocument" ) );
+        return ::rtl::OUString( "com.sun.star.comp.Math.FormulaDocument" );
 
     if ( *guid == OID_MathOASISServer )
-        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Math.FormulaDocument" ) );
+        return ::rtl::OUString( "com.sun.star.comp.Math.FormulaDocument" );
 
     return ::rtl::OUString();
 }
@@ -100,31 +100,31 @@
         return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "StarOffice XML (Writer)" ) );
 
     if ( *guid == OID_WriterOASISTextServer )
-        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "writer8" ) );
+        return ::rtl::OUString( "writer8" );
 
     if ( *guid == OID_CalcServer )
         return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "StarOffice XML (Calc)" ) );
 
     if ( *guid == OID_CalcOASISServer )
-        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "calc8" ) );
+        return ::rtl::OUString( "calc8" );
 
     if ( *guid == OID_DrawingServer )
         return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "StarOffice XML (Draw)" ) );
 
     if ( *guid == OID_DrawingOASISServer )
-        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "draw8" ) );
+        return ::rtl::OUString( "draw8" );
 
     if ( *guid == OID_PresentationServer )
         return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "StarOffice XML (Impress)" ) );
 
     if ( *guid == OID_PresentationOASISServer )
-        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "impress8" ) );
+        return ::rtl::OUString( "impress8" );
 
     if ( *guid == OID_MathServer )
         return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "StarOffice XML (Math)" ) );
 
     if ( *guid == OID_MathOASISServer )
-        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "math8" ) );
+        return ::rtl::OUString( "math8" );
 
     return ::rtl::OUString();
 }
@@ -132,34 +132,34 @@
 ::rtl::OUString getTestFileURLFromGUID_Impl( GUID* guid )
 {
     if ( *guid == OID_WriterTextServer )
-        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "file:///d:/OLE_TEST/test.sxw" ) );
+        return ::rtl::OUString( "file:///d:/OLE_TEST/test.sxw" );
 
     if ( *guid == OID_WriterOASISTextServer )
-        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "file:///d:/OLE_TEST/test.odt" ) );
+        return ::rtl::OUString( "file:///d:/OLE_TEST/test.odt" );
 
     if ( *guid == OID_CalcServer )
-        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "file:///d:/OLE_TEST/test.sxc" ) );
+        return ::rtl::OUString( "file:///d:/OLE_TEST/test.sxc" );
 
     if ( *guid == OID_CalcOASISServer )
-        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "file:///d:/OLE_TEST/test.ods" ) );
+        return ::rtl::OUString( "file:///d:/OLE_TEST/test.ods" );
 
     if ( *guid == OID_DrawingServer )
-        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "file:///d:/OLE_TEST/test.sxd" ) );
+        return ::rtl::OUString( "file:///d:/OLE_TEST/test.sxd" );
 
     if ( *guid == OID_DrawingOASISServer )
-        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "file:///d:/OLE_TEST/test.odg" ) );
+        return ::rtl::OUString( "file:///d:/OLE_TEST/test.odg" );
 
     if ( *guid == OID_PresentationServer )
-        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "file:///d:/OLE_TEST/test.sxi" ) );
+        return ::rtl::OUString( "file:///d:/OLE_TEST/test.sxi" );
 
     if ( *guid == OID_PresentationOASISServer )
-        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "file:///d:/OLE_TEST/test.odp" ) );
+        return ::rtl::OUString( "file:///d:/OLE_TEST/test.odp" );
 
     if ( *guid == OID_MathServer )
-        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "file:///d:/OLE_TEST/test.sxm" ) );
+        return ::rtl::OUString( "file:///d:/OLE_TEST/test.sxm" );
 
     if ( *guid == OID_MathOASISServer )
-        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "file:///d:/OLE_TEST/test.odf" ) );
+        return ::rtl::OUString( "file:///d:/OLE_TEST/test.odf" );
 
     return ::rtl::OUString();
 }
diff --git a/embedserv/source/embed/intercept.cxx b/embedserv/source/embed/intercept.cxx
index e048eecf1446..e617ca1f3eb9 100644
--- a/embedserv/source/embed/intercept.cxx
+++ b/embedserv/source/embed/intercept.cxx
@@ -127,18 +127,12 @@ Interceptor::Interceptor(
       m_pDisposeEventListeners(0),
       m_bLink( bLink )
 {
-    m_aInterceptedURL[0] = rtl::OUString(
-        RTL_CONSTASCII_USTRINGPARAM(".uno:Save"));
-    m_aInterceptedURL[1] = rtl::OUString(
-        RTL_CONSTASCII_USTRINGPARAM(".uno:SaveAll"));
-    m_aInterceptedURL[2] = rtl::OUString(
-        RTL_CONSTASCII_USTRINGPARAM(".uno:CloseDoc"));
-    m_aInterceptedURL[3] = rtl::OUString(
-        RTL_CONSTASCII_USTRINGPARAM(".uno:CloseWin"));
-    m_aInterceptedURL[4] = rtl::OUString(
-        RTL_CONSTASCII_USTRINGPARAM(".uno:CloseFrame"));
-    m_aInterceptedURL[5] = rtl::OUString(
-        RTL_CONSTASCII_USTRINGPARAM(".uno:SaveAs"));
+    m_aInterceptedURL[0] = rtl::OUString(".uno:Save");
+    m_aInterceptedURL[1] = rtl::OUString(".uno:SaveAll");
+    m_aInterceptedURL[2] = rtl::OUString(".uno:CloseDoc");
+    m_aInterceptedURL[3] = rtl::OUString(".uno:CloseWin");
+    m_aInterceptedURL[4] = rtl::OUString(".uno:CloseFrame");
+    m_aInterceptedURL[5] = rtl::OUString(".uno:SaveAs");
 }
 
 
@@ -215,12 +209,12 @@ Interceptor::dispatch(
                 if ( nInd == aNewArgs.getLength() )
                 {
                     aNewArgs.realloc( nInd + 1 );
-                    aNewArgs[nInd].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "SaveTo" ));
+                    aNewArgs[nInd].Name = ::rtl::OUString( "SaveTo" );
                     aNewArgs[nInd].Value <<= sal_True;
                 }
 
                 uno::Reference< frame::XDispatch > xDispatch = m_xSlaveDispatchProvider->queryDispatch(
-                    URL, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "_self" )), 0 );
+                    URL, ::rtl::OUString( "_self" ), 0 );
                 if ( xDispatch.is() )
                     xDispatch->dispatch( URL, aNewArgs );
             }
@@ -266,8 +260,7 @@ void Interceptor::generateFeatureStateEvent()
             {
 
                 aStateEvent.FeatureURL.Complete = m_aInterceptedURL[0];
-                aStateEvent.FeatureDescriptor = rtl::OUString(
-                    RTL_CONSTASCII_USTRINGPARAM("Update"));
+                aStateEvent.FeatureDescriptor = rtl::OUString("Update");
                 aStateEvent.State <<= (rtl::OUString(
                     RTL_CONSTASCII_USTRINGPARAM("($1) ")) +
                                        aTitle);
@@ -276,16 +269,14 @@ void Interceptor::generateFeatureStateEvent()
             else if ( i == 5 )
             {
                 aStateEvent.FeatureURL.Complete = m_aInterceptedURL[5];
-                aStateEvent.FeatureDescriptor = rtl::OUString(
-                    RTL_CONSTASCII_USTRINGPARAM("SaveCopyTo"));
+                aStateEvent.FeatureDescriptor = rtl::OUString("SaveCopyTo");
                 aStateEvent.State <<= (rtl::OUString(
                     RTL_CONSTASCII_USTRINGPARAM("($3)")));
             }
             else
             {
                 aStateEvent.FeatureURL.Complete = m_aInterceptedURL[i];
-                aStateEvent.FeatureDescriptor = rtl::OUString(
-                    RTL_CONSTASCII_USTRINGPARAM("Close and Return"));
+                aStateEvent.FeatureDescriptor = rtl::OUString("Close and Return");
                 aStateEvent.State <<= (rtl::OUString(
                     RTL_CONSTASCII_USTRINGPARAM("($2) ")) +
                                        aTitle);
@@ -334,8 +325,7 @@ Interceptor::addStatusListener(
 
         frame::FeatureStateEvent aStateEvent;
         aStateEvent.FeatureURL.Complete = m_aInterceptedURL[0];
-        aStateEvent.FeatureDescriptor = rtl::OUString(
-            RTL_CONSTASCII_USTRINGPARAM("Update"));
+        aStateEvent.FeatureDescriptor = rtl::OUString("Update");
         aStateEvent.IsEnabled = sal_True;
         aStateEvent.Requery = sal_False;
         aStateEvent.State <<= (rtl::OUString(
@@ -375,8 +365,7 @@ Interceptor::addStatusListener(
 
         frame::FeatureStateEvent aStateEvent;
         aStateEvent.FeatureURL.Complete = m_aInterceptedURL[i];
-        aStateEvent.FeatureDescriptor = rtl::OUString(
-            RTL_CONSTASCII_USTRINGPARAM("Close and Return"));
+        aStateEvent.FeatureDescriptor = rtl::OUString("Close and Return");
         aStateEvent.IsEnabled = sal_True;
         aStateEvent.Requery = sal_False;
         aStateEvent.State <<= (rtl::OUString(
@@ -400,8 +389,7 @@ Interceptor::addStatusListener(
     {   // SaveAs
         frame::FeatureStateEvent aStateEvent;
         aStateEvent.FeatureURL.Complete = m_aInterceptedURL[5];
-        aStateEvent.FeatureDescriptor = rtl::OUString(
-            RTL_CONSTASCII_USTRINGPARAM("SaveCopyTo"));
+        aStateEvent.FeatureDescriptor = rtl::OUString("SaveCopyTo");
         aStateEvent.IsEnabled = sal_True;
         aStateEvent.Requery = sal_False;
         aStateEvent.State <<= (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("($3)")));
diff --git a/embedserv/source/embed/register.cxx b/embedserv/source/embed/register.cxx
index 1ce0a67b5350..1a58ad5f8b94 100644
--- a/embedserv/source/embed/register.cxx
+++ b/embedserv/source/embed/register.cxx
@@ -45,14 +45,14 @@ throw (uno::Exception)
 
 ::rtl::OUString SAL_CALL EmbedServer_getImplementationName() throw()
 {
-    return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.ole.EmbedServer") );
+    return ::rtl::OUString("com.sun.star.comp.ole.EmbedServer");
 
 }
 
 uno::Sequence< ::rtl::OUString > SAL_CALL EmbedServer_getSupportedServiceNames() throw()
 {
     uno::Sequence< ::rtl::OUString > aServiceNames( 1 );
-    aServiceNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.OleEmbeddedServerRegistration" ) );
+    aServiceNames[0] = ::rtl::OUString( "com.sun.star.document.OleEmbeddedServerRegistration" );
     return aServiceNames;
 }