targeted string re-work

Change-Id: I0ca912c8b7e485f5ec78422150aedc72ca6df32f

13 files changed, 91 insertions, 102 deletions

diff --git a/vcl/source/app/brand.cxx b/vcl/source/app/brand.cxx
index 82324e6be0aa..ae925a2da1b5 100644
--- a/vcl/source/app/brand.cxx
+++ b/vcl/source/app/brand.cxx
@@ -77,9 +77,9 @@ bool Application::LoadBrandBitmap (const char* pName, BitmapEx &rBitmap)
 {
     // TODO - if we want more flexibility we could add a branding path
     // in an rc file perhaps fallback to "about.bmp"
-    rtl::OUString aBaseName = ( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")) +
+    rtl::OUString aBaseName = ( rtl::OUString("/") +
                                 rtl::OUString::createFromAscii( pName ) );
-    rtl::OUString aPng( RTL_CONSTASCII_USTRINGPARAM(".png") );
+    rtl::OUString aPng( ".png" );
 
     rtl_Locale *pLoc = NULL;
     osl_getProcessLocale (&pLoc);
@@ -99,9 +99,9 @@ bool Application::LoadBrandBitmap (const char* pName, BitmapEx &rBitmap)
 
 vcl::RenderGraphicRasterizer Application::LoadBrandSVG (const char* pName)
 {
-    rtl::OUString aBaseName = ( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")) +
+    rtl::OUString aBaseName = ( rtl::OUString("/") +
                                 rtl::OUString::createFromAscii( pName ) );
-    rtl::OUString aSvg( RTL_CONSTASCII_USTRINGPARAM(".svg") );
+    rtl::OUString aSvg( ".svg" );
 
     rtl_Locale *pLoc = NULL;
     osl_getProcessLocale (&pLoc);
diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx
index d2eb8bf68d19..c1c0954175ef 100644
--- a/vcl/source/app/svdata.cxx
+++ b/vcl/source/app/svdata.cxx
@@ -198,7 +198,7 @@ Window* ImplGetDefaultWindow()
         {
             DBG_WARNING( "ImplGetDefaultWindow(): No AppWindow" );
             pSVData->mpDefaultWin = new WorkWindow( 0, WB_DEFAULTWIN );
-            pSVData->mpDefaultWin->SetText( OUString( RTL_CONSTASCII_USTRINGPARAM( "VCL ImplGetDefaultWindow" ) ) );
+            pSVData->mpDefaultWin->SetText( OUString( "VCL ImplGetDefaultWindow"  ) );
         }
         Application::GetSolarMutex().release();
     }
@@ -376,14 +376,14 @@ bool ImplInitAccessBridge(sal_Bool bAllowCancel, sal_Bool &rCancelled)
                         new AccessBridgeCurrentContext( com::sun::star::uno::getCurrentContext() ) );
 
                     pSVData->mxAccessBridge = xFactory->createInstanceWithArguments(
-                            OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.accessibility.AccessBridge")),
+                            OUString("com.sun.star.accessibility.AccessBridge"),
                             arguments
                         );
                 }
                 else
                 {
                     pSVData->mxAccessBridge = xFactory->createInstanceWithArguments(
-                            OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.accessibility.AccessBridge")),
+                            OUString("com.sun.star.accessibility.AccessBridge"),
                             arguments
                         );
                 }
@@ -499,11 +499,11 @@ bool ImplInitAccessBridge(sal_Bool bAllowCancel, sal_Bool &rCancelled)
             String aTitle;
             String aMessage(ResId(SV_ACCESSERROR_BRIDGE_MSG, *pResMgr).toString());
 
-            if( 0 == e.Message.compareTo(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ClassNotFound")), 13) )
+            if( 0 == e.Message.compareTo(::rtl::OUString("ClassNotFound"), 13) )
             {
                 aTitle = ResId(SV_ACCESSERROR_MISSING_BRIDGE, *pResMgr).toString();
             }
-            else if( 0 == e.Message.compareTo(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NoSuchMethod")), 12) )
+            else if( 0 == e.Message.compareTo(::rtl::OUString("NoSuchMethod"), 12) )
             {
                 aTitle = ResId(SV_ACCESSERROR_WRONG_VERSION, *pResMgr).toString();
             }
diff --git a/vcl/source/app/unohelp.cxx b/vcl/source/app/unohelp.cxx
index ebfa511ab6a3..52f44171ad7c 100644
--- a/vcl/source/app/unohelp.cxx
+++ b/vcl/source/app/unohelp.cxx
@@ -101,7 +101,7 @@ uno::Reference< lang::XMultiServiceFactory > vcl::unohelper::GetMultiServiceFact
         {
             pSVData->maAppData.mxMSF = ::cppu::createRegistryServiceFactory( aTempFileName, rtl::OUString(), sal_False );
             uno::Reference < registry::XImplementationRegistration > xReg(
-                pSVData->maAppData.mxMSF->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.registry.ImplementationRegistration"))), uno::UNO_QUERY );
+                pSVData->maAppData.mxMSF->createInstance( OUString("com.sun.star.registry.ImplementationRegistration")), uno::UNO_QUERY );
 
             if( xReg.is() )
             {
@@ -114,7 +114,7 @@ uno::Reference< lang::XMultiServiceFactory > vcl::unohelper::GetMultiServiceFact
                         try
                         {
                             xReg->registerImplementation(
-                                OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.loader.SharedLibrary")),aComponentPathString, NULL );
+                                OUString("com.sun.star.loader.SharedLibrary"),aComponentPathString, NULL );
                         }
                         catch( ::com::sun::star::uno::Exception & )
                         {
@@ -140,7 +140,7 @@ uno::Reference < i18n::XBreakIterator > vcl::unohelper::CreateBreakIterator()
     uno::Reference< lang::XMultiServiceFactory > xMSF = GetMultiServiceFactory();
     if ( xMSF.is() )
     {
-        uno::Reference < uno::XInterface > xI = xMSF->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.BreakIterator")) );
+        uno::Reference < uno::XInterface > xI = xMSF->createInstance( ::rtl::OUString("com.sun.star.i18n.BreakIterator") );
         if ( xI.is() )
         {
             uno::Any x = xI->queryInterface( ::getCppuType((const uno::Reference< i18n::XBreakIterator >*)0) );
@@ -156,7 +156,7 @@ uno::Reference < i18n::XCharacterClassification > vcl::unohelper::CreateCharacte
     uno::Reference< lang::XMultiServiceFactory > xMSF = GetMultiServiceFactory();
     if ( xMSF.is() )
     {
-        uno::Reference < uno::XInterface > xI = xMSF->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.CharacterClassification")) );
+        uno::Reference < uno::XInterface > xI = xMSF->createInstance( ::rtl::OUString("com.sun.star.i18n.CharacterClassification") );
         if ( xI.is() )
         {
             uno::Any x = xI->queryInterface( ::getCppuType((const uno::Reference< i18n::XCharacterClassification >*)0) );
@@ -179,18 +179,18 @@ uno::Reference < i18n::XCharacterClassification > vcl::unohelper::CreateCharacte
     {
         aLibName += aDLLSuffix;
     }
-    aLibName += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".dll" ));
+    aLibName += rtl::OUString( ".dll" );
 #else
-    aLibName = OUString( RTL_CONSTASCII_USTRINGPARAM( "lib" ));
+    aLibName = OUString( "lib" );
     aLibName += OUString::createFromAscii( pModName );
     if ( bSUPD )
     {
         aLibName += aDLLSuffix;
     }
 #ifdef MACOSX
-    aLibName += OUString( RTL_CONSTASCII_USTRINGPARAM( ".dylib" ));
+    aLibName += OUString( ".dylib" );
 #else
-    aLibName += OUString( RTL_CONSTASCII_USTRINGPARAM( ".so" ));
+    aLibName += OUString( ".so" );
 #endif
 #endif
 
diff --git a/vcl/source/components/dtranscomp.cxx b/vcl/source/components/dtranscomp.cxx
index 02fbae960c96..07eaf6d89e57 100644
--- a/vcl/source/components/dtranscomp.cxx
+++ b/vcl/source/components/dtranscomp.cxx
@@ -138,13 +138,13 @@ GenericClipboard::~GenericClipboard()
 
 rtl::OUString GenericClipboard::getImplementationName_static()
 {
-    return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.datatransfer.VCLGenericClipboard" ) );
+    return rtl::OUString( "com.sun.star.datatransfer.VCLGenericClipboard"  );
 }
 
 Sequence< rtl::OUString > GenericClipboard::getSupportedServiceNames_static()
 {
     Sequence< OUString > aRet(1);
-    aRet[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.clipboard.SystemClipboard"));
+    aRet[0] = OUString("com.sun.star.datatransfer.clipboard.SystemClipboard");
     return aRet;
 }
 
@@ -203,7 +203,7 @@ void GenericClipboard::setContents(
 
 rtl::OUString GenericClipboard::getName() throw( RuntimeException )
 {
-    return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CLIPBOARD" ) );
+    return rtl::OUString( "CLIPBOARD"  );
 }
 
 sal_Int8 GenericClipboard::getRenderingCapabilities() throw( RuntimeException )
@@ -279,13 +279,13 @@ Reference< XInterface > ClipboardFactory::createInstanceWithArguments( const Seq
 OUString SAL_CALL Clipboard_getImplementationName()
 {
     #if defined UNX
-    return OUString( RTL_CONSTASCII_USTRINGPARAM(
+    return OUString(
     #if ! defined QUARTZ
     "com.sun.star.datatransfer.X11ClipboardSupport"
     #else
     "com.sun.star.datatransfer.clipboard.AquaClipboard"
     #endif
-    ) );
+     );
     #else
     return GenericClipboard::getImplementationName_static();
     #endif
@@ -325,13 +325,13 @@ public:
     static Sequence< OUString > getSupportedServiceNames_static()
     {
         Sequence< OUString > aRet( 1 );
-        aRet[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.dnd.GenericDragSource"));
+        aRet[0] = OUString("com.sun.star.datatransfer.dnd.GenericDragSource");
         return aRet;
     }
 
     static OUString getImplementationName_static()
     {
-        return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.dnd.VclGenericDragSource"));
+        return OUString("com.sun.star.datatransfer.dnd.VclGenericDragSource");
     }
 };
 
@@ -369,13 +369,13 @@ void GenericDragSource::initialize( const Sequence< Any >& ) throw( Exception )
 Sequence< OUString > SAL_CALL DragSource_getSupportedServiceNames()
 {
     #if defined UNX
-    OUString aServiceName( RTL_CONSTASCII_USTRINGPARAM(
+    OUString aServiceName(
     #if ! defined QUARTZ
     "com.sun.star.datatransfer.dnd.X11DragSource"
     #else
     "com.sun.star.datatransfer.dnd.OleDragSource"
     #endif
-                                                              ) );
+                                                               );
     return Sequence< OUString >(&aServiceName, 1);
     #else
     return GenericDragSource::getSupportedServiceNames_static();
@@ -385,13 +385,13 @@ Sequence< OUString > SAL_CALL DragSource_getSupportedServiceNames()
 OUString SAL_CALL DragSource_getImplementationName()
 {
     #if defined UNX
-    return OUString( RTL_CONSTASCII_USTRINGPARAM(
+    return OUString(
     #if ! defined QUARTZ
     "com.sun.star.datatransfer.dnd.XdndSupport"
     #else
     "com.sun.star.comp.datatransfer.dnd.OleDragSource_V1"
     #endif
-                                                 ) );
+                                                  );
     #else
     return GenericDragSource::getImplementationName_static();
     #endif
@@ -436,13 +436,13 @@ public:
     static Sequence< OUString > getSupportedServiceNames_static()
     {
         Sequence< OUString > aRet( 1 );
-        aRet[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.dnd.GenericDropTarget"));
+        aRet[0] = OUString("com.sun.star.datatransfer.dnd.GenericDropTarget");
         return aRet;
     }
 
     static OUString getImplementationName_static()
     {
-        return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.dnd.VclGenericDropTarget"));
+        return OUString("com.sun.star.datatransfer.dnd.VclGenericDropTarget");
     }
 };
 
@@ -483,13 +483,13 @@ void GenericDropTarget::setDefaultActions( sal_Int8) throw()
 Sequence< OUString > SAL_CALL DropTarget_getSupportedServiceNames()
 {
     #if defined UNX
-    OUString aServiceName( RTL_CONSTASCII_USTRINGPARAM(
+    OUString aServiceName(
     #if ! defined QUARTZ
     "com.sun.star.datatransfer.dnd.X11DropTarget"
     #else
     "com.sun.star.datatransfer.dnd.OleDropTarget"
     #endif
-                                                              ) );
+                                                               );
     return Sequence< OUString >(&aServiceName, 1);
     #else
     return GenericDropTarget::getSupportedServiceNames_static();
@@ -499,13 +499,13 @@ Sequence< OUString > SAL_CALL DropTarget_getSupportedServiceNames()
 OUString SAL_CALL DropTarget_getImplementationName()
 {
     #if defined UNX
-    return OUString( RTL_CONSTASCII_USTRINGPARAM(
+    return OUString(
     #if ! defined QUARTZ
     "com.sun.star.datatransfer.dnd.XdndDropTarget"
     #else
     "com.sun.star.comp.datatransfer.dnd.OleDropTarget_V1"
     #endif
-                    ) );
+                     );
     #else
     return GenericDropTarget::getImplementationName_static();
     #endif
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index ebb2ab1915ec..ca56cfdef2d9 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -797,7 +797,7 @@ uno::Reference < i18n::XBreakIterator > Edit::ImplGetBreakIterator() const
 //    if ( !xBI.is() )
     {
         uno::Reference< lang::XMultiServiceFactory > xMSF = ::comphelper::getProcessServiceFactory();
-        uno::Reference < XInterface > xI = xMSF->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.BreakIterator")) );
+        uno::Reference < XInterface > xI = xMSF->createInstance( OUString("com.sun.star.i18n.BreakIterator") );
         if ( xI.is() )
         {
             Any x = xI->queryInterface( ::getCppuType((const uno::Reference< i18n::XBreakIterator >*)0) );
@@ -817,7 +817,7 @@ uno::Reference < i18n::XExtendedInputSequenceChecker > Edit::ImplGetInputSequenc
 //    if ( !xISC.is() )
     {
         uno::Reference< lang::XMultiServiceFactory > xMSF = ::comphelper::getProcessServiceFactory();
-        uno::Reference < XInterface > xI = xMSF->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.InputSequenceChecker")) );
+        uno::Reference < XInterface > xI = xMSF->createInstance( OUString("com.sun.star.i18n.InputSequenceChecker") );
         if ( xI.is() )
         {
             Any x = xI->queryInterface( ::getCppuType((const uno::Reference< i18n::XExtendedInputSequenceChecker >*)0) );
@@ -879,12 +879,12 @@ void Edit::ImplInsertText( const XubString& rStr, const Selection* pNewSel, sal_
 
         // determine if input-sequence-checking should be applied or not
         //
-        static OUString sModule( RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.Common/I18N") );
-        static OUString sRelNode( RTL_CONSTASCII_USTRINGPARAM("CTL") );
-        static OUString sCTLSequenceChecking( RTL_CONSTASCII_USTRINGPARAM("CTLSequenceChecking") );
-        static OUString sCTLSequenceCheckingRestricted( RTL_CONSTASCII_USTRINGPARAM("CTLSequenceCheckingRestricted") );
-        static OUString sCTLSequenceCheckingTypeAndReplace( RTL_CONSTASCII_USTRINGPARAM("CTLSequenceCheckingTypeAndReplace") );
-        static OUString sCTLFont( RTL_CONSTASCII_USTRINGPARAM("CTLFont") );
+        static OUString sModule( "/org.openoffice.Office.Common/I18N" );
+        static OUString sRelNode( "CTL" );
+        static OUString sCTLSequenceChecking( "CTLSequenceChecking" );
+        static OUString sCTLSequenceCheckingRestricted( "CTLSequenceCheckingRestricted" );
+        static OUString sCTLSequenceCheckingTypeAndReplace( "CTLSequenceCheckingTypeAndReplace" );
+        static OUString sCTLFont( "CTLFont" );
         //
         sal_Bool bCTLSequenceChecking               = sal_False;
         sal_Bool bCTLSequenceCheckingRestricted     = sal_False;
diff --git a/vcl/source/gdi/bmpconv.cxx b/vcl/source/gdi/bmpconv.cxx
index ffcf12354eb6..4a1a5ba4a730 100644
--- a/vcl/source/gdi/bmpconv.cxx
+++ b/vcl/source/gdi/bmpconv.cxx
@@ -118,7 +118,7 @@ Any SAL_CALL BmpConverter::getValue( const OUString& ) throw( UnknownPropertyExc
 
 sal_Bool SAL_CALL BmpConverter::hasMethod( const OUString& rName ) throw()
 {
-    return rName.equalsIgnoreAsciiCase( OUString(RTL_CONSTASCII_USTRINGPARAM("convert-bitmap-depth")) );
+    return rName.equalsIgnoreAsciiCase( OUString("convert-bitmap-depth") );
 }
 
 sal_Bool SAL_CALL BmpConverter::hasProperty( const OUString& ) throw()
@@ -135,7 +135,7 @@ Any SAL_CALL BmpConverter::invoke(
 {
     Any aRet;
 
-    if( rFunction.equalsIgnoreAsciiCase( OUString(RTL_CONSTASCII_USTRINGPARAM("convert-bitmap-depth")) ) )
+    if( rFunction.equalsIgnoreAsciiCase( OUString("convert-bitmap-depth") ) )
     {
         Reference< XBitmap > xBM;
         sal_uInt16 nTargetDepth = 0;
diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
index da073f65a0aa..e26907b153c7 100644
--- a/vcl/source/gdi/gdimtf.cxx
+++ b/vcl/source/gdi/gdimtf.cxx
@@ -471,7 +471,7 @@ bool GDIMetaFile::ImplPlayWithRenderer( OutputDevice* pOut, const Point& rPos, S
             if( xBitmapCanvas.is() )
             {
                 args[0] = uno::Any( xBitmapCanvas );
-                xMtfRenderer.set( xFactory->createInstanceWithArguments( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.rendering.MtfRenderer")),
+                xMtfRenderer.set( xFactory->createInstanceWithArguments( ::rtl::OUString("com.sun.star.rendering.MtfRenderer"),
                                                                          args ), uno::UNO_QUERY );
 
                 if( xMtfRenderer.is() )
diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index 6776037e292e..6762543ad23c 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -377,7 +377,7 @@ void ImpGraphic::ImplClear()
                 ::ucbhelper::Content aCnt( mpSwapFile->aSwapURL.GetMainURL( INetURLObject::NO_DECODE ),
                                      ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >() );
 
-                aCnt.executeCommand( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("delete")),
+                aCnt.executeCommand( ::rtl::OUString("delete"),
                                      ::com::sun::star::uno::makeAny( sal_Bool( sal_True ) ) );
             }
             catch( const ::com::sun::star::ucb::ContentCreationException& )
@@ -1095,7 +1095,7 @@ sal_Bool ImpGraphic::ImplReadEmbedded( SvStream& rIStm, sal_Bool bSwap )
                                     ::ucbhelper::Content aCnt( aTmpURL.GetMainURL( INetURLObject::NO_DECODE ),
                                                          ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >() );
 
-                                    aCnt.executeCommand( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("delete")),
+                                    aCnt.executeCommand( ::rtl::OUString("delete"),
                                                          ::com::sun::star::uno::makeAny( sal_Bool( sal_True ) ) );
                                 }
                                 catch( const ::com::sun::star::ucb::ContentCreationException& )
@@ -1287,7 +1287,7 @@ sal_Bool ImpGraphic::ImplSwapOut()
                             ::ucbhelper::Content aCnt( aTmpURL.GetMainURL( INetURLObject::NO_DECODE ),
                                                  ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >() );
 
-                            aCnt.executeCommand( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("delete")),
+                            aCnt.executeCommand( ::rtl::OUString("delete"),
                                                  ::com::sun::star::uno::makeAny( sal_Bool( sal_True ) ) );
                         }
                         catch( const ::com::sun::star::ucb::ContentCreationException& )
@@ -1396,7 +1396,7 @@ sal_Bool ImpGraphic::ImplSwapIn()
                             ::ucbhelper::Content aCnt( aSwapURL,
                                                  ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >() );
 
-                            aCnt.executeCommand( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("delete")),
+                            aCnt.executeCommand( ::rtl::OUString("delete"),
                                                  ::com::sun::star::uno::makeAny( sal_Bool( sal_True ) ) );
                         }
                         catch( const ::com::sun::star::ucb::ContentCreationException& )
diff --git a/vcl/source/gdi/impimagetree.cxx b/vcl/source/gdi/impimagetree.cxx
index 32ca29f41208..374ce851eae8 100644
--- a/vcl/source/gdi/impimagetree.cxx
+++ b/vcl/source/gdi/impimagetree.cxx
@@ -173,7 +173,7 @@ bool ImplImageTree::checkStyle(rtl::OUString const & style)
     setStyle(style);
 
     exists = false;
-    const rtl::OUString sBrandURLSuffix(RTL_CONSTASCII_USTRINGPARAM("_brand"));
+    const rtl::OUString sBrandURLSuffix("_brand");
     for (Paths::iterator i(m_paths.begin()); i != m_paths.end() && !exists; ++i) {
         ::rtl::OUString aURL = i->first;
         sal_Int32 nFromIndex = aURL.getLength() - sBrandURLSuffix.getLength();
@@ -224,7 +224,7 @@ bool ImplImageTree::loadDefaultImage(
     BitmapEx& bitmap)
 {
     return doLoadImage(
-        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("res/grafikde.png")),
+        rtl::OUString("res/grafikde.png"),
         style, bitmap, false);
 }
 
@@ -301,7 +301,7 @@ void ImplImageTree::resetPaths() {
     m_paths.clear();
     {
         rtl::OUString url(
-            RTL_CONSTASCII_USTRINGPARAM("$BRAND_BASE_DIR/program/edition/images"));
+            "$BRAND_BASE_DIR/program/edition/images");
         rtl::Bootstrap::expandMacros(url);
         INetURLObject u(url);
         OSL_ASSERT(!u.HasError());
@@ -312,7 +312,7 @@ void ImplImageTree::resetPaths() {
     }
     {
         rtl::OUString url(
-            RTL_CONSTASCII_USTRINGPARAM("$BRAND_BASE_DIR/share/config"));
+            "$BRAND_BASE_DIR/share/config");
         rtl::Bootstrap::expandMacros(url);
         INetURLObject u(url);
         OSL_ASSERT(!u.HasError());
@@ -328,9 +328,7 @@ void ImplImageTree::resetPaths() {
                 css::uno::Reference< css::container::XNameAccess >()));
     }
     {
-        rtl::OUString url(
-            RTL_CONSTASCII_USTRINGPARAM(
-                "$BRAND_BASE_DIR/share/config/images_brand"));
+        rtl::OUString url( "$BRAND_BASE_DIR/share/config/images_brand");
         rtl::Bootstrap::expandMacros(url);
         m_paths.push_back(
             std::make_pair(
@@ -338,7 +336,7 @@ void ImplImageTree::resetPaths() {
     }
     {
         rtl::OUString url(
-            RTL_CONSTASCII_USTRINGPARAM("$BRAND_BASE_DIR/share/config"));
+            "$BRAND_BASE_DIR/share/config");
         rtl::Bootstrap::expandMacros(url);
         INetURLObject u(url);
         OSL_ASSERT(!u.HasError());
@@ -354,9 +352,7 @@ void ImplImageTree::resetPaths() {
     }
     if ( m_style == "default" )
     {
-        rtl::OUString url(
-            RTL_CONSTASCII_USTRINGPARAM(
-                "$BRAND_BASE_DIR/share/config/images"));
+        rtl::OUString url( "$BRAND_BASE_DIR/share/config/images");
         rtl::Bootstrap::expandMacros(url);
         m_paths.push_back(
             std::make_pair(
@@ -414,9 +410,7 @@ bool ImplImageTree::find(
             try {
                 i->second.set(
                     comphelper::createProcessComponentWithArguments(
-                        rtl::OUString(
-                            RTL_CONSTASCII_USTRINGPARAM(
-                                "com.sun.star.packages.zip.ZipFileAccess")),
+                        rtl::OUString( "com.sun.star.packages.zip.ZipFileAccess"),
                         args),
                     css::uno::UNO_QUERY_THROW);
             } catch (css::uno::RuntimeException &) {
diff --git a/vcl/source/helper/canvasbitmap.cxx b/vcl/source/helper/canvasbitmap.cxx
index 77a655118d53..a7aebc2d82cc 100644
--- a/vcl/source/helper/canvasbitmap.cxx
+++ b/vcl/source/helper/canvasbitmap.cxx
@@ -685,7 +685,7 @@ sal_Bool SAL_CALL VclCanvasBitmap::getIndex( uno::Sequence< double >& o_entry, s
                          (m_pBmpAcc->HasPalette() ? m_pBmpAcc->GetPaletteEntryCount() : 0 ) : 0 );
     OSL_ENSURE(nIndex >= 0 && nIndex < nCount,"Palette index out of range");
     if( nIndex < 0 || nIndex >= nCount )
-        throw lang::IndexOutOfBoundsException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Palette index out of range")),
+        throw lang::IndexOutOfBoundsException(::rtl::OUString("Palette index out of range"),
                                               static_cast<rendering::XBitmapPalette*>(this));
 
     const BitmapColor aCol = m_pBmpAcc->GetPaletteColor(sal::static_int_cast<sal_uInt16>(nIndex));
@@ -707,7 +707,7 @@ sal_Bool SAL_CALL VclCanvasBitmap::setIndex( const uno::Sequence< double >&, sal
 
     OSL_ENSURE(nIndex >= 0 && nIndex < nCount,"Palette index out of range");
     if( nIndex < 0 || nIndex >= nCount )
-        throw lang::IndexOutOfBoundsException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Palette index out of range")),
+        throw lang::IndexOutOfBoundsException(::rtl::OUString("Palette index out of range"),
                                               static_cast<rendering::XBitmapPalette*>(this));
 
     return sal_False; // read-only implementation
diff --git a/vcl/source/window/abstdlg.cxx b/vcl/source/window/abstdlg.cxx
index f0ee719e90a1..3186ba9bc2fe 100644
--- a/vcl/source/window/abstdlg.cxx
+++ b/vcl/source/window/abstdlg.cxx
@@ -40,10 +40,10 @@ VclAbstractDialogFactory* VclAbstractDialogFactory::Create()
 {
     FuncPtrCreateDialogFactory fp = 0;
     static ::osl::Module aDialogLibrary;
-    if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, String( RTL_CONSTASCII_USTRINGPARAM( CUI_DLL_NAME ) ),
+    if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, String( CUI_DLL_NAME  ),
                                                              SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_LAZY ) )
         fp = ( VclAbstractDialogFactory* (__LOADONCALLAPI*)() )
-            aDialogLibrary.getFunctionSymbol( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CreateDialogFactory")) );
+            aDialogLibrary.getFunctionSymbol( ::rtl::OUString("CreateDialogFactory") );
     if ( fp )
         return fp();
     return 0;
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index 9528bdb2b1ff..1e04215dad38 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -2157,12 +2157,12 @@ sal_Bool ToolBox::AlwaysLocked()
 
         utl::OConfigurationNode aNode = utl::OConfigurationTreeRoot::tryCreateWithServiceFactory(
             vcl::unohelper::GetMultiServiceFactory(),
-            OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.UI.GlobalSettings/Toolbars")) );    // note: case sensisitive !
+            OUString("/org.openoffice.Office.UI.GlobalSettings/Toolbars") );    // note: case sensisitive !
         if ( aNode.isValid() )
         {
             // feature enabled ?
             sal_Bool bStatesEnabled = sal_Bool();
-            ::com::sun::star::uno::Any aValue = aNode.getNodeValue( OUString(RTL_CONSTASCII_USTRINGPARAM("StatesEnabled")) );
+            ::com::sun::star::uno::Any aValue = aNode.getNodeValue( OUString("StatesEnabled") );
             if( aValue >>= bStatesEnabled )
             {
                 if( bStatesEnabled == sal_True )
@@ -2170,10 +2170,10 @@ sal_Bool ToolBox::AlwaysLocked()
                     // now read the locking state
                     utl::OConfigurationNode aNode2 = utl::OConfigurationTreeRoot::tryCreateWithServiceFactory(
                         vcl::unohelper::GetMultiServiceFactory(),
-                        OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.UI.GlobalSettings/Toolbars/States")) );    // note: case sensisitive !
+                        OUString("/org.openoffice.Office.UI.GlobalSettings/Toolbars/States") );    // note: case sensisitive !
 
                     sal_Bool bLocked = sal_Bool();
-                    ::com::sun::star::uno::Any aValue2 = aNode2.getNodeValue( OUString(RTL_CONSTASCII_USTRINGPARAM("Locked")) );
+                    ::com::sun::star::uno::Any aValue2 = aNode2.getNodeValue( OUString("Locked") );
                     if( aValue2 >>= bLocked )
                         nAlwaysLocked = (bLocked == sal_True) ? 1 : 0;
                 }
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index a88be64676ab..a7c3d1165846 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -215,7 +215,7 @@ void Window::ImplInitAppFontData( Window* pWindow )
 {
     ImplSVData* pSVData = ImplGetSVData();
     long nTextHeight = pWindow->GetTextHeight();
-    long nTextWidth = pWindow->GetTextWidth( XubString( RTL_CONSTASCII_USTRINGPARAM( "aemnnxEM" ) ) );
+    long nTextWidth = pWindow->GetTextWidth( XubString( "aemnnxEM"  ) );
     long nSymHeight = nTextHeight*4;
     // Make the basis wider if the font is too narrow
     // such that the dialog looks symmetrical and does not become too narrow.
@@ -336,7 +336,7 @@ void Window::ImplUpdateGlobalSettings( AllSettings& rSettings, sal_Bool bCallHdl
 
         if ( ! aUserInterfaceFont.Len() )
         {
-            String aFallbackFont (RTL_CONSTASCII_USTRINGPARAM( "Andale Sans UI" ));
+            String aFallbackFont ("Andale Sans UI" );
             if ( mpWindowImpl->mpFrameData->mpFontList->FindFontFamily( aFallbackFont ) )
                 aUserInterfaceFont = aFallbackFont;
         }
@@ -496,10 +496,10 @@ void Window::ImplUpdateGlobalSettings( AllSettings& rSettings, sal_Bool bCallHdl
         sal_Bool bTmp = sal_False, bAutoHCMode = sal_True;
         utl::OConfigurationNode aNode = utl::OConfigurationTreeRoot::tryCreateWithServiceFactory(
             vcl::unohelper::GetMultiServiceFactory(),
-            OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Common/Accessibility")) );    // note: case sensisitive !
+            OUString("org.openoffice.Office.Common/Accessibility") );    // note: case sensisitive !
         if ( aNode.isValid() )
         {
-            ::com::sun::star::uno::Any aValue = aNode.getNodeValue( OUString(RTL_CONSTASCII_USTRINGPARAM("AutoDetectSystemHC")) );
+            ::com::sun::star::uno::Any aValue = aNode.getNodeValue( OUString("AutoDetectSystemHC") );
             if( aValue >>= bTmp )
                 bAutoHCMode = bTmp;
         }
@@ -848,7 +848,7 @@ void Window::ImplInit( Window* pParent, WinBits nStyle, SystemParentData* pSyste
         {
             // do not abort but throw an exception, may be the current thread terminates anyway (plugin-scenario)
             throw ::com::sun::star::uno::RuntimeException(
-                OUString( RTL_CONSTASCII_USTRINGPARAM( "Could not create system window!" ) ),
+                OUString( "Could not create system window!"  ),
                 ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
             //GetpApp()->Exception( EXC_SYSOBJNOTCREATED );
         }
@@ -4840,7 +4840,7 @@ void Window::RequestHelp( const HelpEvent& rHEvt )
                 if( aStrHelpId.Len() > 0 )
                     pHelp->Start( aStrHelpId, this );
                 else
-                    pHelp->Start( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OOO_HELP_INDEX ) ), this );
+                    pHelp->Start( rtl::OUString( OOO_HELP_INDEX  ), this );
             }
         }
     }
@@ -8267,15 +8267,15 @@ uno::Reference< XDragSource > Window::GetDragSource()
                         Sequence< Any > aDragSourceAL( 2 ), aDropTargetAL( 2 );
                         OUString aDragSourceSN, aDropTargetSN;
 #if defined WNT
-                        aDragSourceSN = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.dnd.OleDragSource"));
-                        aDropTargetSN = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.dnd.OleDropTarget"));
+                        aDragSourceSN = OUString("com.sun.star.datatransfer.dnd.OleDragSource");
+                        aDropTargetSN = OUString("com.sun.star.datatransfer.dnd.OleDropTarget");
                         aDragSourceAL[ 1 ] = makeAny( (sal_uInt32) pEnvData->hWnd );
                         aDropTargetAL[ 0 ] = makeAny( (sal_uInt32) pEnvData->hWnd );
 #elif defined QUARTZ
             /* FIXME: Mac OS X specific dnd interface does not exist! *
              * Using Windows based dnd as a temporary solution        */
-                        aDragSourceSN = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.dnd.OleDragSource"));
-                        aDropTargetSN = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.dnd.OleDropTarget"));
+                        aDragSourceSN = OUString("com.sun.star.datatransfer.dnd.OleDragSource");
+                        aDropTargetSN = OUString("com.sun.star.datatransfer.dnd.OleDropTarget");
                         aDragSourceAL[ 1 ] = makeAny( static_cast<sal_uInt64>( reinterpret_cast<sal_IntPtr>(pEnvData->pView) ) );
                         aDropTargetAL[ 0 ] = makeAny( static_cast<sal_uInt64>( reinterpret_cast<sal_IntPtr>(pEnvData->pView) ) );
 #elif defined IOS
@@ -8284,15 +8284,15 @@ uno::Reference< XDragSource > Window::GetDragSource()
              * meaningless), or intra-app? Anyway, use the same code
              * as for MacOSX for now, even if meaningless...
              */
-                        aDragSourceSN = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.dnd.OleDragSource"));
-                        aDropTargetSN = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.dnd.OleDropTarget"));
+                        aDragSourceSN = OUString("com.sun.star.datatransfer.dnd.OleDragSource");
+                        aDropTargetSN = OUString("com.sun.star.datatransfer.dnd.OleDropTarget");
                         aDragSourceAL[ 1 ] = makeAny( static_cast<sal_uInt64>( reinterpret_cast<sal_IntPtr>(pEnvData->pView) ) );
                         aDropTargetAL[ 0 ] = makeAny( static_cast<sal_uInt64>( reinterpret_cast<sal_IntPtr>(pEnvData->pView) ) );
 #elif defined UNX
                         aDropTargetAL.realloc( 3 );
                         aDragSourceAL.realloc( 3 );
-                        aDragSourceSN = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.dnd.X11DragSource"));
-                        aDropTargetSN = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.dnd.X11DropTarget"));
+                        aDragSourceSN = OUString("com.sun.star.datatransfer.dnd.X11DragSource");
+                        aDropTargetSN = OUString("com.sun.star.datatransfer.dnd.X11DropTarget");
 
                         aDragSourceAL[ 0 ] = makeAny( Application::GetDisplayConnection() );
                         aDragSourceAL[ 2 ] = makeAny( vcl::createBmpConverter() );
@@ -8347,10 +8347,10 @@ uno::Reference< XClipboard > Window::GetClipboard()
 
                 if( xFactory.is() )
                 {
-                    mpWindowImpl->mpFrameData->mxClipboard = uno::Reference< XClipboard >( xFactory->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.clipboard.SystemClipboardExt")) ), UNO_QUERY );
+                    mpWindowImpl->mpFrameData->mxClipboard = uno::Reference< XClipboard >( xFactory->createInstance( OUString("com.sun.star.datatransfer.clipboard.SystemClipboardExt") ), UNO_QUERY );
 
                     if( !mpWindowImpl->mpFrameData->mxClipboard.is() )
-                        mpWindowImpl->mpFrameData->mxClipboard = uno::Reference< XClipboard >( xFactory->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.clipboard.SystemClipboard")) ), UNO_QUERY );
+                        mpWindowImpl->mpFrameData->mxClipboard = uno::Reference< XClipboard >( xFactory->createInstance( OUString("com.sun.star.datatransfer.clipboard.SystemClipboard") ), UNO_QUERY );
 
 #if defined(UNX) && !defined(QUARTZ)          // unix clipboard needs to be initialized
                     if( mpWindowImpl->mpFrameData->mxClipboard.is() )
@@ -8361,7 +8361,7 @@ uno::Reference< XClipboard > Window::GetClipboard()
                         {
                             Sequence< Any > aArgumentList( 3 );
                             aArgumentList[ 0 ] = makeAny( Application::GetDisplayConnection() );
-                            aArgumentList[ 1 ] = makeAny( OUString(RTL_CONSTASCII_USTRINGPARAM("CLIPBOARD")) );
+                            aArgumentList[ 1 ] = makeAny( OUString("CLIPBOARD") );
                             aArgumentList[ 2 ] = makeAny( vcl::createBmpConverter() );
 
                             xInit->initialize( aArgumentList );
@@ -8404,19 +8404,19 @@ uno::Reference< XClipboard > Window::GetPrimarySelection()
 #if defined(UNX) && !defined(QUARTZ)
                     Sequence< Any > aArgumentList( 3 );
                       aArgumentList[ 0 ] = makeAny( Application::GetDisplayConnection() );
-                    aArgumentList[ 1 ] = makeAny( OUString(RTL_CONSTASCII_USTRINGPARAM("PRIMARY")) );
+                    aArgumentList[ 1 ] = makeAny( OUString("PRIMARY") );
                     aArgumentList[ 2 ] = makeAny( vcl::createBmpConverter() );
 
                     mpWindowImpl->mpFrameData->mxSelection = uno::Reference< XClipboard >( xFactory->createInstanceWithArguments(
-                    OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.clipboard.SystemClipboard")), aArgumentList ), UNO_QUERY );
+                    OUString("com.sun.star.datatransfer.clipboard.SystemClipboard"), aArgumentList ), UNO_QUERY );
 #       else
                     static uno::Reference< XClipboard > s_xSelection;
 
                     if ( !s_xSelection.is() )
-                         s_xSelection = uno::Reference< XClipboard >( xFactory->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.clipboard.GenericClipboardExt")) ), UNO_QUERY );
+                         s_xSelection = uno::Reference< XClipboard >( xFactory->createInstance( OUString("com.sun.star.datatransfer.clipboard.GenericClipboardExt") ), UNO_QUERY );
 
                     if ( !s_xSelection.is() )
-                         s_xSelection = uno::Reference< XClipboard >( xFactory->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.clipboard.GenericClipboard")) ), UNO_QUERY );
+                         s_xSelection = uno::Reference< XClipboard >( xFactory->createInstance( OUString("com.sun.star.datatransfer.clipboard.GenericClipboard") ), UNO_QUERY );
 
                     mpWindowImpl->mpFrameData->mxSelection = s_xSelection;
 #       endif
@@ -9358,8 +9358,7 @@ uno::Reference< rendering::XCanvas > Window::ImplGetCanvas( const Size& rFullscr
         static ::vcl::DeleteUnoReferenceOnDeinit<lang::XMultiServiceFactory> xStaticCanvasFactory(
             uno::Reference<lang::XMultiServiceFactory>(
                 xFactory->createInstance(
-                    OUString( RTL_CONSTASCII_USTRINGPARAM(
-                            "com.sun.star.rendering.CanvasFactory") ) ),
+                    OUString( "com.sun.star.rendering.CanvasFactory" ) ),
                 UNO_QUERY ));
         uno::Reference<lang::XMultiServiceFactory> xCanvasFactory(xStaticCanvasFactory.get());
 
@@ -9376,10 +9375,8 @@ uno::Reference< rendering::XCanvas > Window::ImplGetCanvas( const Size& rFullscr
             {
                 xCanvas.set( xCanvasFactory->createInstanceWithArguments(
                                  bSpriteCanvas ?
-                                 OUString( RTL_CONSTASCII_USTRINGPARAM(
-                                               "com.sun.star.rendering.SpriteCanvas.MultiScreen" )) :
-                                 OUString( RTL_CONSTASCII_USTRINGPARAM(
-                                               "com.sun.star.rendering.Canvas" )),
+                                 OUString( "com.sun.star.rendering.SpriteCanvas.MultiScreen" ) :
+                                 OUString( "com.sun.star.rendering.Canvas" ),
                                  aArg ),
                              UNO_QUERY );
 
@@ -9389,10 +9386,8 @@ uno::Reference< rendering::XCanvas > Window::ImplGetCanvas( const Size& rFullscr
 #endif
                 xCanvas.set( xCanvasFactory->createInstanceWithArguments(
                                  bSpriteCanvas ?
-                                 OUString( RTL_CONSTASCII_USTRINGPARAM(
-                                               "com.sun.star.rendering.SpriteCanvas" )) :
-                                 OUString( RTL_CONSTASCII_USTRINGPARAM(
-                                               "com.sun.star.rendering.Canvas" )),
+                                 OUString( "com.sun.star.rendering.SpriteCanvas" ) :
+                                 OUString( "com.sun.star.rendering.Canvas" ),
                                  aArg ),
                              UNO_QUERY );