remove most use of RTL_CONSTASCII_USTRINGPARAM macro

This is largely unnecessary when working with OUString Change-Id: I3cf4d68357a43665d01162ef4a2d5346a45da9be
author: Noel Grandin <noel@peralex.com> 2013-11-14 13:13:19 +0200
committer: Noel Grandin <noel@peralex.com> 2013-11-19 10:29:30 +0200
commit: 2c35fff7eca3a143d28dc75e6a73fe1101d2af77 (patch)
tree: fb31b64880b06b0e2bd867aa6216ae0259c7c091
parent: ccc297097891e62489e5d281a4ea128ec6b71361 (diff)
97 files changed, 267 insertions, 312 deletions
diff --git a/animations/source/animcore/targetpropertiescreator.cxx b/animations/source/animcore/targetpropertiescreator.cxx
index c583e137d6bb..6141f676b2bc 100644
--- a/animations/source/animcore/targetpropertiescreator.cxx
+++ b/animations/source/animcore/targetpropertiescreator.cxx
@@ -379,7 +379,7 @@ namespace animcore
                                             1,
                                             beans::NamedValue(
                                                 //xAnimateNode->getAttributeName(),
-                        ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("visibility")),
+                                                OUString("visibility"),
                                                 uno::makeAny( !bVisible ) ) ) ) );
                             //}
                         //}
diff --git a/configmgr/qa/unit/test.cxx b/configmgr/qa/unit/test.cxx
index bc8f09c5f98f..2835437302e5 100644
--- a/configmgr/qa/unit/test.cxx
+++ b/configmgr/qa/unit/test.cxx
@@ -257,10 +257,8 @@ void RecursiveTest::test()
 {
     properties_ = css::uno::Reference< css::beans::XPropertySet >(
         test_.createUpdateAccess(
-            OUString(
-                RTL_CONSTASCII_USTRINGPARAM(
-                    "/org.openoffice.UI.GenericCommands/UserInterface/Commands/"
-                    "dotuno:WebHtml"))),
+            OUString("/org.openoffice.UI.GenericCommands/UserInterface/Commands/"
+                     "dotuno:WebHtml")),
         css::uno::UNO_QUERY_THROW);
     properties_->addPropertyChangeListener(
         OUString("Label"), this);
@@ -308,10 +306,8 @@ SimpleRecursiveTest::SimpleRecursiveTest(
 void SimpleRecursiveTest::step() const
 {
     test_.setKey(
-        OUString(
-            RTL_CONSTASCII_USTRINGPARAM(
-                "/org.openoffice.UI.GenericCommands/UserInterface/Commands/"
-                "dotuno:WebHtml")),
+        OUString("/org.openoffice.UI.GenericCommands/UserInterface/Commands/"
+                 "dotuno:WebHtml"),
         OUString("Label"),
         css::uno::makeAny(OUString("step")));
 }
@@ -335,16 +331,12 @@ void CrossThreadTest::step() const
     stop.set();
     WriterThread(
         stop, test_,
-        OUString(
-            RTL_CONSTASCII_USTRINGPARAM(
-                "/org.openoffice.UI.GenericCommands/UserInterface/Commands/"
-                "dotuno:WebHtml")),
+        OUString("/org.openoffice.UI.GenericCommands/UserInterface/Commands/"
+                 "dotuno:WebHtml"),
         OUString("Label")).join();
     test_.resetKey(
-        OUString(
-            RTL_CONSTASCII_USTRINGPARAM(
-                "/org.openoffice.UI.GenericCommands/UserInterface/Commands/"
-                "dotuno:WebHtml")),
+        OUString("/org.openoffice.UI.GenericCommands/UserInterface/Commands/"
+                 "dotuno:WebHtml"),
         OUString("Label"));
 }
 
@@ -409,20 +401,16 @@ void Test::testSetSetMemberName()
     OUString s;
     CPPUNIT_ASSERT(
         getKey(
-            OUString(
-                RTL_CONSTASCII_USTRINGPARAM(
-                    "/org.openoffice.UI.GenericCommands/UserInterface/Commands/"
-                    ".uno:FontworkShapeType")),
+            OUString("/org.openoffice.UI.GenericCommands/UserInterface/Commands/"
+                     ".uno:FontworkShapeType"),
             OUString("Label")) >>=
         s);
     CPPUNIT_ASSERT( s == "Fontwork Shape" );
 
     css::uno::Reference< css::container::XNameAccess > access(
         createUpdateAccess(
-            OUString(
-                RTL_CONSTASCII_USTRINGPARAM(
-                    "/org.openoffice.UI.GenericCommands/UserInterface/"
-                    "Commands"))),
+            OUString("/org.openoffice.UI.GenericCommands/UserInterface/"
+                     "Commands")),
         css::uno::UNO_QUERY_THROW);
     css::uno::Reference< css::container::XNamed > member;
     access->getByName(
@@ -438,10 +426,8 @@ void Test::testSetSetMemberName()
 
     CPPUNIT_ASSERT(
         getKey(
-            OUString(
-                RTL_CONSTASCII_USTRINGPARAM(
-                    "/org.openoffice.UI.GenericCommands/UserInterface/Commands/"
-                    ".uno:FontworkShapeType")),
+            OUString("/org.openoffice.UI.GenericCommands/UserInterface/Commands/"
+                    ".uno:FontworkShapeType"),
             OUString("Label")) >>=
         s);
     CPPUNIT_ASSERT( s == "Fontwork Gallery" );
@@ -451,10 +437,8 @@ void Test::testReadCommands()
 {
     css::uno::Reference< css::container::XNameAccess > access(
         createViewAccess(
-            OUString(
-                RTL_CONSTASCII_USTRINGPARAM(
-                    "/org.openoffice.UI.GenericCommands/UserInterface/"
-                    "Commands"))),
+            OUString("/org.openoffice.UI.GenericCommands/UserInterface/"
+                     "Commands")),
         css::uno::UNO_QUERY_THROW);
     css::uno::Sequence< OUString > names(access->getElementNames());
     CPPUNIT_ASSERT(names.getLength() == 695);
diff --git a/connectivity/source/drivers/ado/ADatabaseMetaData.cxx b/connectivity/source/drivers/ado/ADatabaseMetaData.cxx
index cda9dc531b26..cfbe22524fcd 100644
--- a/connectivity/source/drivers/ado/ADatabaseMetaData.cxx
+++ b/connectivity/source/drivers/ado/ADatabaseMetaData.cxx
@@ -910,7 +910,7 @@ OUString SAL_CALL ODatabaseMetaData::getSQLKeywords(  ) throw(SQLException, Runt
 
         aRecordset.MoveFirst();
         OLEVariant  aValue;
-        OUString aRet, aComma(RTL_CONSTASCII_USTRINGPARAM(","));
+        OUString aRet, aComma(",");
         while(!aRecordset.IsAtEOF())
         {
             WpOLEAppendCollection<ADOFields, ADOField, WpADOField>  aFields(aRecordset.GetFields());
diff --git a/connectivity/source/drivers/mozab/MDatabaseMetaData.cxx b/connectivity/source/drivers/mozab/MDatabaseMetaData.cxx
index d7b6f4fdcb1b..34c640b6d5e4 100644
--- a/connectivity/source/drivers/mozab/MDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/mozab/MDatabaseMetaData.cxx
@@ -295,7 +295,7 @@ OUString SAL_CALL ODatabaseMetaData::getCatalogTerm(  ) throw(SQLException, Runt
 OUString ODatabaseMetaData::impl_getIdentifierQuoteString_throw(  )
 {
     // normally this is "
-    return OUString( RTL_CONSTASCII_USTRINGPARAM("\""));
+    return OUString("\"");
 }
 // -------------------------------------------------------------------------
 OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters(  ) throw(SQLException, RuntimeException)
diff --git a/connectivity/source/drivers/mozab/MStatement.cxx b/connectivity/source/drivers/mozab/MStatement.cxx
index 423a14b46b9d..edb7998b73b9 100644
--- a/connectivity/source/drivers/mozab/MStatement.cxx
+++ b/connectivity/source/drivers/mozab/MStatement.cxx
@@ -242,7 +242,7 @@ OCommonStatement::StatementType OCommonStatement::parseSql( const OUString& sql
     else if(!bAdjusted) //Our sql parser does not support a statement like "create table foo"
                         // So we append ("E-mail" varchar) to the last of it to make it work
     {
-        return parseSql(sql + OUString( RTL_CONSTASCII_USTRINGPARAM("(""E-mail"" caracter)")),sal_True);
+        return parseSql(sql + "(""E-mail"" caracter)",sal_True);
     }
 
     getOwnConnection()->throwSQLException( STR_QUERY_TOO_COMPLEX, *this );
diff --git a/connectivity/source/drivers/mysql/YDriver.cxx b/connectivity/source/drivers/mysql/YDriver.cxx
index d7cd83bfc91f..50d0e3a21d5b 100644
--- a/connectivity/source/drivers/mysql/YDriver.cxx
+++ b/connectivity/source/drivers/mysql/YDriver.cxx
@@ -367,17 +367,15 @@ namespace connectivity
         else if ( eType == D_NATIVE )
         {
             aDriverInfo.push_back(DriverPropertyInfo(
-                    OUString(RTL_CONSTASCII_USTRINGPARAM("LocalSocket"))
-                    ,OUString(RTL_CONSTASCII_USTRINGPARAM(
-                        "The file path of a socket to connect to a local MySQL server."))
+                    OUString("LocalSocket")
+                    ,OUString("The file path of a socket to connect to a local MySQL server.")
                     ,sal_False
                     ,OUString()
                     ,Sequence< OUString >())
                     );
             aDriverInfo.push_back(DriverPropertyInfo(
-                    OUString(RTL_CONSTASCII_USTRINGPARAM("NamedPipe"))
-                    ,OUString(RTL_CONSTASCII_USTRINGPARAM(
-                        "The name of a pipe to connect to a local MySQL server."))
+                    OUString("NamedPipe")
+                    ,OUString("The name of a pipe to connect to a local MySQL server.")
                     ,sal_False
                     ,OUString()
                     ,Sequence< OUString >())
diff --git a/cppuhelper/test/bootstrap/bootstrap.test.cxx b/cppuhelper/test/bootstrap/bootstrap.test.cxx
index d49f9534d12d..27ae9ed2813e 100644
--- a/cppuhelper/test/bootstrap/bootstrap.test.cxx
+++ b/cppuhelper/test/bootstrap/bootstrap.test.cxx
@@ -145,7 +145,7 @@ static void s_test__loadSharedLibComponentFactory__purpose_purpose()
 
 static rtl::OUString s_getSDrive(void)
 {
-    rtl::OUString path;//(RTL_CONSTASCII_USTRINGPARAM("file://"));
+    rtl::OUString path;//("file://");
 
     // FIXME no more S drive
 
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 0eb71db1d44e..ee3b4d5048f7 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1738,7 +1738,7 @@ int Desktop::Main()
         catch( ...)
         {
             OfficeIPCThread::SetDowning();
-            FatalError( OUString(RTL_CONSTASCII_USTRINGPARAM( "Caught Unknown Exception: Aborting!")));
+            FatalError( OUString( "Caught Unknown Exception: Aborting!"));
         }
     }
     else
diff --git a/dtrans/source/win32/clipb/wcbentry.cxx b/dtrans/source/win32/clipb/wcbentry.cxx
index 6135f84e1dfe..e13a109a220b 100644
--- a/dtrans/source/win32/clipb/wcbentry.cxx
+++ b/dtrans/source/win32/clipb/wcbentry.cxx
@@ -77,9 +77,9 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL sysdtrans_component_getFactory( const sal_Ch
     if ( pSrvManager && ( 0 == rtl_str_compare( pImplName, WINCLIPBOARD_IMPL_NAME ) ) )
     {
         Sequence< OUString > aSNS( 1 );
-        aSNS.getArray( )[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( WINCLIPBOARD_SERVICE_NAME ) );
+        aSNS.getArray( )[0] = OUString( WINCLIPBOARD_SERVICE_NAME );
 
-        //OUString( RTL_CONSTASCII_USTRINGPARAM( FPS_IMPL_NAME ) )
+        //OUString( FPS_IMPL_NAME )
         Reference< XSingleServiceFactory > xFactory ( createOneInstanceFactory(
             reinterpret_cast< XMultiServiceFactory* > ( pSrvManager ),
             OUString::createFromAscii( pImplName ),
diff --git a/dtrans/source/win32/dnd/dndentry.cxx b/dtrans/source/win32/dnd/dndentry.cxx
index 940b9bc213c2..8aadbed956c6 100644
--- a/dtrans/source/win32/dnd/dndentry.cxx
+++ b/dtrans/source/win32/dnd/dndentry.cxx
@@ -55,7 +55,7 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL dnd_component_getFactory( const sal_Char* pI
     if ( pSrvManager && ( 0 == rtl_str_compare( pImplName, DNDSOURCE_IMPL_NAME ) ) )
     {
         Sequence< OUString > aSNS( 1 );
-        aSNS.getArray( )[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( DNDSOURCE_SERVICE_NAME ) );
+        aSNS.getArray( )[0] = OUString( DNDSOURCE_SERVICE_NAME );
 
         xFactory= createSingleFactory(
             reinterpret_cast< XMultiServiceFactory* > ( pSrvManager ),
@@ -67,7 +67,7 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL dnd_component_getFactory( const sal_Char* pI
     else if( pSrvManager && ( 0 == rtl_str_compare( pImplName, DNDTARGET_IMPL_NAME ) ) )
     {
         Sequence< OUString > aSNS( 1 );
-        aSNS.getArray( )[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( DNDTARGET_SERVICE_NAME ) );
+        aSNS.getArray( )[0] = OUString( DNDTARGET_SERVICE_NAME );
 
         xFactory= createSingleFactory(
             reinterpret_cast< XMultiServiceFactory* > ( pSrvManager ),
diff --git a/dtrans/source/win32/dnd/source.cxx b/dtrans/source/win32/dnd/source.cxx
index f4ce6b4aa50b..1335da549ea0 100644
--- a/dtrans/source/win32/dnd/source.cxx
+++ b/dtrans/source/win32/dnd/source.cxx
@@ -312,7 +312,7 @@ dwEffect
 // XServiceInfo
 OUString SAL_CALL DragSource::getImplementationName(  ) throw (RuntimeException)
 {
-    return OUString(RTL_CONSTASCII_USTRINGPARAM(DNDSOURCE_IMPL_NAME));
+    return OUString(DNDSOURCE_IMPL_NAME);
 }
 // XServiceInfo
 sal_Bool SAL_CALL DragSource::supportsService( const OUString& ServiceName ) throw (RuntimeException)
@@ -324,7 +324,7 @@ sal_Bool SAL_CALL DragSource::supportsService( const OUString& ServiceName ) thr
 
 Sequence< OUString > SAL_CALL DragSource::getSupportedServiceNames(  ) throw (RuntimeException)
 {
-    OUString names[1]= {OUString(RTL_CONSTASCII_USTRINGPARAM(DNDSOURCE_SERVICE_NAME))};
+    OUString names[1]= {OUString(DNDSOURCE_SERVICE_NAME)};
 
     return Sequence<OUString>(names, 1);
 }
diff --git a/dtrans/source/win32/dnd/target.cxx b/dtrans/source/win32/dnd/target.cxx
index e127b3d5e7fd..14b79b809e39 100644
--- a/dtrans/source/win32/dnd/target.cxx
+++ b/dtrans/source/win32/dnd/target.cxx
@@ -244,7 +244,7 @@ DWORD WINAPI DndTargetOleSTAFunc(LPVOID pParams)
 // XServiceInfo
 OUString SAL_CALL DropTarget::getImplementationName(  ) throw (RuntimeException)
 {
-    return OUString(RTL_CONSTASCII_USTRINGPARAM(DNDTARGET_IMPL_NAME));
+    return OUString(DNDTARGET_IMPL_NAME);
 }
 // XServiceInfo
 sal_Bool SAL_CALL DropTarget::supportsService( const OUString& ServiceName ) throw (RuntimeException)
@@ -256,7 +256,7 @@ sal_Bool SAL_CALL DropTarget::supportsService( const OUString& ServiceName ) thr
 
 Sequence< OUString > SAL_CALL DropTarget::getSupportedServiceNames(  ) throw (RuntimeException)
 {
-    OUString names[1]= {OUString(RTL_CONSTASCII_USTRINGPARAM(DNDTARGET_SERVICE_NAME))};
+    OUString names[1]= {OUString(DNDTARGET_SERVICE_NAME)};
     return Sequence<OUString>(names, 1);
 }
 
diff --git a/dtrans/source/win32/ftransl/ftranslentry.cxx b/dtrans/source/win32/ftransl/ftranslentry.cxx
index 2b04e1877c29..efa971528cff 100644
--- a/dtrans/source/win32/ftransl/ftranslentry.cxx
+++ b/dtrans/source/win32/ftransl/ftranslentry.cxx
@@ -79,7 +79,7 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL ftransl_component_getFactory( const sal_Char
     if ( pSrvManager && ( 0 == rtl_str_compare( pImplName, IMPL_NAME ) ) )
     {
         Sequence< OUString > aSNS( 1 );
-        aSNS.getArray( )[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICE_NAME ) );
+        aSNS.getArray( )[0] = OUString( SERVICE_NAME );
 
         Reference< XSingleServiceFactory > xFactory ( createOneInstanceFactory(
             reinterpret_cast< XMultiServiceFactory* > ( pSrvManager ),
diff --git a/editeng/source/uno/unonrule.cxx b/editeng/source/uno/unonrule.cxx
index d3a45cbb1dbb..578539e38aea 100644
--- a/editeng/source/uno/unonrule.cxx
+++ b/editeng/source/uno/unonrule.cxx
@@ -168,7 +168,7 @@ sal_Bool SAL_CALL SvxUnoNumberingRules::supportsService( const OUString& Service
 
 Sequence< OUString > SAL_CALL SvxUnoNumberingRules::getSupportedServiceNames(  ) throw(RuntimeException)
 {
-    OUString aService( RTL_CONSTASCII_USTRINGPARAM( pSvxUnoNumberingRulesService ) );
+    OUString aService( pSvxUnoNumberingRulesService );
     Sequence< OUString > aSeq( &aService, 1 );
     return aSeq;
 }
diff --git a/embeddedobj/source/msole/olecomponent.cxx b/embeddedobj/source/msole/olecomponent.cxx
index e4a11c9d8847..1bbec2121ca2 100644
--- a/embeddedobj/source/msole/olecomponent.cxx
+++ b/embeddedobj/source/msole/olecomponent.cxx
@@ -189,17 +189,17 @@ struct OleComponentNative_Impl {
         m_aSupportedGraphFormats.realloc( 5 );
 
         m_aSupportedGraphFormats[0] = datatransfer::DataFlavor(
-            OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-emf;windows_formatname=\"Image EMF\"" )),
+            OUString( "application/x-openoffice-emf;windows_formatname=\"Image EMF\"" ),
             OUString( "Windows Enhanced Metafile" ),
             getCppuType( (const uno::Sequence< sal_Int8 >*) 0 ) );
 
         m_aSupportedGraphFormats[1] = datatransfer::DataFlavor(
-            OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" )),
+            OUString( "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" ),
             OUString( "Windows Metafile" ),
             getCppuType( (const uno::Sequence< sal_Int8 >*) 0 ) );
 
         m_aSupportedGraphFormats[2] = datatransfer::DataFlavor(
-            OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"" )),
+            OUString( "application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"" ),
             OUString( "Bitmap" ),
             getCppuType( (const uno::Sequence< sal_Int8 >*) 0 ) );
 
@@ -209,7 +209,7 @@ struct OleComponentNative_Impl {
             getCppuType( (const uno::Sequence< sal_Int8 >*) 0 ) );
 
         m_aSupportedGraphFormats[0] = datatransfer::DataFlavor(
-            OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"" )),
+            OUString( "application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"" ),
             OUString( "GDIMetafile" ),
             getCppuType( (const uno::Sequence< sal_Int8 >*) 0 ) );
     }
diff --git a/embeddedobj/source/msole/olevisual.cxx b/embeddedobj/source/msole/olevisual.cxx
index bd3747c3bd66..f05ebe41747a 100644
--- a/embeddedobj/source/msole/olevisual.cxx
+++ b/embeddedobj/source/msole/olevisual.cxx
@@ -359,7 +359,7 @@ embed::VisualRepresentation SAL_CALL OleEmbeddedObject::getPreferredVisualRepres
                 changeState( embed::EmbedStates::RUNNING );
 
             datatransfer::DataFlavor aDataFlavor(
-                    OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" )),
+                    OUString( "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" ),
                     OUString( "Windows Metafile" ),
                     ::getCppuType( (const uno::Sequence< sal_Int8 >*) NULL ) );
 
diff --git a/embeddedobj/source/msole/xdialogcreator.cxx b/embeddedobj/source/msole/xdialogcreator.cxx
index d2c9cfb7e8fe..c191075076db 100644
--- a/embeddedobj/source/msole/xdialogcreator.cxx
+++ b/embeddedobj/source/msole/xdialogcreator.cxx
@@ -253,7 +253,7 @@ embed::InsertedObjectInfo SAL_CALL MSOLEDialogObjectCreator::createInstanceByDia
                 if ( nBufSize && nBufSize == GetMetaFileBitsEx( pMF->hMF, nBufSize, pBuf+22 ) )
                 {
                     datatransfer::DataFlavor aFlavor(
-                        OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" )),
+                        OUString( "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" ),
                         OUString( "Image WMF" ),
                         getCppuType( ( const uno::Sequence< sal_Int8 >* ) 0 ) );
 
diff --git a/embedserv/source/embed/ed_idataobj.cxx b/embedserv/source/embed/ed_idataobj.cxx
index 464dd5b519c7..254f7953f8a5 100644
--- a/embedserv/source/embed/ed_idataobj.cxx
+++ b/embedserv/source/embed/ed_idataobj.cxx
@@ -47,15 +47,13 @@ sal_uInt64 EmbedDocument_Impl::getMetaFileHandle_Impl( sal_Bool isEnhMeta )
 
         if ( isEnhMeta )
         {
-            aFlavor.MimeType = OUString( RTL_CONSTASCII_USTRINGPARAM(
-                                                "application/x-openoffice-emf;windows_formatname=\"Image EMF\"" ) );
-            aFlavor.HumanPresentableName = OUString( "Enhanced Windows MetaFile" );
+            aFlavor.MimeType = "application/x-openoffice-emf;windows_formatname=\"Image EMF\"";
+            aFlavor.HumanPresentableName = "Enhanced Windows MetaFile";
         }
         else
         {
-            aFlavor.MimeType = OUString( RTL_CONSTASCII_USTRINGPARAM(
-                                                "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" ) );
-            aFlavor.HumanPresentableName = OUString( "Windows GDIMetaFile" );
+            aFlavor.MimeType = "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"";
+            aFlavor.HumanPresentableName = "Windows GDIMetaFile";
         }
 
         aFlavor.DataType = getCppuType( (const sal_uInt64*) 0 );
diff --git a/embedserv/source/embed/guid.cxx b/embedserv/source/embed/guid.cxx
index f757bf914785..b76d851bb1e9 100644
--- a/embedserv/source/embed/guid.cxx
+++ b/embedserv/source/embed/guid.cxx
@@ -97,31 +97,31 @@ OUString getServiceNameFromGUID_Impl( GUID* guid )
 OUString getFilterNameFromGUID_Impl( GUID* guid )
 {
     if ( *guid == OID_WriterTextServer )
-        return OUString( RTL_CONSTASCII_USTRINGPARAM ( "StarOffice XML (Writer)" ) );
+        return OUString( "StarOffice XML (Writer)" );
 
     if ( *guid == OID_WriterOASISTextServer )
         return OUString( "writer8" );
 
     if ( *guid == OID_CalcServer )
-        return OUString( RTL_CONSTASCII_USTRINGPARAM ( "StarOffice XML (Calc)" ) );
+        return OUString( "StarOffice XML (Calc)" );
 
     if ( *guid == OID_CalcOASISServer )
         return OUString( "calc8" );
 
     if ( *guid == OID_DrawingServer )
-        return OUString( RTL_CONSTASCII_USTRINGPARAM ( "StarOffice XML (Draw)" ) );
+        return OUString( "StarOffice XML (Draw)" );
 
     if ( *guid == OID_DrawingOASISServer )
         return OUString( "draw8" );
 
     if ( *guid == OID_PresentationServer )
-        return OUString( RTL_CONSTASCII_USTRINGPARAM ( "StarOffice XML (Impress)" ) );
+        return OUString( "StarOffice XML (Impress)" );
 
     if ( *guid == OID_PresentationOASISServer )
         return OUString( "impress8" );
 
     if ( *guid == OID_MathServer )
-        return OUString( RTL_CONSTASCII_USTRINGPARAM ( "StarOffice XML (Math)" ) );
+        return OUString( "StarOffice XML (Math)" );
 
     if ( *guid == OID_MathOASISServer )
         return OUString( "math8" );
diff --git a/embedserv/source/embed/intercept.cxx b/embedserv/source/embed/intercept.cxx
index dbae2024b459..eba61b4b55d1 100644
--- a/embedserv/source/embed/intercept.cxx
+++ b/embedserv/source/embed/intercept.cxx
@@ -261,25 +261,20 @@ void Interceptor::generateFeatureStateEvent()
 
                 aStateEvent.FeatureURL.Complete = m_aInterceptedURL[0];
                 aStateEvent.FeatureDescriptor = "Update";
-                aStateEvent.State <<= (OUString(
-                    RTL_CONSTASCII_USTRINGPARAM("($1) ")) +
-                                       aTitle);
+                aStateEvent.State <<= (OUString("($1) ") + aTitle);
 
             }
             else if ( i == 5 )
             {
                 aStateEvent.FeatureURL.Complete = m_aInterceptedURL[5];
                 aStateEvent.FeatureDescriptor = "SaveCopyTo";
-                aStateEvent.State <<= (OUString(
-                    RTL_CONSTASCII_USTRINGPARAM("($3)")));
+                aStateEvent.State <<= (OUString("($3)"));
             }
             else
             {
                 aStateEvent.FeatureURL.Complete = m_aInterceptedURL[i];
                 aStateEvent.FeatureDescriptor = "Close and Return";
-                aStateEvent.State <<= (OUString(
-                    RTL_CONSTASCII_USTRINGPARAM("($2) ")) +
-                                       aTitle);
+                aStateEvent.State <<= (OUString("($2) ") + aTitle);
 
             }
 
@@ -328,9 +323,7 @@ Interceptor::addStatusListener(
         aStateEvent.FeatureDescriptor = "Update";
         aStateEvent.IsEnabled = sal_True;
         aStateEvent.Requery = sal_False;
-        aStateEvent.State <<= (OUString(
-            RTL_CONSTASCII_USTRINGPARAM("($1) ")) +
-                               aTitle );
+        aStateEvent.State <<= (OUString("($1) ") + aTitle );
         Control->statusChanged(aStateEvent);
 
         {
@@ -368,9 +361,7 @@ Interceptor::addStatusListener(
         aStateEvent.FeatureDescriptor = "Close and Return";
         aStateEvent.IsEnabled = sal_True;
         aStateEvent.Requery = sal_False;
-        aStateEvent.State <<= (OUString(
-            RTL_CONSTASCII_USTRINGPARAM("($2) ")) +
-                               aTitle );
+        aStateEvent.State <<= (OUString("($2) ") + aTitle );
         Control->statusChanged(aStateEvent);
 
 
@@ -392,7 +383,7 @@ Interceptor::addStatusListener(
         aStateEvent.FeatureDescriptor = "SaveCopyTo";
         aStateEvent.IsEnabled = sal_True;
         aStateEvent.Requery = sal_False;
-        aStateEvent.State <<= (OUString( RTL_CONSTASCII_USTRINGPARAM("($3)")));
+        aStateEvent.State <<= (OUString("($3)"));
         Control->statusChanged(aStateEvent);
 
         {
diff --git a/extensions/test/ole/unloading/unloadTest.cxx b/extensions/test/ole/unloading/unloadTest.cxx
index a81244113d5d..23b4e0dacd5f 100644
--- a/extensions/test/ole/unloading/unloadTest.cxx
+++ b/extensions/test/ole/unloading/unloadTest.cxx
@@ -69,8 +69,7 @@ sal_Bool test1()
     OUString sService1("com.sun.star.bridge.oleautomation.BridgeSupplier");
     Reference<XInterface> xint1= fac->createInstanceWithContext( sService1, context);
 
-    OUString sModule(
-        RTL_CONSTASCII_USTRINGPARAM("oleautobridge.uno" SAL_DLLEXTENSION));
+    OUString sModule("oleautobridge.uno" SAL_DLLEXTENSION);
     oslModule hMod= osl_loadModule( sModule.pData, 0);
     osl_unloadModule( hMod);
 
@@ -104,8 +103,7 @@ sal_Bool test2()
       OUString sService2("com.sun.star.bridge.OleBridgeSupplierVar1");
     Reference<XInterface> xint= fac->createInstanceWithContext( sService2, context);
 
-    OUString sModule(
-        RTL_CONSTASCII_USTRINGPARAM("oleautobridge.uno" SAL_DLLEXTENSION));
+    OUString sModule("oleautobridge.uno" SAL_DLLEXTENSION);
     oslModule hMod= osl_loadModule( sModule.pData, 0);
     osl_unloadModule( hMod);
 
@@ -139,8 +137,7 @@ sal_Bool test3()
     Reference<XInterface> xint= fac->createInstanceWithContext( sService, context);
 
 
-    OUString sModule(
-        RTL_CONSTASCII_USTRINGPARAM("oleautobridge.uno" SAL_DLLEXTENSION));
+    OUString sModule("oleautobridge.uno" SAL_DLLEXTENSION);
     oslModule hMod= osl_loadModule( sModule.pData, 0);
     osl_unloadModule( hMod);
 
@@ -167,8 +164,7 @@ sal_Bool test4()
     sal_Bool bTest1= sal_False;
     sal_Bool bTest2= sal_False;
     oslModule hMod= NULL;
-    OUString sModule(
-        RTL_CONSTASCII_USTRINGPARAM("oleautobridge.uno" SAL_DLLEXTENSION));
+    OUString sModule("oleautobridge.uno" SAL_DLLEXTENSION);
     OUString sFactoryFunc("component_getFactory");
     {
     printf("Test4:  com.sun.star.bridge.oleautomation.ApplicationRegistration\n");
diff --git a/filter/source/msfilter/eschesdo.cxx b/filter/source/msfilter/eschesdo.cxx
index 43854c1d1d70..c97f474fc8f6 100644
--- a/filter/source/msfilter/eschesdo.cxx
+++ b/filter/source/msfilter/eschesdo.cxx
@@ -1080,7 +1080,7 @@ basegfx::B2DRange getUnrotatedGroupBoundRange(const Reference< XShape >& rxShape
 
                 if(mXPropSet.is())
                 {
-                    const Any aAny = mXPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("Transformation")));
+                    const Any aAny = mXPropSet->getPropertyValue(OUString("Transformation"));
 
                     if(aAny.hasValue())
                     {
diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.cxx b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
index c4ce50ef9b17..359863cc9ce1 100644
--- a/filter/source/xsltdialog/xmlfiltertestdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
@@ -429,7 +429,7 @@ void XMLFilterTestDialog::doExport( Reference< XComponent > xComp )
         Reference< XStorable > xStorable( xComp, UNO_QUERY );
         if( xStorable.is() )
         {
-            OUString const ext(RTL_CONSTASCII_USTRINGPARAM(".xml"));
+            OUString const ext(".xml");
             utl::TempFile aTempFile(OUString(), &ext);
             OUString aTempFileURL( aTempFile.GetURL() );
 
@@ -592,7 +592,7 @@ void XMLFilterTestDialog::import( const OUString& rURL )
 
         if( m_pCBXDisplaySource->IsChecked() )
         {
-            OUString const ext(RTL_CONSTASCII_USTRINGPARAM(".xml"));
+            OUString const ext(".xml");
             TempFile aTempFile(OUString(), &ext);
             OUString aTempFileURL( aTempFile.GetURL() );
 
diff --git a/fpicker/source/aqua/FPentry.mm b/fpicker/source/aqua/FPentry.mm
index 78d9ff65cf06..58f347931799 100644
--- a/fpicker/source/aqua/FPentry.mm
+++ b/fpicker/source/aqua/FPentry.mm
@@ -65,8 +65,7 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL fps_aqua_component_getFactory(
             if (0 == rtl_str_compare(pImplName, FILE_PICKER_IMPL_NAME))
             {
                 Sequence< OUString > aSNS( 1 );
-                aSNS.getArray( )[0] =
-                    OUString(RTL_CONSTASCII_USTRINGPARAM(FILE_PICKER_SERVICE_NAME));
+                aSNS.getArray( )[0] = FILE_PICKER_SERVICE_NAME;
 
                 xFactory = createSingleFactory(
                     reinterpret_cast< XMultiServiceFactory* > ( pSrvManager ),
@@ -77,8 +76,7 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL fps_aqua_component_getFactory(
             else if (0 == rtl_str_compare(pImplName, FOLDER_PICKER_IMPL_NAME))
             {
                 Sequence< OUString > aSNS( 1 );
-                aSNS.getArray( )[0] =
-                    OUString(RTL_CONSTASCII_USTRINGPARAM(FOLDER_PICKER_SERVICE_NAME));
+                aSNS.getArray( )[0] = FOLDER_PICKER_SERVICE_NAME;
 
                 xFactory = createSingleFactory(
                     reinterpret_cast< XMultiServiceFactory* > ( pSrvManager ),
diff --git a/fpicker/source/aqua/SalAquaFilePicker.mm b/fpicker/source/aqua/SalAquaFilePicker.mm
index 3366753b3da3..75f57fc863f8 100644
--- a/fpicker/source/aqua/SalAquaFilePicker.mm
+++ b/fpicker/source/aqua/SalAquaFilePicker.mm
@@ -79,9 +79,9 @@ namespace
     uno::Sequence<rtl::OUString> SAL_CALL FilePicker_getSupportedServiceNames()
     {
         uno::Sequence<rtl::OUString> aRet(3);
-        aRet[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.FilePicker" ));
-        aRet[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.SystemFilePicker" ));
-        aRet[2] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.AquaFilePicker" ));
+        aRet[0] = "com.sun.star.ui.dialogs.FilePicker";
+        aRet[1] = "com.sun.star.ui.dialogs.SystemFilePicker";
+        aRet[2] = "com.sun.star.ui.dialogs.AquaFilePicker";
         return aRet;
     }
 }
@@ -188,7 +188,7 @@ sal_Int16 SAL_CALL SalAquaFilePicker::execute() throw( uno::RuntimeException )
                     rtl::OUString ouName = [windowTitle OUString];
                     //a window title will typically be something like "Untitled1 - OpenOffice.org Writer"
                     //but we only want the "Untitled1" part of it
-                    sal_Int32 indexOfDash = ouName.indexOf(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" - ")));
+                    sal_Int32 indexOfDash = ouName.indexOf(" - ");
                     if (indexOfDash > -1) {
                         m_sSaveFileName = ouName.copy(0,indexOfDash);
                         if (m_sSaveFileName.getLength() > 0) {
@@ -649,7 +649,7 @@ throw( uno::RuntimeException )
 {
     DBG_PRINT_ENTRY(CLASS_NAME, __func__);
 
-    rtl::OUString retVal(RTL_CONSTASCII_USTRINGPARAM( FILE_PICKER_IMPL_NAME ));
+    rtl::OUString retVal( FILE_PICKER_IMPL_NAME );
 
     DBG_PRINT_EXIT(CLASS_NAME, __func__, retVal);
 
diff --git a/fpicker/source/aqua/SalAquaFolderPicker.mm b/fpicker/source/aqua/SalAquaFolderPicker.mm
index 3eb590b5cfc6..1b147d1fc514 100644
--- a/fpicker/source/aqua/SalAquaFolderPicker.mm
+++ b/fpicker/source/aqua/SalAquaFolderPicker.mm
@@ -65,8 +65,8 @@ namespace
     uno::Sequence<rtl::OUString> SAL_CALL FolderPicker_getSupportedServiceNames()
     {
         uno::Sequence<rtl::OUString> aRet(2);
-        aRet[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.SystemFolderPicker" ));
-        aRet[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.AquaFolderPicker" ));
+        aRet[0] = "com.sun.star.ui.dialogs.SystemFolderPicker";
+        aRet[1] = "com.sun.star.ui.dialogs.AquaFolderPicker";
         return aRet;
     }
 }
@@ -122,7 +122,7 @@ sal_Int16 SAL_CALL SalAquaFolderPicker::execute() throw( uno::RuntimeException )
         break;
 
     default:
-        throw uno::RuntimeException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("The dialog returned with an unknown result!")), static_cast< cppu::OWeakObject * >( this ));
+        throw uno::RuntimeException(OUString("The dialog returned with an unknown result!"), static_cast< cppu::OWeakObject * >( this ));
         break;
     }
 
@@ -174,7 +174,7 @@ rtl::OUString SAL_CALL SalAquaFolderPicker::getDirectory() throw( uno::RuntimeEx
     OSL_TRACE("# of items: %d", nFiles);
 
     if (nFiles < 1) {
-        throw uno::RuntimeException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("no directory selected")), static_cast< cppu::OWeakObject * >( this ));
+        throw uno::RuntimeException(OUString("no directory selected"), static_cast< cppu::OWeakObject * >( this ));
     }
 
     rtl::OUString aDirectory;
@@ -211,7 +211,7 @@ rtl::OUString SAL_CALL SalAquaFolderPicker::getImplementationName()
 {
     DBG_PRINT_ENTRY(CLASS_NAME, __func__);
 
-    rtl::OUString retVal(RTL_CONSTASCII_USTRINGPARAM( FOLDER_PICKER_IMPL_NAME ));
+    rtl::OUString retVal( FOLDER_PICKER_IMPL_NAME );
 
     DBG_PRINT_EXIT(CLASS_NAME, __func__, retVal);
 
diff --git a/fpicker/source/win32/filepicker/FPentry.cxx b/fpicker/source/win32/filepicker/FPentry.cxx
index 5c26204a5d27..f314a5f19b22 100644
--- a/fpicker/source/win32/filepicker/FPentry.cxx
+++ b/fpicker/source/win32/filepicker/FPentry.cxx
@@ -96,7 +96,7 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL fps_win32_component_getFactory(
     if ( pSrvManager && ( 0 == rtl_str_compare( pImplName, FILE_PICKER_IMPL_NAME ) ) )
     {
         Sequence< OUString > aSNS( 1 );
-        aSNS.getArray( )[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( FILE_PICKER_SERVICE_NAME ));
+        aSNS.getArray( )[0] = FILE_PICKER_SERVICE_NAME;
 
         Reference< XSingleServiceFactory > xFactory ( createSingleFactory(
             reinterpret_cast< XMultiServiceFactory* > ( pSrvManager ),
@@ -113,7 +113,7 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL fps_win32_component_getFactory(
     if ( pSrvManager && ( 0 == rtl_str_compare( pImplName, FOLDER_PICKER_IMPL_NAME ) ) )
     {
         Sequence< OUString > aSNS( 1 );
-        aSNS.getArray( )[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( FOLDER_PICKER_SERVICE_NAME ) );
+        aSNS.getArray( )[0] = FOLDER_PICKER_SERVICE_NAME;
 
         Reference< XSingleServiceFactory > xFactory ( createSingleFactory(
             reinterpret_cast< XMultiServiceFactory* > ( pSrvManager ),
diff --git a/fpicker/source/win32/filepicker/FilePicker.cxx b/fpicker/source/win32/filepicker/FilePicker.cxx
index fa344ef5a19a..b78bacbb774f 100644
--- a/fpicker/source/win32/filepicker/FilePicker.cxx
+++ b/fpicker/source/win32/filepicker/FilePicker.cxx
@@ -711,7 +711,7 @@ void SAL_CALL CFilePicker::cancel()
 OUString SAL_CALL CFilePicker::getImplementationName()
     throw(uno::RuntimeException)
 {
-    return OUString(RTL_CONSTASCII_USTRINGPARAM(FILE_PICKER_IMPL_NAME));
+    return OUString(FILE_PICKER_IMPL_NAME);
 }
 
 //  XServiceInfo
diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.cxx b/fpicker/source/win32/filepicker/VistaFilePicker.cxx
index 2909d7ad43a1..e1a29dcd8cee 100644
--- a/fpicker/source/win32/filepicker/VistaFilePicker.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePicker.cxx
@@ -478,7 +478,7 @@ void SAL_CALL VistaFilePicker::initialize(const css::uno::Sequence< css::uno::An
 {
     if (lArguments.getLength() < 1)
         throw css::lang::IllegalArgumentException(
-                OUString(RTL_CONSTASCII_USTRINGPARAM( "XInitialization::initialize() called without arguments." )),
+                OUString( "XInitialization::initialize() called without arguments." ),
                 static_cast< css::ui::dialogs::XFilePicker2* >( this ),
                 1);
 
diff --git a/fpicker/source/win32/filepicker/workbench/Test_fps.cxx b/fpicker/source/win32/filepicker/workbench/Test_fps.cxx
index cfff74feff01..9fa5112a8b6d 100644
--- a/fpicker/source/win32/filepicker/workbench/Test_fps.cxx
+++ b/fpicker/source/win32/filepicker/workbench/Test_fps.cxx
@@ -244,7 +244,7 @@ int SAL_CALL main(int nArgc, char* Argv[], char* Env[]  )
     //-------------------------------------------------
 
     // Get global factory for uno services.
-    OUString rdbName = OUString( RTL_CONSTASCII_USTRINGPARAM( RDB_SYSPATH ) );
+    OUString rdbName = OUString( RDB_SYSPATH );
     Reference< XMultiServiceFactory > g_xFactory( createRegistryServiceFactory( rdbName ) );
 
     // Print a message if an error occurred.
@@ -263,7 +263,7 @@ int SAL_CALL main(int nArgc, char* Argv[], char* Env[]  )
 
     Reference< XFilePicker > xFilePicker = Reference< XFilePicker >(
         g_xFactory->createInstanceWithArguments(
-            OUString(RTL_CONSTASCII_USTRINGPARAM( FILE_PICKER_SERVICE_NAME )), arguments ), UNO_QUERY );
+            OUString( FILE_PICKER_SERVICE_NAME ), arguments ), UNO_QUERY );
 
         // install a FilePicker notifier
         Reference< XFilePickerListener > xFPListener(
diff --git a/fpicker/source/win32/folderpicker/FolderPicker.cxx b/fpicker/source/win32/folderpicker/FolderPicker.cxx
index 7f963221d348..7619e0d99d1b 100644
--- a/fpicker/source/win32/folderpicker/FolderPicker.cxx
+++ b/fpicker/source/win32/folderpicker/FolderPicker.cxx
@@ -147,7 +147,7 @@ sal_Int16 SAL_CALL CFolderPicker::execute( )
 OUString SAL_CALL CFolderPicker::getImplementationName(  )
     throw( RuntimeException )
 {
-    return OUString(RTL_CONSTASCII_USTRINGPARAM( FOLDERPICKER_IMPL_NAME ));
+    return OUString( FOLDERPICKER_IMPL_NAME );
 }
 
 //  XServiceInfo
diff --git a/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx b/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx
index e0497d25a688..fddb157d4058 100644
--- a/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx
+++ b/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx
@@ -77,7 +77,7 @@ int SAL_CALL main(int /*nArgc*/, char* /*Argv[]*/, char* /*Env[]*/  )
     //-------------------------------------------------
 
     // Get global factory for uno services.
-    OUString rdbName = OUString( RTL_CONSTASCII_USTRINGPARAM( RDB_SYSPATH ) );
+    OUString rdbName = OUString( RDB_SYSPATH );
     Reference< XMultiServiceFactory > g_xFactory( createRegistryServiceFactory( rdbName ) );
 
     // Print a message if an error occurred.
@@ -96,7 +96,7 @@ int SAL_CALL main(int /*nArgc*/, char* /*Argv[]*/, char* /*Env[]*/  )
     Reference< XFolderPicker2 > xFolderPicker;
 
     xFolderPicker = Reference< XFolderPicker2 >(
-        g_xFactory->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM ( FOLDER_PICKER_SERVICE_NAME ) ) ), UNO_QUERY );
+        g_xFactory->createInstance( OUString( FOLDER_PICKER_SERVICE_NAME ) ), UNO_QUERY );
 
     if ( xFolderPicker.is() == sal_False )
     {
diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx
index d8bfdbbfa4f8..bebbd953a8b6 100644
--- a/framework/source/fwe/classes/addonsoptions.cxx
+++ b/framework/source/fwe/classes/addonsoptions.cxx
@@ -95,12 +95,12 @@ using namespace ::com::sun::star;
 #define PROPERTYNAME_MERGETOOLBAR_MERGECONTEXT          OUString("MergeContext" )
 #define PROPERTYNAME_MERGETOOLBAR_TOOLBARITEMS          OUString("ToolBarItems" )
 
-#define PROPERTYNAME_MERGESTATUSBAR_MERGEPOINT               ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MergePoint" ))
-#define PROPERTYNAME_MERGESTATUSBAR_MERGECOMMAND             ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MergeCommand" ))
-#define PROPERTYNAME_MERGESTATUSBAR_MERGECOMMANDPARAMETER    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MergeCommandParameter" ))
-#define PROPERTYNAME_MERGESTATUSBAR_MERGEFALLBACK            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MergeFallback" ))
-#define PROPERTYNAME_MERGESTATUSBAR_MERGECONTEXT             ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MergeContext" ))
-#define PROPERTYNAME_MERGESTATUSBAR_STATUSBARITEMS           ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StatusBarItems" ))
+#define PROPERTYNAME_MERGESTATUSBAR_MERGEPOINT               ::rtl::OUString("MergePoint")
+#define PROPERTYNAME_MERGESTATUSBAR_MERGECOMMAND             ::rtl::OUString("MergeCommand")
+#define PROPERTYNAME_MERGESTATUSBAR_MERGECOMMANDPARAMETER    ::rtl::OUString("MergeCommandParameter")
+#define PROPERTYNAME_MERGESTATUSBAR_MERGEFALLBACK            ::rtl::OUString("MergeFallback")
+#define PROPERTYNAME_MERGESTATUSBAR_MERGECONTEXT             ::rtl::OUString("MergeContext")
+#define PROPERTYNAME_MERGESTATUSBAR_STATUSBARITEMS           ::rtl::OUString("StatusBarItems")
 
 // The following order is mandatory. Please add properties at the end!
 #define INDEX_URL               0
@@ -1152,7 +1152,7 @@ sal_Bool AddonsOptions_Impl::ReadMergeToolbarData( const OUString& aMergeAddonIn
 
 sal_Bool AddonsOptions_Impl::ReadStatusbarMergeInstructions( MergeStatusbarInstructionContainer& aContainer )
 {
-    const ::rtl::OUString aStatusbarMergeRootName( RTL_CONSTASCII_USTRINGPARAM( "AddonUI/OfficeStatusbarMerging/" ));
+    const ::rtl::OUString aStatusbarMergeRootName( "AddonUI/OfficeStatusbarMerging/" );
 
     Sequence< ::rtl::OUString > aAddonMergeNodesSeq = GetNodeNames( aStatusbarMergeRootName );
     ::rtl::OUString aAddonMergeNode( aStatusbarMergeRootName );
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index 0c7e3b2d6ed3..6c3944f1cf32 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -910,7 +910,7 @@ css::uno::Reference< css::container::XNameAccess > AutoRecovery::implts_openConf
     aWriteLock.unlock();
     // <- SAFE ----------------------------------
 
-    OUString sCFG_PACKAGE_RECOVERY(RTL_CONSTASCII_USTRINGPARAM(CFG_PACKAGE_RECOVERY));
+    OUString sCFG_PACKAGE_RECOVERY(CFG_PACKAGE_RECOVERY);
     // throws a RuntimeException if an error occurs!
     css::uno::Reference< css::container::XNameAccess > xCFG(
         ::comphelper::ConfigurationHelper::openConfig(xContext, sCFG_PACKAGE_RECOVERY, ::comphelper::ConfigurationHelper::E_STANDARD),
diff --git a/framework/source/uielement/genericstatusbarcontroller.cxx b/framework/source/uielement/genericstatusbarcontroller.cxx
index 0dcc719a0475..62e19d00858a 100644
--- a/framework/source/uielement/genericstatusbarcontroller.cxx
+++ b/framework/source/uielement/genericstatusbarcontroller.cxx
@@ -139,7 +139,7 @@ throw ( RuntimeException )
     if ( xGraphicProps.is() && m_xGraphic->getType() != graphic::GraphicType::EMPTY )
     {
         awt::Size aGraphicSize;
-        xGraphicProps->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("SizePixel") ) ) >>= aGraphicSize;
+        xGraphicProps->getPropertyValue( OUString( "SizePixel" ) ) >>= aGraphicSize;
         OSL_ENSURE( aGraphicSize.Height > 0 && aGraphicSize.Width > 0, "Empty status bar graphic!" );
 
         sal_Int32 nOffset = m_xStatusbarItem->getOffset( );
diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx b/framework/source/uielement/popuptoolbarcontroller.cxx
index 37d84dcbcc8a..03b1fce4c931 100644
--- a/framework/source/uielement/popuptoolbarcontroller.cxx
+++ b/framework/source/uielement/popuptoolbarcontroller.cxx
@@ -289,7 +289,7 @@ NewToolbarController::execute( sal_Int16 /*KeyModifier*/ )
     if ( !m_aLastURL.getLength() )
         return;
 
-    OUString aTarget( RTL_CONSTASCII_USTRINGPARAM( "_default" ) );
+    OUString aTarget( "_default" );
     if ( m_xPopupMenu.is() )
     {
         // TODO investigate how to wrap Get/SetUserValue in css::awt::XMenu
@@ -308,8 +308,8 @@ NewToolbarController::execute( sal_Int16 /*KeyModifier*/ )
     }
 
     css::uno::Sequence< css::beans::PropertyValue > aArgs( 1 );
-    aArgs[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "Referer"  ));
-    aArgs[0].Value <<= OUString( RTL_CONSTASCII_USTRINGPARAM( "private:user" ) );
+    aArgs[0].Name = "Referer";
+    aArgs[0].Value <<= OUString( "private:user" );
 
     dispatchCommand( m_aLastURL, aArgs, aTarget );
 }
diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx b/framework/source/uielement/recentfilesmenucontroller.cxx
index 644908791eb8..37c3c052d9c1 100644
--- a/framework/source/uielement/recentfilesmenucontroller.cxx
+++ b/framework/source/uielement/recentfilesmenucontroller.cxx
@@ -177,7 +177,7 @@ void RecentFilesMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >
             pVCLPopupMenu->InsertItem( sal_uInt16( nCount + 1 ),
                                        FWK_RESSTR(STR_CLEAR_RECENT_FILES) );
             pVCLPopupMenu->SetItemCommand( sal_uInt16( nCount + 1 ),
-                                           OUString( RTL_CONSTASCII_USTRINGPARAM( CMD_CLEAR_LIST ) ) );
+                                           OUString( CMD_CLEAR_LIST ) );
             pVCLPopupMenu->SetHelpText( sal_uInt16( nCount + 1 ),
                                         FWK_RESSTR(STR_CLEAR_RECENT_FILES_HELP) );
         }
diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx
index b37d2d1769a0..da44a22d4e8c 100644
--- a/framework/source/uielement/statusbarmanager.cxx
+++ b/framework/source/uielement/statusbarmanager.cxx
@@ -332,7 +332,7 @@ void StatusBarManager::CreateControllers()
         beans::PropertyValue aPropValue;
         std::vector< uno::Any > aPropVector;
 
-        aPropValue.Name     = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CommandURL" ));
+        aPropValue.Name     = "CommandURL";
         aPropValue.Value    <<= aCommandURL;
         aPropVector.push_back( uno::makeAny( aPropValue ) );
 
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index 4c64d0ff3e56..4cff1966bdce 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -905,7 +905,7 @@ void ToolBarManager::CreateControllers()
             aPropValue.Name     = OUString( "ParentWindow" );
             aPropValue.Value    <<= xToolbarWindow;
             aPropertyVector.push_back( makeAny( aPropValue ));
-            aPropValue.Name     = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Identifier" ));
+            aPropValue.Name     = "Identifier";
             aPropValue.Value    = uno::makeAny( nId );
             aPropertyVector.push_back( uno::makeAny( aPropValue ) );
 
@@ -1021,7 +1021,7 @@ void ToolBarManager::CreateControllers()
                 aPropValue.Name = OUString( "ModuleIdentifier" );
                 aPropValue.Value <<= m_aModuleIdentifier;
                 aPropertyVector.push_back( makeAny( aPropValue ));
-                aPropValue.Name     = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Identifier" ));
+                aPropValue.Name     = "Identifier";
                 aPropValue.Value    = uno::makeAny( nId );
                 aPropertyVector.push_back( uno::makeAny( aPropValue ) );
 
diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx
index d73f3cec6504..1f3917c14e99 100644
--- a/framework/source/uielement/toolbarsmenucontroller.cxx
+++ b/framework/source/uielement/toolbarsmenucontroller.cxx
@@ -726,7 +726,7 @@ void SAL_CALL ToolbarsMenuController::itemSelected( const css::awt::MenuEvent& r
                     sal_Int32 nIndex = aCmd.indexOf( '=' );
                     if (( nIndex > 0 ) && (( nIndex+1 ) < aCmd.getLength() ))
                     {
-                        OUStringBuffer aBuf( OUString( RTL_CONSTASCII_USTRINGPARAM( STATIC_PRIVATE_TB_RESOURCE) ));
+                        OUStringBuffer aBuf( STATIC_PRIVATE_TB_RESOURCE );
                         aBuf.append( aCmd.copy( nIndex+1 ));
 
                         sal_Bool      bShow( !pVCLPopupMenu->IsItemChecked( rEvent.MenuId ));
diff --git a/framework/source/uifactory/uicontrollerfactory.cxx b/framework/source/uifactory/uicontrollerfactory.cxx
index b5b48e7af31f..0eedfa73f40d 100644
--- a/framework/source/uifactory/uicontrollerfactory.cxx
+++ b/framework/source/uifactory/uicontrollerfactory.cxx
@@ -229,7 +229,7 @@ DEFINE_INIT_SERVICE                     (   PopupMenuControllerFactory, {} )
 PopupMenuControllerFactory::PopupMenuControllerFactory( const Reference< XComponentContext >& xContext ) :
     UIControllerFactory(
         xContext,
-        rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PopupMenu" )) )
+        OUString( "PopupMenu") )
 {
 }
 
@@ -244,7 +244,7 @@ DEFINE_INIT_SERVICE                     (   ToolbarControllerFactory, {} )
 ToolbarControllerFactory::ToolbarControllerFactory( const Reference< XComponentContext >& xContext ) :
     UIControllerFactory(
         xContext,
-        rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ToolBar" )))
+        OUString( "ToolBar" ))
 {
 }
 
@@ -259,7 +259,7 @@ DEFINE_INIT_SERVICE                     (   StatusbarControllerFactory, {} )
 StatusbarControllerFactory::StatusbarControllerFactory( const Reference< XComponentContext >& xContext ) :
     UIControllerFactory(
         xContext,
-        rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "StatusBar" )) )
+        OUString( "StatusBar" ) )
 {
 }
 
diff --git a/idlc/source/idlccompile.cxx b/idlc/source/idlccompile.cxx
index 8c6701aa292a..2bd544d2fe25 100644
--- a/idlc/source/idlccompile.cxx
+++ b/idlc/source/idlccompile.cxx
@@ -317,7 +317,7 @@ sal_Int32 compileFile(const OString * pathname)
     cpp += "ucpp";
 #endif
 #else // SYSTEM_UCPP
-    cpp = OUString( RTL_CONSTASCII_USTRINGPARAM(UCPP));
+    cpp = OUString(UCPP);
 #endif
     oslProcess      hProcess = NULL;
     oslProcessError procError = osl_Process_E_None;
diff --git a/io/test/stm/pipetest.cxx b/io/test/stm/pipetest.cxx
index 1dbfc312ee75..ec0155e8b81f 100644
--- a/io/test/stm/pipetest.cxx
+++ b/io/test/stm/pipetest.cxx
@@ -420,12 +420,12 @@ Sequence<OUString> OPipeTest_getSupportedServiceNames(void) throw()
 
 OUString     OPipeTest_getServiceName() throw()
 {
-    return OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICE_NAME ) );
+    return OUString( SERVICE_NAME );
 }
 
 OUString    OPipeTest_getImplementationName() throw()
 {
-    return OUString( RTL_CONSTASCII_USTRINGPARAM( IMPLEMENTATION_NAME ) );
+    return OUString( IMPLEMENTATION_NAME );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/linguistic/source/dlistimp.cxx b/linguistic/source/dlistimp.cxx
index 77ebcea62de7..79e2e86515d6 100644
--- a/linguistic/source/dlistimp.cxx
+++ b/linguistic/source/dlistimp.cxx
@@ -822,7 +822,7 @@ static void AddInternal(
         //! TL TODO: word iterator should be used to break up the text
         static const char aDefWordDelim[] =
                 "!\"#$%&'()*+,-/:;<=>?[]\\_^`{|}~\t \n";
-        OUString aDelim(RTL_CONSTASCII_USTRINGPARAM(aDefWordDelim));
+        OUString aDelim(aDefWordDelim);
         OSL_ENSURE(aDelim.indexOf(static_cast<sal_Unicode>('.')) == -1,
             "ensure no '.'");
 
diff --git a/registry/source/keyimpl.cxx b/registry/source/keyimpl.cxx
index ae9605e2ddcc..793427efa180 100644
--- a/registry/source/keyimpl.cxx
+++ b/registry/source/keyimpl.cxx
@@ -230,7 +230,7 @@ RegError ORegKey::getValueInfo(const OUString& valueName, RegValueType* pValueTy
         accessMode = VALUE_MODE_OPENREAD;
     }
 
-    OUString sImplValueName( RTL_CONSTASCII_USTRINGPARAM(VALUE_PREFIX) );
+    OUString sImplValueName( VALUE_PREFIX );
     sImplValueName += valueName;
 
     REG_GUARD(m_pRegistry->m_mutex);
@@ -301,7 +301,7 @@ RegError ORegKey::setValue(const OUString& valueName, RegValueType vType, RegVal
         return REG_INVALID_VALUE;
     }
 
-    OUString sImplValueName( RTL_CONSTASCII_USTRINGPARAM(VALUE_PREFIX) );
+    OUString sImplValueName( VALUE_PREFIX );
     sImplValueName += valueName;
 
     REG_GUARD(m_pRegistry->m_mutex);
@@ -371,7 +371,7 @@ RegError ORegKey::setLongListValue(const OUString& valueName, sal_Int32* pValueL
         return REG_REGISTRY_READONLY;
     }
 
-    OUString sImplValueName( RTL_CONSTASCII_USTRINGPARAM(VALUE_PREFIX) );
+    OUString sImplValueName( VALUE_PREFIX );
     sImplValueName += valueName;
 
     REG_GUARD(m_pRegistry->m_mutex);
@@ -430,7 +430,7 @@ RegError ORegKey::setStringListValue(const OUString& valueName, sal_Char** pValu
         return REG_REGISTRY_READONLY;
     }
 
-    OUString sImplValueName( RTL_CONSTASCII_USTRINGPARAM(VALUE_PREFIX) );
+    OUString sImplValueName( VALUE_PREFIX );
     sImplValueName += valueName;
 
     REG_GUARD(m_pRegistry->m_mutex);
@@ -498,7 +498,7 @@ RegError ORegKey::setUnicodeListValue(const OUString& valueName, sal_Unicode** p
         return REG_REGISTRY_READONLY;
     }
 
-    OUString sImplValueName( RTL_CONSTASCII_USTRINGPARAM(VALUE_PREFIX) );
+    OUString sImplValueName( VALUE_PREFIX );
     sImplValueName += valueName;
 
     REG_GUARD(m_pRegistry->m_mutex);
@@ -569,7 +569,7 @@ RegError ORegKey::getValue(const OUString& valueName, RegValue value) const
         accessMode = VALUE_MODE_OPENREAD;
     }
 
-    OUString sImplValueName( RTL_CONSTASCII_USTRINGPARAM(VALUE_PREFIX) );
+    OUString sImplValueName( VALUE_PREFIX );
     sImplValueName += valueName;
 
     REG_GUARD(m_pRegistry->m_mutex);
@@ -662,7 +662,7 @@ RegError ORegKey::getLongListValue(const OUString& valueName, sal_Int32** pValue
         accessMode = VALUE_MODE_OPENREAD;
     }
 
-    OUString sImplValueName( RTL_CONSTASCII_USTRINGPARAM(VALUE_PREFIX) );
+    OUString sImplValueName( VALUE_PREFIX );
     sImplValueName += valueName;
 
     REG_GUARD(m_pRegistry->m_mutex);
@@ -759,7 +759,7 @@ RegError ORegKey::getStringListValue(const OUString& valueName, sal_Char*** pVal
         accessMode = VALUE_MODE_OPENREAD;
     }
 
-    OUString sImplValueName( RTL_CONSTASCII_USTRINGPARAM(VALUE_PREFIX) );
+    OUString sImplValueName( VALUE_PREFIX );
     sImplValueName += valueName;
 
     REG_GUARD(m_pRegistry->m_mutex);
@@ -865,7 +865,7 @@ RegError ORegKey::getUnicodeListValue(const OUString& valueName, sal_Unicode***
         accessMode = VALUE_MODE_OPENREAD;
     }
 
-    OUString sImplValueName( RTL_CONSTASCII_USTRINGPARAM(VALUE_PREFIX) );
+    OUString sImplValueName( VALUE_PREFIX );
     sImplValueName += valueName;
 
     REG_GUARD(m_pRegistry->m_mutex);
diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx
index bc50f664d2c7..db65a4f1eb80 100644
--- a/reportdesign/source/filter/xml/xmlfilter.cxx
+++ b/reportdesign/source/filter/xml/xmlfilter.cxx
@@ -368,11 +368,11 @@ ORptFilter::ORptFilter( const uno::Reference< XComponentContext >& _rxContext,sa
     DBG_CTOR(rpt_ORptFilter,NULL);
     GetMM100UnitConverter().SetCoreMeasureUnit(util::MeasureUnit::MM_100TH);
     GetMM100UnitConverter().SetXMLMeasureUnit(util::MeasureUnit::CM);
-    GetNamespaceMap().Add( OUString( RTL_CONSTASCII_USTRINGPARAM ( sXML_np__rpt) ),
+    GetNamespaceMap().Add( OUString( sXML_np__rpt ),
                         GetXMLToken(XML_N_RPT),
                         XML_NAMESPACE_REPORT );
 
-    GetNamespaceMap().Add( OUString( RTL_CONSTASCII_USTRINGPARAM ( sXML_np___rpt) ),
+    GetNamespaceMap().Add( OUString( sXML_np___rpt ),
                         GetXMLToken(XML_N_RPT_OASIS),
                         XML_NAMESPACE_REPORT );
 
diff --git a/salhelper/test/Symbols/loader.cxx b/salhelper/test/Symbols/loader.cxx
index 1651d12fb0ad..968cdc3e85c6 100644
--- a/salhelper/test/Symbols/loader.cxx
+++ b/salhelper/test/Symbols/loader.cxx
@@ -33,8 +33,8 @@ class SampleLibLoader
 public:
     SampleLibLoader():
         ::salhelper::ODynamicLoader<SampleLib_Api>
-            (::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SAL_MODULENAME( "samplelib") ) ),
-             ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(SAMPLELIB_INIT_FUNCTION_NAME) ))
+            (::rtl::OUString( SAL_MODULENAME( "samplelib") ),
+             ::rtl::OUString( SAMPLELIB_INIT_FUNCTION_NAME ))
         {}
 
 };
diff --git a/salhelper/test/dynamicloader/loader.cxx b/salhelper/test/dynamicloader/loader.cxx
index 106b489b8d4d..daee3862b571 100644
--- a/salhelper/test/dynamicloader/loader.cxx
+++ b/salhelper/test/dynamicloader/loader.cxx
@@ -34,8 +34,8 @@ class SampleLibLoader
 public:
     SampleLibLoader():
         ::salhelper::ODynamicLoader<SampleLib_Api>
-            (::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SAL_MODULENAME( "samplelib") ) ),
-             ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(SAMPLELIB_INIT_FUNCTION_NAME) ))
+            (::rtl::OUString( SAL_MODULENAME( "samplelib") ),
+             ::rtl::OUString( SAMPLELIB_INIT_FUNCTION_NAME) )
         {}
 
 };
diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx
index 4e2316a7b07d..9c83b3b9775e 100644
--- a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx
+++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx
@@ -105,7 +105,7 @@ void AlignmentPropertyPanel::Initialize()
 
     mpFTLeftIndent->Disable();
     mpMFLeftIndent->Disable();
-    mpMFLeftIndent->SetAccessibleName(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Left Indent")));    //wj acc
+    mpMFLeftIndent->SetAccessibleName(OUString( "Left Indent"));    //wj acc
     aLink = LINK(this, AlignmentPropertyPanel, MFLeftIndentMdyHdl);
     mpMFLeftIndent->SetModifyHdl ( aLink );
 
@@ -116,11 +116,11 @@ void AlignmentPropertyPanel::Initialize()
     mpCBXWrapText->SetClickHdl ( aLink );
 
     //rotation control
-    mpCtrlDial->SetAccessibleName(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Text Orientation")));   //wj acc
+    mpCtrlDial->SetAccessibleName(OUString( "Text Orientation"));   //wj acc
     mpCtrlDial->SetModifyHdl(LINK( this, AlignmentPropertyPanel, RotationHdl));
 
     //rotation
-    mpMtrAngle->SetAccessibleName(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Text Orientation")));   //wj acc
+    mpMtrAngle->SetAccessibleName(OUString( "Text Orientation"));   //wj acc
     mpMtrAngle->SetModifyHdl(LINK( this, AlignmentPropertyPanel, AngleModifiedHdl));
     mpMtrAngle->EnableAutocomplete( false );
 
diff --git a/sc/source/ui/sidebar/CellBorderStylePopup.cxx b/sc/source/ui/sidebar/CellBorderStylePopup.cxx
index 376e37ab1091..5225a5977876 100644
--- a/sc/source/ui/sidebar/CellBorderStylePopup.cxx
+++ b/sc/source/ui/sidebar/CellBorderStylePopup.cxx
@@ -25,7 +25,7 @@ namespace sc { namespace sidebar {
 CellBorderStylePopup::CellBorderStylePopup (
     Window* pParent,
     const ::boost::function<svx::sidebar::PopupControl*(svx::sidebar::PopupContainer*)>& rControlCreator)
-:   Popup(pParent, rControlCreator,  ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CellBorderStyle")))
+:   Popup(pParent, rControlCreator,  ::OUString("CellBorderStyle"))
 {
 }
 
diff --git a/sc/source/ui/sidebar/CellLineStylePopup.cxx b/sc/source/ui/sidebar/CellLineStylePopup.cxx
index 5b5f10ab17ed..dc773a70de63 100644
--- a/sc/source/ui/sidebar/CellLineStylePopup.cxx
+++ b/sc/source/ui/sidebar/CellLineStylePopup.cxx
@@ -25,7 +25,7 @@ namespace sc { namespace sidebar {
 CellLineStylePopup::CellLineStylePopup (
     Window* pParent,
     const ::boost::function<svx::sidebar::PopupControl*(svx::sidebar::PopupContainer*)>& rControlCreator)
-:   Popup(pParent, rControlCreator,  ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CellLineStyle")))
+:   Popup(pParent, rControlCreator, OUString("CellLineStyle"))
 {
 }
 
diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
index b4ce5e4b06a4..65435bbb83d0 100644
--- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
+++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
@@ -89,7 +89,7 @@ void NumberFormatPropertyPanel::Initialize()
     Link aLink = LINK(this, NumberFormatPropertyPanel, NumFormatSelectHdl);
     mpLbCategory->SetSelectHdl ( aLink );
     mpLbCategory->SelectEntryPos(0);
-    mpLbCategory->SetAccessibleName(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Category")));     //wj acc
+    mpLbCategory->SetAccessibleName(OUString( "Category"));     //wj acc
     mpLbCategory->SetDropDownLineCount(mpLbCategory->GetEntryCount());
 
     aLink = LINK(this, NumberFormatPropertyPanel, NumFormatHdl);
@@ -99,8 +99,8 @@ void NumberFormatPropertyPanel::Initialize()
 
     mpEdDecimals->SetModifyHdl( aLink );
     mpEdLeadZeroes->SetModifyHdl( aLink );
-    mpEdDecimals->SetAccessibleName(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Decimal Places")));       //wj acc
-    mpEdLeadZeroes->SetAccessibleName(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Leading Zeroes")));     //wj acc
+    mpEdDecimals->SetAccessibleName(OUString( "Decimal Places"));       //wj acc
+    mpEdLeadZeroes->SetAccessibleName(OUString( "Leading Zeroes"));     //wj acc
     mpBtnNegRed->SetClickHdl( aLink );
     mpBtnThousand->SetClickHdl( aLink );
 
diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx
index 152246706cb6..8886776e76c2 100644
--- a/sc/source/ui/unoobj/datauno.cxx
+++ b/sc/source/ui/unoobj/datauno.cxx
@@ -1669,7 +1669,7 @@ ScDatabaseRangeObj::ScDatabaseRangeObj(ScDocShell* pDocSh, const OUString& rNm)
 
 ScDatabaseRangeObj::ScDatabaseRangeObj(ScDocShell* pDocSh, const SCTAB nTab) :
     pDocShell( pDocSh ),
-    aName(RTL_CONSTASCII_USTRINGPARAM(STR_DB_LOCAL_NONAME)),
+    aName(STR_DB_LOCAL_NONAME),
     aPropSet( lcl_GetDBRangePropertyMap() ),
     bIsUnnamed(true),
     aTab( nTab )
diff --git a/sc/source/ui/vba/vbaworkbook.cxx b/sc/source/ui/vba/vbaworkbook.cxx
index 60974d21ce60..e486087d4139 100644
--- a/sc/source/ui/vba/vbaworkbook.cxx
+++ b/sc/source/ui/vba/vbaworkbook.cxx
@@ -344,7 +344,7 @@ ScVbaWorkbook::SaveAs( const uno::Any& FileName, const uno::Any& FileFormat, con
     FileFormat >>= nFileFormat;
 
     uno::Sequence<  beans::PropertyValue > storeProps(1);
-    storeProps[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FilterName" ) );
+    storeProps[0].Name = "FilterName" ;
 
     setFilterPropsFromFormat( nFileFormat, storeProps );
 
diff --git a/sc/workben/celltrans/parse.py b/sc/workben/celltrans/parse.py
index a80c4311b3f0..937d92f64d28 100644
--- a/sc/workben/celltrans/parse.py
+++ b/sc/workben/celltrans/parse.py
@@ -54,9 +54,9 @@ class LocaleData(object):
         chars += "// " + "-"*75 + "\n"
         chars += "// %s language locale (automatically generated)\n"%getLocaleName(self.locale)
         chars += "// " + "-"*75 + "\n"
-        chars += "static const Locale a" + self.locale.capitalize() + "(OUString(RTL_CONSTASCII_USTRINGPARAM(\""
+        chars += "static const Locale a" + self.locale.capitalize() + "(OUString(\""
         chars += self.locale
-        chars += "\")), OUString(), OUString());\n\n"
+        chars += "\"), OUString(), OUString());\n\n"
 
         # pre instantiations of localized function names.
         funcs = sorted(self.funcList.keys())
diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx
index 52d148b02360..514d8fce88f5 100644
--- a/sd/source/ui/docshell/docshel4.cxx
+++ b/sd/source/ui/docshell/docshel4.cxx
@@ -321,7 +321,7 @@ sal_Bool DrawDocShell::Load( SfxMedium& rMedium )
             SetError( ERRCODE_IO_BROKENPACKAGE, OSL_LOG_PREFIX );
 
         // TODO/LATER: correct error handling?!
-        //pStore->SetError( SVSTREAM_WRONGVERSION, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
+        //pStore->SetError( SVSTREAM_WRONGVERSION, OUString( OSL_LOG_PREFIX ) );
         else
             SetError( ERRCODE_ABORT, OSL_LOG_PREFIX );
     }
diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
index 715ecef83447..71e7b2fa4d60 100644
--- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
@@ -190,7 +190,7 @@ void SlotManager::FuTemporary (SfxRequest& rRequest)
         {
             // Make the slide transition panel visible in the sidebar.
             ::sfx2::sidebar::Sidebar::ShowPanel(
-                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SlideTransitionPanel")),
+                OUString("SlideTransitionPanel"),
                 pShell->GetViewFrame()->GetFrame().GetFrameInterface());
             rRequest.Ignore ();
             break;
diff --git a/sd/source/ui/table/tablefunction.cxx b/sd/source/ui/table/tablefunction.cxx
index d1716f016d10..343357ae6ce1 100644
--- a/sd/source/ui/table/tablefunction.cxx
+++ b/sd/source/ui/table/tablefunction.cxx
@@ -208,7 +208,7 @@ void DrawViewShell::FuTable(SfxRequest& rReq)
             // Make the table design panel visible (expand it) in the
             // sidebar.
             ::sfx2::sidebar::Sidebar::ShowPanel(
-                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ImpressTableDesignPanel")),
+                OUString("ImpressTableDesignPanel"),
                 GetViewFrame()->GetFrame().GetFrameInterface());
         }
 
diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx
index 24f7e2b0a036..39b2cd9630b4 100644
--- a/sd/source/ui/view/ViewShellImplementation.cxx
+++ b/sd/source/ui/view/ViewShellImplementation.cxx
@@ -127,7 +127,7 @@ void ViewShell::Implementation::ProcessModifyPageSlot (
 
             // Make the layout menu visible in the tool pane.
             sfx2::sidebar::Sidebar::ShowPanel(
-                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ImpressLayoutsPanel")),
+                OUString("ImpressLayoutsPanel"),
                 mrViewShell.GetViewFrame()->GetFrame().GetFrameInterface());
             break;
         }
diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx
index d005b46eae04..33ce8ed817ed 100644
--- a/sfx2/source/appl/appuno.cxx
+++ b/sfx2/source/appl/appuno.cxx
@@ -1514,7 +1514,7 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, uno::Sequence<b
         }
         if ( rSet.GetItemState( SID_FAIL_ON_WARNING, sal_False, &pItem ) == SFX_ITEM_SET )
         {
-            pValue[nActProp].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(sFailOnWarning));
+            pValue[nActProp].Name = OUString(sFailOnWarning);
             pValue[nActProp++].Value <<= ( ((SfxBoolItem*)pItem)->GetValue() );
         }
         if ( rSet.GetItemState( SID_VIEW_ID, sal_False, &pItem ) == SFX_ITEM_SET )
diff --git a/sfx2/source/appl/shutdowniconaqua.mm b/sfx2/source/appl/shutdowniconaqua.mm
index 3cc5e7a47ee6..64b0f142c764 100644
--- a/sfx2/source/appl/shutdowniconaqua.mm
+++ b/sfx2/source/appl/shutdowniconaqua.mm
@@ -78,28 +78,28 @@ using namespace ::com::sun::star::util;
         ShutdownIcon::FileOpen();
         break;
     case MI_WRITER:
-        ShutdownIcon::OpenURL( OUString( RTL_CONSTASCII_USTRINGPARAM( WRITER_URL ) ), OUString( RTL_CONSTASCII_USTRINGPARAM( "_default" ) ) );
+        ShutdownIcon::OpenURL( OUString(  WRITER_URL ), OUString( "_default" ) );
         break;
     case MI_CALC:
-        ShutdownIcon::OpenURL( OUString( RTL_CONSTASCII_USTRINGPARAM( CALC_URL ) ), OUString( RTL_CONSTASCII_USTRINGPARAM( "_default" ) ) );
+        ShutdownIcon::OpenURL( OUString( CALC_URL ), OUString( "_default" ) );
         break;
     case MI_IMPRESS:
-        ShutdownIcon::OpenURL( OUString( RTL_CONSTASCII_USTRINGPARAM( IMPRESS_URL ) ), OUString( RTL_CONSTASCII_USTRINGPARAM( "_default" ) ) );
+        ShutdownIcon::OpenURL( OUString( IMPRESS_URL ), OUString( "_default" ) );
         break;
     case MI_DRAW:
-        ShutdownIcon::OpenURL( OUString( RTL_CONSTASCII_USTRINGPARAM( DRAW_URL ) ), OUString( RTL_CONSTASCII_USTRINGPARAM( "_default" ) ) );
+        ShutdownIcon::OpenURL( OUString( DRAW_URL ), OUString( "_default" ) );
         break;
     case MI_BASE:
-        ShutdownIcon::OpenURL( OUString( RTL_CONSTASCII_USTRINGPARAM( BASE_URL ) ), OUString( RTL_CONSTASCII_USTRINGPARAM( "_default" ) ) );
+        ShutdownIcon::OpenURL( OUString( BASE_URL ), OUString( "_default" ) );
         break;
     case MI_MATH:
-        ShutdownIcon::OpenURL( OUString( RTL_CONSTASCII_USTRINGPARAM( MATH_URL ) ), OUString( RTL_CONSTASCII_USTRINGPARAM( "_default" ) ) );
+        ShutdownIcon::OpenURL( OUString( MATH_URL ), OUString( "_default" ) );
         break;
     case MI_TEMPLATE:
         ShutdownIcon::FromTemplate();
         break;
     case MI_STARTMODULE:
-        ShutdownIcon::OpenURL( OUString( RTL_CONSTASCII_USTRINGPARAM( STARTMODULE_URL ) ), OUString( RTL_CONSTASCII_USTRINGPARAM( "_default" ) ) );
+        ShutdownIcon::OpenURL( OUString( STARTMODULE_URL ), OUString( "_default" ) );
         break;
     default:
         break;
@@ -110,7 +110,7 @@ using namespace ::com::sun::star::util;
 {
     (void)pSender;
     // start start module
-    ShutdownIcon::OpenURL( OUString( RTL_CONSTASCII_USTRINGPARAM( STARTMODULE_URL ) ), OUString( RTL_CONSTASCII_USTRINGPARAM( "_default" ) ) );
+    ShutdownIcon::OpenURL( OUString( STARTMODULE_URL ), OUString( "_default" ) );
 }
 
 @end
@@ -262,11 +262,11 @@ class RecentFilesStringLength : public ::cppu::WeakImplHelper1< ::com::sun::star
         int NUM_OF_PICKLIST_ARGS = 3;
         Sequence< PropertyValue > aArgsList( NUM_OF_PICKLIST_ARGS );
         
-        aArgsList[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Referer" ));
-        aArgsList[0].Value = makeAny( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "private:user" ) ) );
+        aArgsList[0].Name = "Referer";
+        aArgsList[0].Value = makeAny( OUString( "private:user" ) );
 
         // documents in the picklist will never be opened as templates
-        aArgsList[1].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "AsTemplate" ));
+        aArgsList[1].Name = "AsTemplate";
         aArgsList[1].Value = makeAny( (sal_Bool) sal_False );
 
         ::rtl::OUString  aFilter( rRecentFile.aFilter );
@@ -278,17 +278,17 @@ class RecentFilesStringLength : public ::cppu::WeakImplHelper1< ::com::sun::star
             if ( nPos < ( aFilter.getLength() - 1 ) )
                 aFilterOptions = aFilter.copy( nPos+1 );
 
-            aArgsList[2].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FilterOptions" ));
+            aArgsList[2].Name = "FilterOptions";
             aArgsList[2].Value = makeAny( aFilterOptions );
 
             aFilter = aFilter.copy( 0, nPos-1 );
             aArgsList.realloc( ++NUM_OF_PICKLIST_ARGS );
         }
 
-        aArgsList[NUM_OF_PICKLIST_ARGS-1].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FilterName" ));
+        aArgsList[NUM_OF_PICKLIST_ARGS-1].Name = "FilterName";
         aArgsList[NUM_OF_PICKLIST_ARGS-1].Value = makeAny( aFilter );
 
-        ShutdownIcon::OpenURL( rRecentFile.aURL, OUString( RTL_CONSTASCII_USTRINGPARAM( "_default" ) ), aArgsList );
+        ShutdownIcon::OpenURL( rRecentFile.aURL, OUString( "_default" ), aArgsList );
     }
 }
 @end
@@ -451,7 +451,7 @@ void aqua_init_systray()
             // insert entry for startcenter
             if( aModuleOptions.IsModuleInstalled( SvtModuleOptions::E_SSTARTMODULE ) )
             {
-                appendMenuItem( pMenu, nil, pShutdownIcon->GetResString( STR_QUICKSTART_STARTCENTER ), MI_STARTMODULE, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "n" ) ) );
+                appendMenuItem( pMenu, nil, pShutdownIcon->GetResString( STR_QUICKSTART_STARTCENTER ), MI_STARTMODULE, OUString( "n" ) ) );
                 if( [NSApp respondsToSelector: @selector(setDockIconClickHandler:)] )
                     [NSApp performSelector:@selector(setDockIconClickHandler:) withObject: pExecute];
                 else
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index cee9c9dfc446..c603adca604c 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -804,7 +804,7 @@ SfxDocumentPage::SfxDocumentPage(Window* pParent, const SfxItemSet& rItemSet)
     // on the main list enable/disable the pushbutton accordingly
     SvtCommandOptions aCmdOptions;
     if ( aCmdOptions.Lookup( SvtCommandOptions::CMDOPTION_DISABLED,
-                             OUString( RTL_CONSTASCII_USTRINGPARAM( DOCUMENT_SIGNATURE_MENU_CMD ) ) ) )
+                             OUString( DOCUMENT_SIGNATURE_MENU_CMD ) ) )
         m_pSignatureBtn->Disable();
 }
 
diff --git a/stoc/source/javaloader/javaloader.cxx b/stoc/source/javaloader/javaloader.cxx
index 8b80ea7363a5..15433cca778f 100644
--- a/stoc/source/javaloader/javaloader.cxx
+++ b/stoc/source/javaloader/javaloader.cxx
@@ -164,8 +164,8 @@ const css::uno::Reference<XImplementationLoader> & JavaComponentLoader::getJavaL
             reinterpret_cast< jvmaccess::UnoVirtualMachine * >(nPointer));
         if (!xVirtualMachine.is())
         {
-            //throw RuntimeException(OUString(RTL_CONSTASCII_USTRINGPARAM(
-            //   "javaloader error - JavaVirtualMachine service could not provide a VM")),
+            //throw RuntimeException(OUString(
+            //   "javaloader error - JavaVirtualMachine service could not provide a VM"),
             //   css::uno::Reference<XInterface>());
             // We must not throw a RuntimeException, because this might end the applications.
             // It is ok if java components
diff --git a/stoc/test/javavm/testjavavm.cxx b/stoc/test/javavm/testjavavm.cxx
index ece8cb16fee5..efe2432b4cab 100644
--- a/stoc/test/javavm/testjavavm.cxx
+++ b/stoc/test/javavm/testjavavm.cxx
@@ -131,8 +131,7 @@ SAL_IMPLEMENT_MAIN()
 
 
         OUString sLibLoader("com.sun.star.loader.SharedLibrary");
-        OUString sJenLib(
-            RTL_CONSTASCII_USTRINGPARAM( "javavm.uno" SAL_DLLEXTENSION ) );
+        OUString sJenLib( "javavm.uno" SAL_DLLEXTENSION );
         xImplReg->registerImplementation(
             sLibLoader, sJenLib, Reference< XSimpleRegistry >() );
 
diff --git a/stoc/test/testconv.cxx b/stoc/test/testconv.cxx
index 600e3ae900e7..415d3c596fed 100644
--- a/stoc/test/testconv.cxx
+++ b/stoc/test/testconv.cxx
@@ -671,8 +671,7 @@ SAL_IMPLEMENT_MAIN()
             xMgr->createInstance("com.sun.star.registry.ImplementationRegistration"), UNO_QUERY );
         OSL_ENSURE( xImplReg.is(), "### no impl reg!" );
 
-        OUString aLibName(
-            RTL_CONSTASCII_USTRINGPARAM("stocservices.uno" SAL_DLLEXTENSION) );
+        OUString aLibName("stocservices.uno" SAL_DLLEXTENSION );
         xImplReg->registerImplementation(
             OUString("com.sun.star.loader.SharedLibrary"),
             aLibName, Reference< XSimpleRegistry >() );
diff --git a/svtools/source/uno/unoevent.cxx b/svtools/source/uno/unoevent.cxx
index 9a4870e6b1fd..9f02391f117b 100644
--- a/svtools/source/uno/unoevent.cxx
+++ b/svtools/source/uno/unoevent.cxx
@@ -52,7 +52,7 @@ SvBaseEventDescriptor::SvBaseEventDescriptor( const SvEventDescription* pSupport
         sJavaScript("JavaScript"),
         sScript("Script"),
         sNone("None"),
-        sServiceName(RTL_CONSTASCII_USTRINGPARAM(sAPI_ServiceName)),
+        sServiceName(sAPI_ServiceName),
         sEmpty(),
         mpSupportedMacroItems(pSupportedMacroItems),
         mnMacroItems(0)
@@ -437,7 +437,7 @@ void SvEventDescriptor::getByName(
 SvDetachedEventDescriptor::SvDetachedEventDescriptor(
     const SvEventDescription* pSupportedMacroItems) :
     SvBaseEventDescriptor(pSupportedMacroItems),
-    sImplName(RTL_CONSTASCII_USTRINGPARAM(sAPI_SvDetachedEventDescriptor))
+    sImplName(sAPI_SvDetachedEventDescriptor)
 {
     // allocate aMacros
     aMacros = new SvxMacro*[mnMacroItems];
diff --git a/svx/source/items/galleryitem.cxx b/svx/source/items/galleryitem.cxx
index eac9fc5fe399..1a88cf5de476 100644
--- a/svx/source/items/galleryitem.cxx
+++ b/svx/source/items/galleryitem.cxx
@@ -51,15 +51,15 @@ bool SvxGalleryItem::QueryValue( css::uno::Any& rVal, sal_uInt8 /* nMemberId */
 {
     css::uno::Sequence< css::beans::PropertyValue > aSeq( SVXGALLERYITEM_PARAMS );
 
-    aSeq[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SVXGALLERYITEM_TYPE ));
+    aSeq[0].Name = SVXGALLERYITEM_TYPE;
     aSeq[0].Value <<= m_nType;
-    aSeq[1].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SVXGALLERYITEM_URL ));
+    aSeq[1].Name = SVXGALLERYITEM_URL;
     aSeq[1].Value <<= m_aURL;
-    aSeq[2].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SVXGALLERYITEM_FILTER ));
+    aSeq[2].Name = SVXGALLERYITEM_FILTER;
     aSeq[2].Value <<= m_aURL;
-    aSeq[3].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SVXGALLERYITEM_DRAWING ));
+    aSeq[3].Name = SVXGALLERYITEM_DRAWING;
     aSeq[3].Value <<= m_xDrawing;
-    aSeq[4].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SVXGALLERYITEM_GRAPHIC ));
+    aSeq[4].Name = SVXGALLERYITEM_GRAPHIC;
     aSeq[4].Value <<= m_xGraphic;
 
     rVal <<= aSeq;
diff --git a/svx/source/sidebar/area/AreaPropertyPanel.cxx b/svx/source/sidebar/area/AreaPropertyPanel.cxx
index 75395df17c79..d82e66417ca4 100644
--- a/svx/source/sidebar/area/AreaPropertyPanel.cxx
+++ b/svx/source/sidebar/area/AreaPropertyPanel.cxx
@@ -154,8 +154,8 @@ void AreaPropertyPanel::Initialize()
     maGradientRect = maGradientLinear;
     maGradientRect.SetGradientStyle(XGRAD_RECT);
 
-    mpLbFillType->SetAccessibleName(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Fill")));    //wj acc
-    mpLbFillAttr->SetAccessibleName(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Fill")));    //wj acc
+    mpLbFillType->SetAccessibleName(OUString( "Fill"));    //wj acc
+    mpLbFillAttr->SetAccessibleName(OUString( "Fill"));    //wj acc
 
     Link aLink = LINK( this, AreaPropertyPanel, SelectFillTypeHdl );
     mpLbFillType->SetSelectHdl( aLink );
@@ -176,11 +176,11 @@ void AreaPropertyPanel::Initialize()
 
     //add end
     mpLBTransType->SetSelectHdl(LINK(this, AreaPropertyPanel, ChangeTrgrTypeHdl_Impl));
-    mpLBTransType->SetAccessibleName(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Transparency")));    //wj acc
+    mpLBTransType->SetAccessibleName(OUString( "Transparency"));    //wj acc
 
     mpMTRTransparent->SetValue( 50 );
     mpMTRTransparent->SetModifyHdl(LINK(this, AreaPropertyPanel, ModifyTransparentHdl_Impl));
-    mpMTRTransparent->SetAccessibleName(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Transparency")));    //wj acc
+    mpMTRTransparent->SetAccessibleName(OUString( "Transparency"));    //wj acc
 
     const sal_uInt16 nIdGradient = mpBTNGradient->GetItemId(UNO_SIDEBARGRADIENT);
     mpBTNGradient->SetItemBits( nIdGradient, mpBTNGradient->GetItemBits( nIdGradient ) | TIB_DROPDOWNONLY );
diff --git a/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx b/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx
index 4ae8c7edcaae..5037c710167e 100644
--- a/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx
+++ b/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx
@@ -27,7 +27,7 @@ AreaTransparencyGradientPopup::AreaTransparencyGradientPopup (
     : Popup(
         pParent,
         rControlCreator,
-        ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Transparency and Gradient")))
+        OUString( "Transparency and Gradient"))
 {
 }
 
diff --git a/svx/source/sidebar/debug/NotYetImplementedPanel.cxx b/svx/source/sidebar/debug/NotYetImplementedPanel.cxx
index 2bb5ae9c1df0..9f060787db2d 100644
--- a/svx/source/sidebar/debug/NotYetImplementedPanel.cxx
+++ b/svx/source/sidebar/debug/NotYetImplementedPanel.cxx
@@ -25,7 +25,7 @@ NotYetImplementedPanel::NotYetImplementedPanel (::Window* pParent)
       maMessageControl(this, 0)
 {
     maMessageControl.setPosSizePixel(5,5, 250,15);
-    maMessageControl.SetText(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("not yet implemented")));
+    maMessageControl.SetText(OUString("not yet implemented"));
 
     maMessageControl.Show();
     Show();
diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
index aa4149416ccb..9a7c275a3b76 100644
--- a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
+++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
@@ -77,18 +77,18 @@ GraphicPropertyPanel::~GraphicPropertyPanel()
 void GraphicPropertyPanel::Initialize()
 {
     mpMtrBrightness->SetModifyHdl( LINK( this, GraphicPropertyPanel, ModifyBrightnessHdl ) );
-    mpMtrBrightness->SetAccessibleName(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Brightness")));
+    mpMtrBrightness->SetAccessibleName(::rtl::OUString( "Brightness"));
     mpMtrContrast->SetModifyHdl( LINK( this, GraphicPropertyPanel, ModifyContrastHdl ) );
-    mpMtrContrast->SetAccessibleName(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Contrast")));
+    mpMtrContrast->SetAccessibleName(::rtl::OUString( "Contrast"));
     mpMtrTrans->SetModifyHdl( LINK( this, GraphicPropertyPanel, ModifyTransHdl ) );
-    mpMtrTrans->SetAccessibleName(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Transparency")));
+    mpMtrTrans->SetAccessibleName(::rtl::OUString( "Transparency"));
 
     mpLBColorMode->InsertEntry(SVX_RESSTR(RID_SVXSTR_GRAFMODE_STANDARD));
     mpLBColorMode->InsertEntry(SVX_RESSTR(RID_SVXSTR_GRAFMODE_GREYS));
     mpLBColorMode->InsertEntry(SVX_RESSTR(RID_SVXSTR_GRAFMODE_MONO));
     mpLBColorMode->InsertEntry(SVX_RESSTR(RID_SVXSTR_GRAFMODE_WATERMARK));
     mpLBColorMode->SetSelectHdl( LINK( this, GraphicPropertyPanel, ClickColorModeHdl ));
-    mpLBColorMode->SetAccessibleName(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Color mode")));
+    mpLBColorMode->SetAccessibleName(::rtl::OUString( "Color mode"));
 
     mpMtrRed->SetModifyHdl( LINK( this, GraphicPropertyPanel, RedHdl ) );
     mpMtrGreen->SetModifyHdl( LINK( this, GraphicPropertyPanel, GreenHdl ) );
@@ -97,7 +97,7 @@ void GraphicPropertyPanel::Initialize()
     mpMtrRed->SetAccessibleName(mpMtrRed->GetQuickHelpText());
     mpMtrGreen->SetAccessibleName(mpMtrGreen->GetQuickHelpText());
     mpMtrBlue->SetAccessibleName(mpMtrBlue->GetQuickHelpText());
-    mpMtrGamma->SetAccessibleName(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Gamma value")));
+    mpMtrGamma->SetAccessibleName(::rtl::OUString( "Gamma value"));
 
     mpMtrRed->SetAccessibleRelationLabeledBy(mpMtrRed);
     mpMtrGreen->SetAccessibleRelationLabeledBy(mpMtrGreen);
diff --git a/svx/source/sidebar/line/LinePropertyPanel.cxx b/svx/source/sidebar/line/LinePropertyPanel.cxx
index 00920f2ff2db..e3b3b5e88079 100644
--- a/svx/source/sidebar/line/LinePropertyPanel.cxx
+++ b/svx/source/sidebar/line/LinePropertyPanel.cxx
@@ -239,7 +239,7 @@ void LinePropertyPanel::Initialize()
     SelectLineStyle();
     aLink = LINK( this, LinePropertyPanel, ChangeLineStyleHdl );
     mpLBStyle->SetSelectHdl( aLink );
-    mpLBStyle->SetAccessibleName(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Style")));
+    mpLBStyle->SetAccessibleName(OUString( "Style"));
     mpLBStyle->AdaptDropDownLineCountToMaximum();
 
     const sal_uInt16 nIdWidth = mpTBWidth->GetItemId(UNO_SELECTWIDTH);
@@ -254,16 +254,16 @@ void LinePropertyPanel::Initialize()
     SelectEndStyle(false);
     aLink = LINK( this, LinePropertyPanel, ChangeStartHdl );
     mpLBStart->SetSelectHdl( aLink );
-    mpLBStart->SetAccessibleName(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Beginning Style"))); //wj acc
+    mpLBStart->SetAccessibleName(OUString( "Beginning Style")); //wj acc
     mpLBStart->AdaptDropDownLineCountToMaximum();
     aLink = LINK( this, LinePropertyPanel, ChangeEndHdl );
     mpLBEnd->SetSelectHdl( aLink );
-    mpLBEnd->SetAccessibleName(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Ending Style")));  //wj acc
+    mpLBEnd->SetAccessibleName(OUString( "Ending Style"));  //wj acc
     mpLBEnd->AdaptDropDownLineCountToMaximum();
 
     aLink = LINK(this, LinePropertyPanel, ChangeTransparentHdl);
     mpMFTransparent->SetModifyHdl(aLink);
-    mpMFTransparent->SetAccessibleName(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Transparency")));  //wj acc
+    mpMFTransparent->SetAccessibleName(OUString( "Transparency"));  //wj acc
 
     mpTBWidth->SetAccessibleRelationLabeledBy(mpFTWidth);
     mpTBColor->SetAccessibleRelationLabeledBy(mpFTColor);
@@ -274,11 +274,11 @@ void LinePropertyPanel::Initialize()
 
     aLink = LINK( this, LinePropertyPanel, ChangeEdgeStyleHdl );
     mpLBEdgeStyle->SetSelectHdl( aLink );
-    mpLBEdgeStyle->SetAccessibleName(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Corner Style")));
+    mpLBEdgeStyle->SetAccessibleName(OUString( "Corner Style"));
 
     aLink = LINK( this, LinePropertyPanel, ChangeCapStyleHdl );
     mpLBCapStyle->SetSelectHdl( aLink );
-    mpLBCapStyle->SetAccessibleName(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Cap Style")));
+    mpLBCapStyle->SetAccessibleName(OUString( "Cap Style"));
 }
 
 
diff --git a/svx/source/sidebar/line/LineWidthPopup.cxx b/svx/source/sidebar/line/LineWidthPopup.cxx
index 49596941147a..63d6fddb2ab1 100644
--- a/svx/source/sidebar/line/LineWidthPopup.cxx
+++ b/svx/source/sidebar/line/LineWidthPopup.cxx
@@ -32,7 +32,7 @@ LineWidthPopup::LineWidthPopup (
     : Popup(
         pParent,
         rControlCreator,
-        ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Width")))
+        OUString( "Width"))
 {
     SetPopupModeEndHandler(::boost::bind(&LineWidthPopup::PopupModeEndCallback, this));
 }
@@ -68,7 +68,7 @@ void LineWidthPopup::PopupModeEndCallback (void)
         {
             SvtViewOptions aWinOpt( E_WINDOW, SIDEBAR_LINE_WIDTH_GLOBAL_VALUE );
             ::com::sun::star::uno::Sequence < ::com::sun::star::beans::NamedValue > aSeq(1);
-            aSeq[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("LineWidth") );
+            aSeq[0].Name = "LineWidth";
             aSeq[0].Value <<= ::rtl::OUString::number(pControl->GetTmpCustomWidth());
             aWinOpt.SetUserData( aSeq );
         }
diff --git a/svx/source/sidebar/paragraph/ParaBulletsPopup.cxx b/svx/source/sidebar/paragraph/ParaBulletsPopup.cxx
index cd9314827f97..5ab6146fbafa 100644
--- a/svx/source/sidebar/paragraph/ParaBulletsPopup.cxx
+++ b/svx/source/sidebar/paragraph/ParaBulletsPopup.cxx
@@ -28,7 +28,7 @@ ParaBulletsPopup::ParaBulletsPopup (
     : Popup(
         pParent,
         rControlCreator,
-        ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Paragraph Bullets")))
+        OUString( "Paragraph Bullets"))
 {
 }
 
diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
index b37110968de5..3ea05beea1f1 100644
--- a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
+++ b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
@@ -166,12 +166,12 @@ void ParaLineSpacingControl::PopupModeEndCallback()
 
         SvtViewOptions aWinOpt( E_WINDOW, LSP_POS_GLOBAL_VALUE );
         ::com::sun::star::uno::Sequence < ::com::sun::star::beans::NamedValue > aSeq(1);
-        aSeq[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("maLinePos") );
+        aSeq[0].Name = "maLinePos";
         aSeq[0].Value <<= ::rtl::OUString::number(maPos);
         aWinOpt.SetUserData( aSeq );
 
         SvtViewOptions aWinOpt2( E_WINDOW, LSP_LV_GLOBAL_VALUE );
-        aSeq[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("maLineValue") );
+        aSeq[0].Name = "maLineValue";
         aSeq[0].Value <<= ::rtl::OUString::number(maValue);
         aWinOpt2.SetUserData( aSeq );
     }
diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx b/svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx
index 20f942359bda..877bf4cfa064 100644
--- a/svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx
+++ b/svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx
@@ -28,7 +28,7 @@ ParaLineSpacingPopup::ParaLineSpacingPopup (
     : Popup(
         pParent,
         rControlCreator,
-        ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Paragraph Line Spacing")))
+        OUString( "Paragraph Line Spacing"))
 {
     SetPopupModeEndHandler(::boost::bind(&ParaLineSpacingPopup::PopupModeEndCallback, this));
 }
@@ -65,7 +65,7 @@ void ParaLineSpacingPopup::PopupModeEndCallback (void)
     {
         SvtViewOptions aWinOpt( E_WINDOW, SIDEBAR_SPACING_GLOBAL_VALUE );
         ::com::sun::star::uno::Sequence < ::com::sun::star::beans::NamedValue > aSeq(1);
-        aSeq[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Spacing") );
+        aSeq[0].Name = "Spacing";
         aSeq[0].Value <<= ::rtl::OUString( String::CreateFromInt32( pControl->GetLastCustomValue() ));
         aWinOpt.SetUserData( aSeq );
 
diff --git a/svx/source/sidebar/paragraph/ParaNumberingPopup.cxx b/svx/source/sidebar/paragraph/ParaNumberingPopup.cxx
index de4bc5c5e9a5..ae25ba681e9a 100644
--- a/svx/source/sidebar/paragraph/ParaNumberingPopup.cxx
+++ b/svx/source/sidebar/paragraph/ParaNumberingPopup.cxx
@@ -28,7 +28,7 @@ ParaNumberingPopup::ParaNumberingPopup (
     : Popup(
         pParent,
         rControlCreator,
-        ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Paragraph Numbering")))
+        OUString( "Paragraph Numbering"))
 {
 }
 
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
index 9b1aa3cbe7c2..acaaff4f7a7a 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
@@ -152,14 +152,14 @@ void PosSizePropertyPanel::Initialize()
     //Position : Horizontal / Vertical
     mpMtrPosX->SetModifyHdl( LINK( this, PosSizePropertyPanel, ChangePosXHdl ) );
     mpMtrPosY->SetModifyHdl( LINK( this, PosSizePropertyPanel, ChangePosYHdl ) );
-    mpMtrPosX->SetAccessibleName(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Horizontal")));  //wj acc
-    mpMtrPosY->SetAccessibleName(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Vertical")));        //wj acc
+    mpMtrPosX->SetAccessibleName(OUString( "Horizontal"));  //wj acc
+    mpMtrPosY->SetAccessibleName(OUString( "Vertical"));        //wj acc
 
     //Size : Width / Height
     mpMtrWidth->SetModifyHdl( LINK( this, PosSizePropertyPanel, ChangeWidthHdl ) );
     mpMtrHeight->SetModifyHdl( LINK( this, PosSizePropertyPanel, ChangeHeightHdl ) );
-    mpMtrWidth->SetAccessibleName(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Width")));  //wj acc
-    mpMtrHeight->SetAccessibleName(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Height")));    //wj acc
+    mpMtrWidth->SetAccessibleName(OUString( "Width"));  //wj acc
+    mpMtrHeight->SetAccessibleName(OUString( "Height"));    //wj acc
 
     //Size : Keep ratio
     mpCbxScale->SetClickHdl( LINK( this, PosSizePropertyPanel, ClickAutoHdl ) );
@@ -167,7 +167,7 @@ void PosSizePropertyPanel::Initialize()
     //rotation:
     mpMtrAngle->SetModifyHdl(LINK( this, PosSizePropertyPanel, AngleModifiedHdl));
     mpMtrAngle->EnableAutocomplete( false );
-    mpMtrAngle->SetAccessibleName(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Rotation")));   //wj acc
+    mpMtrAngle->SetAccessibleName(OUString( "Rotation"));   //wj acc
 
     //rotation control
     mpDial->SetModifyHdl(LINK( this, PosSizePropertyPanel, RotationHdl));
diff --git a/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx b/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx
index 56d8e8882f73..29d0bf1a9e8b 100644
--- a/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx
+++ b/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx
@@ -28,7 +28,7 @@ TextCharacterSpacingPopup::TextCharacterSpacingPopup (
     : Popup(
         pParent,
         rControlCreator,
-        ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Character Spacing")))
+        OUString( "Character Spacing"))
 {
     SetPopupModeEndHandler(::boost::bind(&TextCharacterSpacingPopup::PopupModeEndCallback, this));
 }
@@ -63,7 +63,7 @@ void TextCharacterSpacingPopup::PopupModeEndCallback (void)
     {
         SvtViewOptions aWinOpt( E_WINDOW, SIDEBAR_SPACING_GLOBAL_VALUE );
         ::com::sun::star::uno::Sequence < ::com::sun::star::beans::NamedValue > aSeq(1);
-        aSeq[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Spacing") );
+        aSeq[0].Name = "Spacing";
         aSeq[0].Value <<= ::rtl::OUString::number(pControl->GetLastCustomValue());
         aWinOpt.SetUserData( aSeq );
 
diff --git a/svx/source/sidebar/text/TextUnderlinePopup.cxx b/svx/source/sidebar/text/TextUnderlinePopup.cxx
index 76fc10a1d29a..0b4e4e6da6fc 100644
--- a/svx/source/sidebar/text/TextUnderlinePopup.cxx
+++ b/svx/source/sidebar/text/TextUnderlinePopup.cxx
@@ -27,7 +27,7 @@ TextUnderlinePopup::TextUnderlinePopup (
     : Popup(
         pParent,
         rControlCreator,
-        ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Character Spacing")))
+        OUString( "Character Spacing"))
 {
 }
 
diff --git a/svx/source/sidebar/tools/ColorPopup.cxx b/svx/source/sidebar/tools/ColorPopup.cxx
index ed51592e6b9b..175d2778405c 100644
--- a/svx/source/sidebar/tools/ColorPopup.cxx
+++ b/svx/source/sidebar/tools/ColorPopup.cxx
@@ -27,7 +27,7 @@ ColorPopup::ColorPopup (
     : Popup(
         pParent,
         rControlCreator,
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Color")))
+        OUString("Color"))
 {
 }
 
diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx
index 782f3d0309aa..fe66f10884f3 100644
--- a/svx/source/unodraw/unomod.cxx
+++ b/svx/source/unodraw/unomod.cxx
@@ -727,7 +727,7 @@ sal_Bool SAL_CALL SvxUnoDrawPagesAccess::supportsService( const OUString& Servic
 
 uno::Sequence< OUString > SAL_CALL SvxUnoDrawPagesAccess::getSupportedServiceNames(  ) throw(uno::RuntimeException)
 {
-    OUString aService( RTL_CONSTASCII_USTRINGPARAM( pSvxUnoDrawPagesAccessService ) );
+    OUString aService( pSvxUnoDrawPagesAccessService );
     uno::Sequence< OUString > aSeq( &aService, 1 );
     return aSeq;
 }
diff --git a/svx/source/xml/xmlxtimp.cxx b/svx/source/xml/xmlxtimp.cxx
index 5eba668b376d..246d0940302a 100644
--- a/svx/source/xml/xmlxtimp.cxx
+++ b/svx/source/xml/xmlxtimp.cxx
@@ -336,16 +336,16 @@ SvxXMLXTableImport::SvxXMLXTableImport(
 {
     SetGraphicResolver( xGrfResolver );
 
-    GetNamespaceMap().Add( OUString( RTL_CONSTASCII_USTRINGPARAM ( sXML_np__ooo ) ), GetXMLToken(XML_N_OOO), XML_NAMESPACE_OOO );
-    GetNamespaceMap().Add( OUString( RTL_CONSTASCII_USTRINGPARAM ( sXML_np__office ) ), GetXMLToken(XML_N_OFFICE), XML_NAMESPACE_OFFICE );
-    GetNamespaceMap().Add( OUString( RTL_CONSTASCII_USTRINGPARAM ( sXML_np__draw ) ), GetXMLToken(XML_N_DRAW), XML_NAMESPACE_DRAW );
-    GetNamespaceMap().Add( OUString( RTL_CONSTASCII_USTRINGPARAM ( sXML_np__xlink ) ), GetXMLToken(XML_N_XLINK), XML_NAMESPACE_XLINK );
+    GetNamespaceMap().Add( OUString( sXML_np__ooo ), GetXMLToken(XML_N_OOO), XML_NAMESPACE_OOO );
+    GetNamespaceMap().Add( OUString( sXML_np__office ), GetXMLToken(XML_N_OFFICE), XML_NAMESPACE_OFFICE );
+    GetNamespaceMap().Add( OUString( sXML_np__draw ), GetXMLToken(XML_N_DRAW), XML_NAMESPACE_DRAW );
+    GetNamespaceMap().Add( OUString( sXML_np__xlink ), GetXMLToken(XML_N_XLINK), XML_NAMESPACE_XLINK );
 
     // OOo namespaces for reading OOo 1.1 files
-    GetNamespaceMap().Add( OUString( RTL_CONSTASCII_USTRINGPARAM ( sXML_np__office_ooo ) ),
+    GetNamespaceMap().Add( OUString( sXML_np__office_ooo ),
                         GetXMLToken(XML_N_OFFICE_OOO),
                         XML_NAMESPACE_OFFICE );
-    GetNamespaceMap().Add( OUString( RTL_CONSTASCII_USTRINGPARAM ( sXML_np__draw_ooo ) ),
+    GetNamespaceMap().Add( OUString( sXML_np__draw_ooo ),
                         GetXMLToken(XML_N_DRAW_OOO),
                         XML_NAMESPACE_DRAW );
 }
diff --git a/svx/source/xoutdev/xtable.cxx b/svx/source/xoutdev/xtable.cxx
index e0d0d4b0da36..755a7038228a 100644
--- a/svx/source/xoutdev/xtable.cxx
+++ b/svx/source/xoutdev/xtable.cxx
@@ -124,7 +124,7 @@ XPropertyList::XPropertyList(
     XPropertyListType type,
     const OUString& rPath, const OUString& rReferer
 ) : meType           ( type ),
-    maName           ( RTL_CONSTASCII_USTRINGPARAM( "standard" ) ),
+    maName           ( "standard" ),
     maPath           ( rPath ),
     maReferer        ( rReferer ),
     mbListDirty      ( true ),
diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx
index 9e308fdc8f3a..83361354e817 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -1257,7 +1257,7 @@ void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno::
 
                 // the package URL based graphics are handled in different way currently
                 // TODO/LATER: actually this is the correct place to handle them
-                OUString aGraphicProtocol( RTL_CONSTASCII_USTRINGPARAM( sGraphicObjectProtocol ) );
+                OUString aGraphicProtocol( sGraphicObjectProtocol );
                 if( aGrfUrl.startsWith( aGraphicProtocol ) )
                 {
                     OString sId(OUStringToOString(
diff --git a/sw/source/ui/sidebar/PageMarginControl.cxx b/sw/source/ui/sidebar/PageMarginControl.cxx
index 2a59a77135cb..c3d8c8081ba9 100644
--- a/sw/source/ui/sidebar/PageMarginControl.cxx
+++ b/sw/source/ui/sidebar/PageMarginControl.cxx
@@ -491,27 +491,27 @@ void PageMarginControl::StoreUserCustomValues()
     ::com::sun::star::uno::Sequence < ::com::sun::star::beans::NamedValue > aSeq(1);
     SvtViewOptions aWinOpt( E_WINDOW, SWPAGE_LEFT_GVALUE );
 
-    aSeq[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("mnPageLeftMargin") );
+    aSeq[0].Name = "mnPageLeftMargin";
     aSeq[0].Value <<= ::rtl::OUString::number( mnPageLeftMargin );
     aWinOpt.SetUserData( aSeq );
 
     SvtViewOptions aWinOpt2( E_WINDOW, SWPAGE_RIGHT_GVALUE );
-    aSeq[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("mnPageRightMargin") );
+    aSeq[0].Name = "mnPageRightMargin";
     aSeq[0].Value <<= ::rtl::OUString::number( mnPageRightMargin );
     aWinOpt2.SetUserData( aSeq );
 
     SvtViewOptions aWinOpt3( E_WINDOW, SWPAGE_TOP_GVALUE );
-    aSeq[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("mnPageTopMargin") );
+    aSeq[0].Name = "mnPageTopMargin";
     aSeq[0].Value <<= ::rtl::OUString::number( mnPageTopMargin );
     aWinOpt3.SetUserData( aSeq );
 
     SvtViewOptions aWinOpt4( E_WINDOW, SWPAGE_DOWN_GVALUE );
-    aSeq[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("mnPageBottomMargin") );
+    aSeq[0].Name = "mnPageBottomMargin";
     aSeq[0].Value <<= ::rtl::OUString::number( mnPageBottomMargin );
     aWinOpt4.SetUserData( aSeq );
 
     SvtViewOptions aWinOpt5( E_WINDOW, SWPAGE_MIRROR_GVALUE );
-    aSeq[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("mbMirrored") );
+    aSeq[0].Name = "mbMirrored";
     aSeq[0].Value <<= ::rtl::OUString::number( (mbMirrored ? 1 : 0) );
     aWinOpt5.SetUserData( aSeq );
 }
diff --git a/testtools/source/performance/ubobject.cxx b/testtools/source/performance/ubobject.cxx
index 9098eb726a0b..404e14fc5a79 100644
--- a/testtools/source/performance/ubobject.cxx
+++ b/testtools/source/performance/ubobject.cxx
@@ -47,7 +47,7 @@ namespace benchmark_object
 //--------------------------------------------------------------------------------------------------
 inline static Sequence< OUString > getSupportedServiceNames()
 {
-    OUString aName( RTL_CONSTASCII_USTRINGPARAM(SERVICENAME) );
+    OUString aName( SERVICENAME);
     return Sequence< OUString >( &aName, 1 );
 }
 
@@ -205,7 +205,7 @@ public:
 OUString ServiceImpl::getImplementationName()
     throw (RuntimeException)
 {
-    return OUString( RTL_CONSTASCII_USTRINGPARAM(IMPLNAME) );
+    return OUString( IMPLNAME );
 }
 //__________________________________________________________________________________________________
 sal_Bool ServiceImpl::supportsService( const OUString & rServiceName )
@@ -247,8 +247,8 @@ sal_Bool SAL_CALL component_writeInfo(
         {
             Reference< XRegistryKey > xNewKey(
                 reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey(
-                    OUString( RTL_CONSTASCII_USTRINGPARAM("/" IMPLNAME "/UNO/SERVICES") ) ) );
-            xNewKey->createKey( OUString( RTL_CONSTASCII_USTRINGPARAM(SERVICENAME) ) );
+                    OUString( ("/" IMPLNAME "/UNO/SERVICES") ) ) );
+            xNewKey->createKey( OUString( SERVICENAME ) );
 
             return sal_True;
         }
@@ -269,7 +269,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     {
         Reference< XSingleServiceFactory > xFactory( createSingleFactory(
             reinterpret_cast< XMultiServiceFactory * >( pServiceManager ),
-            OUString( RTL_CONSTASCII_USTRINGPARAM(IMPLNAME) ),
+            OUString( IMPLNAME ),
             benchmark_object::ServiceImpl_create,
             benchmark_object::getSupportedServiceNames() ) );
 
diff --git a/testtools/source/performance/ubtest.cxx b/testtools/source/performance/ubtest.cxx
index 96b895ce82fe..0223891592c6 100644
--- a/testtools/source/performance/ubtest.cxx
+++ b/testtools/source/performance/ubtest.cxx
@@ -177,7 +177,7 @@ Reference< XSingleServiceFactory > loadLibComponentFactory(
         void * pSym;
 
         // ========================= LATEST VERSION =========================
-        OUString aGetEnvName( RTL_CONSTASCII_USTRINGPARAM(COMPONENT_GETENV) );
+        OUString aGetEnvName( COMPONENT_GETENV );
         if (pSym = osl_getSymbol( lib, aGetEnvName.pData ))
         {
             uno_Environment * pCurrentEnv = 0;
@@ -196,14 +196,14 @@ Reference< XSingleServiceFactory > loadLibComponentFactory(
                     uno_getEnvironment( &pEnv, aEnvTypeName.pData, 0 );
                 if (pEnv)
                 {
-                    OUString aCppEnvTypeName( RTL_CONSTASCII_USTRINGPARAM(CPPU_CURRENT_LANGUAGE_BINDING_NAME) );
+                    OUString aCppEnvTypeName( CPPU_CURRENT_LANGUAGE_BINDING_NAME );
                     uno_getEnvironment( &pCurrentEnv, aCppEnvTypeName.pData, 0 );
                     if (pCurrentEnv)
                         bNeedsMapping = (pEnv != pCurrentEnv);
                 }
             }
 
-            OUString aGetFactoryName( RTL_CONSTASCII_USTRINGPARAM(COMPONENT_GETFACTORY) );
+            OUString aGetFactoryName( COMPONENT_GETFACTORY );
             if (pSym = osl_getSymbol( lib, aGetFactoryName.pData ))
             {
                 OString aImplName( OUStringToOString( rImplName, RTL_TEXTENCODING_ASCII_US ) );
@@ -262,11 +262,11 @@ Reference< XSingleServiceFactory > loadLibComponentFactory(
         // ========================= PREVIOUS VERSION =========================
         else
         {
-            OUString aGetFactoryName( RTL_CONSTASCII_USTRINGPARAM(CREATE_COMPONENT_FACTORY_FUNCTION) );
+            OUString aGetFactoryName( CREATE_COMPONENT_FACTORY_FUNCTION );
             if (pSym = osl_getSymbol( lib, aGetFactoryName.pData ))
             {
-                OUString aCppEnvTypeName( RTL_CONSTASCII_USTRINGPARAM(CPPU_CURRENT_LANGUAGE_BINDING_NAME) );
-                OUString aUnoEnvTypeName( RTL_CONSTASCII_USTRINGPARAM(UNO_LB_UNO) );
+                OUString aCppEnvTypeName( CPPU_CURRENT_LANGUAGE_BINDING_NAME );
+                OUString aUnoEnvTypeName( UNO_LB_UNO );
                 Mapping aUno2Cpp( aUnoEnvTypeName, aCppEnvTypeName );
                 Mapping aCpp2Uno( aCppEnvTypeName, aUnoEnvTypeName );
                 OSL_ENSURE( aUno2Cpp.is() && aCpp2Uno.is(), "### cannot get uno mappings!" );
@@ -394,7 +394,7 @@ static void createInstance( Reference< T > & rxOut,
 //--------------------------------------------------------------------------------------------------
 inline static Sequence< OUString > getSupportedServiceNames()
 {
-    OUString aName( RTL_CONSTASCII_USTRINGPARAM(SERVICENAME) );
+    OUString aName( SERVICENAME );
     return Sequence< OUString >( &aName, 1 );
 }
 
@@ -443,7 +443,7 @@ static Reference< XInterface > SAL_CALL TestImpl_create( const Reference< XMulti
 OUString TestImpl::getImplementationName()
     throw (RuntimeException)
 {
-    return OUString( RTL_CONSTASCII_USTRINGPARAM(IMPLNAME) );
+    return OUString( IMPLNAME );
 }
 //__________________________________________________________________________________________________
 sal_Bool TestImpl::supportsService( const OUString & rServiceName )
@@ -1043,7 +1043,7 @@ sal_Int32 TestImpl::run( const Sequence< OUString > & rArgs )
         {
             // in process uno dispatch
             Environment aCppEnv, aAnoCppEnv;
-            OUString aCurrentLanguageBindingName( RTL_CONSTASCII_USTRINGPARAM(CPPU_CURRENT_LANGUAGE_BINDING_NAME) );
+            OUString aCurrentLanguageBindingName( CPPU_CURRENT_LANGUAGE_BINDING_NAME );
             uno_getEnvironment( reinterpret_cast< uno_Environment ** >( &aCppEnv ),
                                 aCurrentLanguageBindingName.pData, 0 );
             // anonymous
@@ -1143,7 +1143,7 @@ sal_Int32 TestImpl::run( const Sequence< OUString > & rArgs )
             // remote
             OUString aUnoUrl( extractParam( rArgs, OUString("url") ) );
             if (! aUnoUrl.getLength())
-                throw RuntimeException( OUString( RTL_CONSTASCII_USTRINGPARAM("performance test r(emote) needs additional uno url!") ), Reference< XInterface >() );
+                throw RuntimeException( OUString( "performance test r(emote) needs additional uno url!" ), Reference< XInterface >() );
 
             // connect and resolve outer process object
             Reference< XInterface > xResolvedObject( resolveObject( aUnoUrl ) );
@@ -1274,8 +1274,8 @@ sal_Bool SAL_CALL component_writeInfo(
         {
             Reference< XRegistryKey > xNewKey(
                 reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey(
-                    OUString( RTL_CONSTASCII_USTRINGPARAM("/" IMPLNAME "/UNO/SERVICES") ) ) );
-            xNewKey->createKey( OUString( RTL_CONSTASCII_USTRINGPARAM(SERVICENAME) ) );
+                    OUString( "/" IMPLNAME "/UNO/SERVICES" ) ) );
+            xNewKey->createKey( OUString( SERVICENAME ) );
 
             return sal_True;
         }
@@ -1296,7 +1296,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     {
         Reference< XSingleServiceFactory > xFactory( createSingleFactory(
             reinterpret_cast< XMultiServiceFactory * >( pServiceManager ),
-            OUString( RTL_CONSTASCII_USTRINGPARAM(IMPLNAME) ),
+            OUString( IMPLNAME ),
             benchmark_test::TestImpl_create,
             benchmark_test::getSupportedServiceNames() ) );
 
diff --git a/ucb/source/ucp/webdav/webdavcontent.cxx b/ucb/source/ucp/webdav/webdavcontent.cxx
index 6269bd1a8e82..b81c3c031876 100644
--- a/ucb/source/ucp/webdav/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav/webdavcontent.cxx
@@ -91,8 +91,8 @@ static void lcl_sendPartialGETRequest( bool &bError,
     DAVRequestHeaders aPartialGet;
     aPartialGet.push_back(
         DAVRequestHeader(
-            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Range" ) ),
-            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "bytes=0-0" ))));
+            OUString( "Range" ),
+            OUString( "bytes=0-0" )));
 
     for ( std::vector< rtl::OUString >::const_iterator it = aHeaderNames.begin();
             it != aHeaderNames.end(); ++it )
@@ -108,8 +108,8 @@ static void lcl_sendPartialGETRequest( bool &bError,
     {
         // we need to know if the server accepts range requests for a resource
         // and the range unit it uses
-        aHeaderNames.push_back( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Accept-Ranges" ) ) );
-        aHeaderNames.push_back( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Content-Range" ) ) );
+        aHeaderNames.push_back( OUString( "Accept-Ranges" ) );
+        aHeaderNames.push_back( OUString( "Content-Range" ) );
     }
     try
     {
@@ -734,8 +734,7 @@ uno::Any SAL_CALL Content::execute(
         {
             ucbhelper::cancelCommandExecution(
                 uno::makeAny( lang::IllegalArgumentException(
-                                    OUString::createFromAscii(
-                                        "Wrong argument type!" ),
+                                    OUString( "Wrong argument type!" ),
                                     static_cast< cppu::OWeakObject * >( this ),
                                     -1 ) ),
                 Environment );
@@ -751,8 +750,7 @@ uno::Any SAL_CALL Content::execute(
         {
             ucbhelper::cancelCommandExecution(
                 uno::makeAny( lang::IllegalArgumentException(
-                                    rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
-                                        "Wrong argument type!" )),
+                                    OUString( "Wrong argument type!" ),
                                     static_cast< cppu::OWeakObject * >( this ),
                                     -1 ) ),
                 Environment );
@@ -784,8 +782,7 @@ uno::Any SAL_CALL Content::execute(
         {
             ucbhelper::cancelCommandExecution(
                 uno::makeAny( lang::IllegalArgumentException(
-                                    rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
-                                        "Wrong argument type!" )),
+                                    OUString( "Wrong argument type!" ),
                                     static_cast< cppu::OWeakObject * >( this ),
                                     -1 ) ),
                 Environment );
@@ -872,23 +869,20 @@ throw( beans::PropertyExistException,
     // check property Name
     if ( !aProperty.Name.getLength() )
         throw lang::IllegalArgumentException(
-            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
-                "\"addProperty\" with empty Property.Name")),
+            OUString( "\"addProperty\" with empty Property.Name"),
             static_cast< ::cppu::OWeakObject * >( this ),
             -1 );
 
     // Check property type.
     if ( !UCBDeadPropertyValue::supportsType( aProperty.Type ) )
         throw beans::IllegalTypeException(
-            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
-                "\"addProperty\" unsupported Property.Type")),
+            OUString( "\"addProperty\" unsupported Property.Type"),
             static_cast< ::cppu::OWeakObject * >( this ) );
 
     // check default value
     if ( aDefaultValue.hasValue() && aDefaultValue.getValueType() != aProperty.Type )
         throw beans::IllegalTypeException(
-            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
-                "\"addProperty\" DefaultValue does not match Property.Type")),
+            OUString( "\"addProperty\" DefaultValue does not match Property.Type"),
             static_cast< ::cppu::OWeakObject * >( this ) );
 
     //////////////////////////////////////////////////////////////////////
diff --git a/ucb/source/ucp/webdav/webdavcontentcaps.cxx b/ucb/source/ucp/webdav/webdavcontentcaps.cxx
index 89331674f011..921d8e79378f 100644
--- a/ucb/source/ucp/webdav/webdavcontentcaps.cxx
+++ b/ucb/source/ucp/webdav/webdavcontentcaps.cxx
@@ -556,13 +556,13 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
                     ucb::PostCommandArgument2 * >( 0 ) ) );
     aCmdInfo[ 8 ] =
             ucb::CommandInfo(
-                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "addProperty" ) ),
+                OUString( "addProperty" ),
                 -1,
                 getCppuType( static_cast<
                     ucb::PropertyCommandArgument * >( 0 ) ) );
     aCmdInfo[ 9 ] =
             ucb::CommandInfo(
-                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "removeProperty" ) ),
+                OUString( "removeProperty" ),
                 -1,
                 getCppuType( static_cast<
                     rtl::OUString * >( 0 ) ) );
diff --git a/ucb/source/ucp/webdav/webdavprovider.cxx b/ucb/source/ucp/webdav/webdavprovider.cxx
index cb2dc41232fe..2389dc479b3f 100644
--- a/ucb/source/ucp/webdav/webdavprovider.cxx
+++ b/ucb/source/ucp/webdav/webdavprovider.cxx
@@ -77,25 +77,23 @@ ContentProvider::ContentProvider(
             ::comphelper::getProcessComponentContext() );
         uno::Reference< lang::XMultiServiceFactory > xConfigProvider(
             xContext->getServiceManager()->createInstanceWithContext(
-                OUString(RTL_CONSTASCII_USTRINGPARAM(
-                                  "com.sun.star.configuration.ConfigurationProvider")), xContext),
+                OUString("com.sun.star.configuration.ConfigurationProvider"), xContext),
             uno::UNO_QUERY_THROW );
 
         beans::NamedValue aNodePath;
-        aNodePath.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "nodepath" ) );
-        aNodePath.Value <<= OUString( RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup/Product"));
+        aNodePath.Name = "nodepath";
+        aNodePath.Value <<= OUString( "/org.openoffice.Setup/Product");
 
         uno::Sequence< uno::Any > aArgs( 1 );
         aArgs[0] <<= aNodePath;
 
         uno::Reference< container::XNameAccess > xConfigAccess(
             xConfigProvider->createInstanceWithArguments(
-                OUString(RTL_CONSTASCII_USTRINGPARAM(
-                    "com.sun.star.configuration.ConfigurationAccess")), aArgs),
+                OUString("com.sun.star.configuration.ConfigurationAccess"), aArgs),
             uno::UNO_QUERY_THROW );
 
         OUString aVal;
-        xConfigAccess->getByName(OUString(RTL_CONSTASCII_USTRINGPARAM("ooName"))) >>= aVal;
+        xConfigAccess->getByName(OUString("ooName")) >>= aVal;
 
         OUString &aUserAgent = WebDAVUserAgent::get();
         sal_Int32 nIndex = aUserAgent.indexOfAsciiL( RTL_CONSTASCII_STRINGPARAM( "$ooName" ) );
@@ -103,7 +101,7 @@ ContentProvider::ContentProvider(
             return;
         aUserAgent = aUserAgent.replaceAt( nIndex, RTL_CONSTASCII_LENGTH( "$ooName" ), aVal );
 
-        xConfigAccess->getByName(OUString(RTL_CONSTASCII_USTRINGPARAM("ooSetupVersion"))) >>= aVal;
+        xConfigAccess->getByName(OUString("ooSetupVersion")) >>= aVal;
         nIndex = aUserAgent.indexOfAsciiL( RTL_CONSTASCII_STRINGPARAM( "$ooSetupVersion" ) );
         if ( !aVal.getLength() || nIndex == -1 )
             return;
diff --git a/vcl/aqua/source/gdi/aquaprintaccessoryview.mm b/vcl/aqua/source/gdi/aquaprintaccessoryview.mm
index d1dee34bee36..0ba51e5bb115 100644
--- a/vcl/aqua/source/gdi/aquaprintaccessoryview.mm
+++ b/vcl/aqua/source/gdi/aquaprintaccessoryview.mm
@@ -111,15 +111,15 @@ class ControllerProperties
     rtl::OUString getMoreString()
     {
         return maLocalizedStrings.Count() >= 4
-               ? rtl::OUString( maLocalizedStrings.GetString( 3 ) )
-               : rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "More" ) );
+               ? OUString( maLocalizedStrings.GetString( 3 ) )
+               : OUString( "More" );
     }
     
     rtl::OUString getPrintSelectionString()
     {
         return maLocalizedStrings.Count() >= 5
-               ? rtl::OUString( maLocalizedStrings.GetString( 4 ) )
-               : rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Print selection only" ) );
+               ? OUString( maLocalizedStrings.GetString( 4 ) )
+               : OUString( "Print selection only" );
     }
     
     void updatePrintJob()
@@ -1267,7 +1267,7 @@ static void addEdit( NSView* pCurParent, long& rCurX, long& rCurY, long nAttachO
                 
                 // new tab item
                 if( ! aText.getLength() )
-                    aText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OOo" ) );
+                    aText = OUString( "OOo" );
                 NSString* pLabel = CreateNSString( aGroupTitle );
                 NSTabViewItem* pItem = [[NSTabViewItem alloc] initWithIdentifier: pLabel ];
                 [pItem setLabel: pLabel];
@@ -1288,7 +1288,7 @@ static void addEdit( NSView* pCurParent, long& rCurX, long& rCurY, long nAttachO
                 {
                     addBool( pCurParent, nCurX, nCurY, 0,
                              pControllerProperties->getPrintSelectionString(), bSelectionBoxEnabled,
-                             rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintContent" ) ), bSelectionBoxChecked,
+                             OUString( "PrintContent" ), bSelectionBoxChecked,
                              aRightColumn, pControllerProperties, pCtrlTarget );
                     bAddSelectionCheckBox = false;
                 }
diff --git a/vcl/unx/gtk/a11y/atkaction.cxx b/vcl/unx/gtk/a11y/atkaction.cxx
index 11f315fcb75b..20183299742e 100644
--- a/vcl/unx/gtk/a11y/atkaction.cxx
+++ b/vcl/unx/gtk/a11y/atkaction.cxx
@@ -116,7 +116,7 @@ action_wrapper_get_localized_name (AtkAction *, gint)
 }
 
 #define ACTION_NAME_PAIR( OOoName, AtkName ) \
-    std::pair< const OUString, const gchar * > ( OUString( RTL_CONSTASCII_USTRINGPARAM( OOoName ) ), AtkName )
+    std::pair< const OUString, const gchar * > ( OUString( OOoName ), AtkName )
 
 static G_CONST_RETURN gchar *
 action_wrapper_get_name (AtkAction *action,
diff --git a/vcl/unx/kde/UnxFilePicker.cxx b/vcl/unx/kde/UnxFilePicker.cxx
index 86df48b65739..a990f1fe1cc0 100644
--- a/vcl/unx/kde/UnxFilePicker.cxx
+++ b/vcl/unx/kde/UnxFilePicker.cxx
@@ -541,8 +541,8 @@ void SAL_CALL UnxFilePicker::initialize( const uno::Sequence<uno::Any> &rArgumen
     sal_Int16 templateId = -1;
     aAny >>= templateId;
 
-    OUString aTypeOpen(RTL_CONSTASCII_USTRINGPARAM( "setType \"open\"" ));
-    OUString aTypeSaveAs(RTL_CONSTASCII_USTRINGPARAM( "setType \"save\"" ));
+    OUString aTypeOpen( "setType \"open\"" );
+    OUString aTypeSaveAs( "setType \"save\"" );
 
     switch ( templateId )
     {
@@ -647,7 +647,7 @@ void SAL_CALL UnxFilePicker::disposing( const lang::EventObject &rEvent )
 OUString SAL_CALL UnxFilePicker::getImplementationName()
     throw( uno::RuntimeException )
 {
-    return OUString(RTL_CONSTASCII_USTRINGPARAM( FILE_PICKER_IMPL_NAME ));
+    return OUString( FILE_PICKER_IMPL_NAME );
 }
 
 sal_Bool SAL_CALL UnxFilePicker::supportsService( const OUString& ServiceName )
diff --git a/vcl/workben/svpclient.cxx b/vcl/workben/svpclient.cxx
index 3f1890a00fa4..54a51d9cbcff 100644
--- a/vcl/workben/svpclient.cxx
+++ b/vcl/workben/svpclient.cxx
@@ -131,7 +131,7 @@ MyWin::MyWin( Window* pParent, WinBits nWinStyle ) :
     m_aQuitButton( this, 0 )
 {
     m_aListButton.SetPosSizePixel( Point( 10, 10 ), Size( 120, 25 ) );
-    m_aListButton.SetText( String( RTL_CONSTASCII_USTRINGPARAM( "List Elements" ) ) );
+    m_aListButton.SetText( OUString( "List Elements" ) );
     m_aListButton.SetClickHdl( LINK( this, MyWin, ListHdl ) );
     m_aListButton.Show();
 
@@ -144,7 +144,7 @@ MyWin::MyWin( Window* pParent, WinBits nWinStyle ) :
     m_aImage.Show();
 
     m_aQuitButton.SetPosSizePixel( Point( 10, 300 ), Size( 120,25 ) );
-    m_aQuitButton.SetText( String( RTL_CONSTASCII_USTRINGPARAM( "Quit SVP server" ) ) );
+    m_aQuitButton.SetText( OUString( "Quit SVP server" ) );
     m_aQuitButton.SetClickHdl( LINK( this, MyWin, QuitHdl ) );
     m_aQuitButton.Show();
 }
diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
index af7c7cf02890..841305e854ca 100644
--- a/vcl/workben/vcldemo.cxx
+++ b/vcl/workben/vcldemo.cxx
@@ -141,9 +141,9 @@ void MyWin::Paint( const Rectangle& rRect )
         DrawLine( Point(r.Left()+i, r.Bottom()), Point(r.Right()-i, r.Top()) );
 
     SetTextColor( Color( COL_WHITE ) );
-    Font aFont( String( RTL_CONSTASCII_USTRINGPARAM( "Times" ) ), Size( 0, 25 ) );
+    Font aFont( OUString( "Times" ), Size( 0, 25 ) );
     SetFont( aFont );
-    DrawText( Point( 20, 30 ), String( RTL_CONSTASCII_USTRINGPARAM( "Just a simple test text" ) ) );
+    DrawText( Point( 20, 30 ), OUString( "Just a simple test text" ) );
 }
 
 
diff --git a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
index 379ac70d119e..0799c23eca6e 100644
--- a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
+++ b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
@@ -305,7 +305,7 @@ bool nsscrypto_initialize( const css::uno::Reference< css::uno::XComponentContex
 #if defined SYSTEM_NSS
         OUString rootModule("libnssckbi" SAL_DLLEXTENSION);
 #else
-        OUString rootModule(RTL_CONSTASCII_USTRINGPARAM("${LO_LIB_DIR}/libnssckbi" SAL_DLLEXTENSION));
+        OUString rootModule("${LO_LIB_DIR}/libnssckbi" SAL_DLLEXTENSION);
 #endif
         ::rtl::Bootstrap::expandMacros(rootModule);
author	Noel Grandin <noel@peralex.com>	2013-11-14 13:13:19 +0200
committer	Noel Grandin <noel@peralex.com>	2013-11-19 10:29:30 +0200
commit	2c35fff7eca3a143d28dc75e6a73fe1101d2af77 (patch)
tree	fb31b64880b06b0e2bd867aa6216ae0259c7c091
parent	ccc297097891e62489e5d281a4ea128ec6b71361 (diff)