targeted string re-work

Change-Id: I27a092628e48b39f7bad2ed895f80aeea0d9ee35

11 files changed, 66 insertions, 66 deletions

diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index 6b3d69930e33..cabfc39e8e47 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -116,7 +116,7 @@ static rtl::OUString HelpLocaleString()
     static rtl::OUString aLocaleStr;
     if (aLocaleStr.isEmpty())
     {
-        const rtl::OUString aEnglish( RTL_CONSTASCII_USTRINGPARAM( "en" ) );
+        const rtl::OUString aEnglish( "en"  );
         // detect installed locale
         aLocaleStr = utl::ConfigManager::getLocale();
         bool bOk = !aLocaleStr.isEmpty();
@@ -188,7 +188,7 @@ sal_Bool GetHelpAnchor_Impl( const String& _rURL, String& _rAnchor )
     {
         ::ucbhelper::Content aCnt( INetURLObject( _rURL ).GetMainURL( INetURLObject::NO_DECODE ),
                              Reference< ::com::sun::star::ucb::XCommandEnvironment > () );
-        if ( ( aCnt.getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AnchorName")) ) >>= sAnchor ) )
+        if ( ( aCnt.getPropertyValue( ::rtl::OUString("AnchorName") ) >>= sAnchor ) )
         {
 
             if ( !sAnchor.isEmpty() )
@@ -242,7 +242,7 @@ static Sequence< ::rtl::OUString > GetPropertyNames()
 }
 
 SfxHelpOptions_Impl::SfxHelpOptions_Impl()
-    : ConfigItem( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Office.SFX/Help")) )
+    : ConfigItem( ::rtl::OUString("Office.SFX/Help") )
 {
     Sequence< ::rtl::OUString > aNames = GetPropertyNames();
     Sequence< Any > aValues = GetProperties( aNames );
@@ -360,7 +360,7 @@ SfxHelp::SfxHelp() :
     // if it's set, you will see debug output on active help
     {
         ::rtl::OUString sHelpDebug;
-        ::rtl::OUString sEnvVarName( RTL_CONSTASCII_USTRINGPARAM( "HELP_DEBUG" ) );
+        ::rtl::OUString sEnvVarName( "HELP_DEBUG"  );
         osl_getEnvironment( sEnvVarName.pData, &sHelpDebug.pData );
         bIsDebug = !sHelpDebug.isEmpty();
     }
@@ -489,13 +489,13 @@ String SfxHelp::GetHelpModuleName_Impl()
     {
         // Map some module identifiers to their "real" help module string.
         if ( aFactoryShortName == "chart2" )
-            aFactoryShortName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "schart" ) );
+            aFactoryShortName = rtl::OUString( "schart"  );
         else if ( aFactoryShortName == "BasicIDE" )
-            aFactoryShortName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "sbasic" ) );
+            aFactoryShortName = rtl::OUString( "sbasic"  );
         else if ( aFactoryShortName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("sweb"))
                 || aFactoryShortName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("sglobal"))
                 || aFactoryShortName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("swxform")) )
-            aFactoryShortName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "swriter" ) );
+            aFactoryShortName = rtl::OUString( "swriter"  );
         else if ( aFactoryShortName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("dbquery"))
                 || aFactoryShortName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("dbbrowser"))
                 || aFactoryShortName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("dbrelation"))
@@ -505,7 +505,7 @@ String SfxHelp::GetHelpModuleName_Impl()
                 || aFactoryShortName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("swreport"))
                 || aFactoryShortName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("dbbrowser"))
                 || aFactoryShortName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("swform")) )
-            aFactoryShortName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "sdatabase" ) );
+            aFactoryShortName = rtl::OUString( "sdatabase"  );
         else if ( aFactoryShortName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("sbibliography"))
                 || aFactoryShortName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("StartModule")) )
             aFactoryShortName = sDefaultModule;
@@ -672,17 +672,17 @@ sal_Bool SfxHelp::Start( const String& rURL, const Window* pWindow )
 /// Redirect the vnd.sun.star.help:// urls to http://help.libreoffice.org
 static bool impl_showOnlineHelp( const String& rURL )
 {
-    String aInternal( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.help://" ) );
+    String aInternal( "vnd.sun.star.help://"  );
     if ( rURL.Len() <= aInternal.Len() || rURL.Copy( 0, aInternal.Len() ) != aInternal )
         return false;
 
-    rtl::OUString aHelpLink( RTL_CONSTASCII_USTRINGPARAM( "http://help.libreoffice.org/" ) );
+    rtl::OUString aHelpLink( "http://help.libreoffice.org/"  );
     aHelpLink += rURL.Copy( aInternal.Len() );
     try
     {
         Reference< XSystemShellExecute > xSystemShell(
                 ::comphelper::getProcessServiceFactory()->createInstance(
-                    rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.system.SystemShellExecute" ) ) ),
+                    rtl::OUString( "com.sun.star.system.SystemShellExecute"  ) ),
                 UNO_QUERY );
 
         if ( xSystemShell.is() )
@@ -840,7 +840,7 @@ void SfxHelp::OpenHelpAgent( const rtl::OString& sHelpId )
                 URL aURL;
                 aURL.Complete = CreateHelpURL_Impl( rtl::OStringToOUString(sHelpId, RTL_TEXTENCODING_UTF8), GetHelpModuleName_Impl() );
                 Reference < XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance(
-                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer")) ), UNO_QUERY );
+                    ::rtl::OUString("com.sun.star.util.URLTransformer") ), UNO_QUERY );
                 xTrans->parseStrict(aURL);
 
                 Reference < XFrame > xCurrentFrame;
@@ -853,7 +853,7 @@ void SfxHelp::OpenHelpAgent( const rtl::OString& sHelpId )
                 Reference< XDispatch > xHelpDispatch;
                 if ( xDispProv.is() )
                     xHelpDispatch = xDispProv->queryDispatch(
-                        aURL, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_helpagent")),
+                        aURL, ::rtl::OUString("_helpagent"),
                         FrameSearchFlag::PARENT | FrameSearchFlag::SELF );
 
                 DBG_ASSERT( xHelpDispatch.is(), "OpenHelpAgent: could not get a dispatcher!" );
diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx
index 2fec49473611..391286db89b9 100644
--- a/sfx2/source/appl/shutdownicon.cxx
+++ b/sfx2/source/appl/shutdownicon.cxx
@@ -154,12 +154,12 @@ bool ShutdownIcon::LoadModule( osl::Module **pModule,
 
     oslGenericFunction pTmpInit = NULL;
     oslGenericFunction pTmpDeInit = NULL;
-    if ( pPlugin->loadRelative( &thisModule, OUString (RTL_CONSTASCII_USTRINGPARAM( STRING( PLUGIN_NAME ) ) ) ) )
+    if ( pPlugin->loadRelative( &thisModule, OUString (STRING( PLUGIN_NAME  ) ) ) )
     {
         pTmpInit = pPlugin->getFunctionSymbol(
-            OUString( RTL_CONSTASCII_USTRINGPARAM( "plugin_init_sys_tray" ) ) );
+            OUString( "plugin_init_sys_tray"  ) );
         pTmpDeInit = pPlugin->getFunctionSymbol(
-            OUString( RTL_CONSTASCII_USTRINGPARAM( "plugin_shutdown_sys_tray" ) ) );
+            OUString( "plugin_shutdown_sys_tray"  ) );
     }
     if ( !pTmpInit || !pTmpDeInit )
     {
@@ -297,7 +297,7 @@ void ShutdownIcon::OpenURL( const ::rtl::OUString& aURL, const ::rtl::OUString&
             aDispatchURL.Complete = aURL;
 
             Reference < com::sun::star::util::XURLTransformer > xURLTransformer(
-                ::comphelper::getProcessServiceFactory()->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer")) ),
+                ::comphelper::getProcessServiceFactory()->createInstance( OUString("com.sun.star.util.URLTransformer") ),
                 com::sun::star::uno::UNO_QUERY );
             if ( xURLTransformer.is() )
             {
@@ -346,8 +346,8 @@ void ShutdownIcon::FromTemplate()
             xFrame = Reference < ::com::sun::star::frame::XFrame >( xDesktop, UNO_QUERY );
 
         URL aTargetURL;
-        aTargetURL.Complete = OUString( RTL_CONSTASCII_USTRINGPARAM( "slot:5500" ) );
-        Reference < XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer"))), UNO_QUERY );
+        aTargetURL.Complete = OUString( "slot:5500"  );
+        Reference < XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance( rtl::OUString("com.sun.star.util.URLTransformer")), UNO_QUERY );
         xTrans->parseStrict( aTargetURL );
 
         Reference < ::com::sun::star::frame::XDispatchProvider > xProv( xFrame, UNO_QUERY );
@@ -357,14 +357,14 @@ void ShutdownIcon::FromTemplate()
             if ( aTargetURL.Protocol.compareToAscii("slot:") == COMPARE_EQUAL )
                 xDisp = xProv->queryDispatch( aTargetURL, ::rtl::OUString(), 0 );
             else
-                xDisp = xProv->queryDispatch( aTargetURL, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_blank")), 0 );
+                xDisp = xProv->queryDispatch( aTargetURL, ::rtl::OUString("_blank"), 0 );
         }
         if ( xDisp.is() )
         {
             Sequence<PropertyValue> aArgs(1);
             PropertyValue* pArg = aArgs.getArray();
-            pArg[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Referer"));
-            pArg[0].Value <<= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:user"));
+            pArg[0].Name = rtl::OUString("Referer");
+            pArg[0].Value <<= ::rtl::OUString("private:user");
             Reference< ::com::sun::star::frame::XNotifyingDispatch > xNotifyer( xDisp, UNO_QUERY );
             if ( xNotifyer.is() )
             {
@@ -452,18 +452,18 @@ IMPL_STATIC_LINK( ShutdownIcon, DialogClosedHdl_Impl, FileDialogHelper*, EMPTYAR
                 Sequence< PropertyValue >   aArgs(3);
 
                 Reference < com::sun::star::task::XInteractionHandler > xInteraction(
-                    ::comphelper::getProcessServiceFactory()->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.task.InteractionHandler")) ),
+                    ::comphelper::getProcessServiceFactory()->createInstance( OUString("com.sun.star.task.InteractionHandler") ),
                     com::sun::star::uno::UNO_QUERY );
 
-                aArgs[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM("InteractionHandler"));
+                aArgs[0].Name = OUString("InteractionHandler");
                 aArgs[0].Value <<= xInteraction;
 
                 sal_Int16 nMacroExecMode = ::com::sun::star::document::MacroExecMode::USE_CONFIG;
-                aArgs[1].Name = OUString(RTL_CONSTASCII_USTRINGPARAM("MacroExecutionMode"));
+                aArgs[1].Name = OUString("MacroExecutionMode");
                 aArgs[1].Value <<= nMacroExecMode;
 
                 sal_Int16 nUpdateDoc = ::com::sun::star::document::UpdateDocMode::ACCORDING_TO_CONFIG;
-                aArgs[2].Name = OUString(RTL_CONSTASCII_USTRINGPARAM("UpdateDocMode"));
+                aArgs[2].Name = OUString("UpdateDocMode");
                 aArgs[2].Value <<= nUpdateDoc;
 
                 // use the filedlghelper to get the current filter name,
@@ -485,7 +485,7 @@ IMPL_STATIC_LINK( ShutdownIcon, DialogClosedHdl_Impl, FileDialogHelper*, EMPTYAR
                     if ( bReadOnly )
                     {
                         aArgs.realloc( ++nArgs );
-                        aArgs[nArgs-1].Name  = OUString(RTL_CONSTASCII_USTRINGPARAM("ReadOnly"));
+                        aArgs[nArgs-1].Name  = OUString("ReadOnly");
                         aArgs[nArgs-1].Value <<= bReadOnly;
                     }
 
@@ -500,7 +500,7 @@ IMPL_STATIC_LINK( ShutdownIcon, DialogClosedHdl_Impl, FileDialogHelper*, EMPTYAR
                         sal_Int16   uVersion = (sal_Int16)iVersion;
 
                         aArgs.realloc( ++nArgs );
-                        aArgs[nArgs-1].Name  = OUString(RTL_CONSTASCII_USTRINGPARAM("Version"));
+                        aArgs[nArgs-1].Name  = OUString("Version");
                         aArgs[nArgs-1].Value <<= uVersion;
                     }
 
@@ -525,26 +525,26 @@ IMPL_STATIC_LINK( ShutdownIcon, DialogClosedHdl_Impl, FileDialogHelper*, EMPTYAR
                         if ( !aFilterName.isEmpty() )
                         {
                             aArgs.realloc( ++nArgs );
-                            aArgs[nArgs-1].Name  = OUString(RTL_CONSTASCII_USTRINGPARAM("FilterName"));
+                            aArgs[nArgs-1].Name  = OUString("FilterName");
                             aArgs[nArgs-1].Value <<= aFilterName;
                         }
                     }
                 }
 
                 if ( 1 == nFiles )
-                    OpenURL( sFiles[0], OUString( RTL_CONSTASCII_USTRINGPARAM( "_default" ) ), aArgs );
+                    OpenURL( sFiles[0], OUString( "_default"  ), aArgs );
                 else
                 {
                     OUString    aBaseDirURL = sFiles[0];
                     if ( !aBaseDirURL.isEmpty() && aBaseDirURL[aBaseDirURL.getLength()-1] != '/' )
-                        aBaseDirURL += OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
+                        aBaseDirURL += OUString("/");
 
                     int iFiles;
                     for ( iFiles = 1; iFiles < nFiles; iFiles++ )
                     {
                         OUString    aURL = aBaseDirURL;
                         aURL += sFiles[iFiles];
-                        OpenURL( aURL, OUString( RTL_CONSTASCII_USTRINGPARAM( "_default" ) ), aArgs );
+                        OpenURL( aURL, OUString( "_default"  ), aArgs );
                     }
                 }
             }
@@ -806,9 +806,9 @@ static OUString getAutostartDir( bool bCreate = false )
         OUString aHomeURL;
         osl::Security().getHomeDir( aHomeURL );
         ::osl::File::getSystemPathFromFileURL( aHomeURL, aShortcut );
-        aShortcut += OUString( RTL_CONSTASCII_USTRINGPARAM( "/.config" ) );
+        aShortcut += OUString( "/.config"  );
     }
-    aShortcut += OUString( RTL_CONSTASCII_USTRINGPARAM( "/autostart" ) );
+    aShortcut += OUString( "/autostart"  );
     if (bCreate)
     {
         OUString aShortcutUrl;
@@ -825,7 +825,7 @@ rtl::OUString ShutdownIcon::getShortcutName()
     return OUString();
 #else
 
-    OUString aShortcutName( RTL_CONSTASCII_USTRINGPARAM( "StarOffice 6.0" ) );
+    OUString aShortcutName( "StarOffice 6.0"  );
     ResMgr* pMgr = SfxResId::GetResMgr();
     if( pMgr )
     {
@@ -833,14 +833,14 @@ rtl::OUString ShutdownIcon::getShortcutName()
         aShortcutName = SFX2_RESSTR(STR_QUICKSTART_LNKNAME);
     }
 #ifdef WNT
-    aShortcutName += OUString( RTL_CONSTASCII_USTRINGPARAM( ".lnk" ) );
+    aShortcutName += OUString( ".lnk"  );
 
     OUString aShortcut(GetAutostartFolderNameW32());
-    aShortcut += OUString( RTL_CONSTASCII_USTRINGPARAM( "\\" ) );
+    aShortcut += OUString( "\\"  );
     aShortcut += aShortcutName;
 #else // UNX
     OUString aShortcut = getAutostartDir();
-    aShortcut += OUString( RTL_CONSTASCII_USTRINGPARAM( "/qstart.desktop" ) );
+    aShortcut += OUString( "/qstart.desktop"  );
 #endif // UNX
     return aShortcut;
 #endif // ENABLE_QUICKSTART_APPLET
@@ -880,7 +880,7 @@ void ShutdownIcon::SetAutostart( bool bActivate )
 #else // UNX
         getAutostartDir( true );
 
-        OUString aPath( RTL_CONSTASCII_USTRINGPARAM("${BRAND_BASE_DIR}/share/xdg/qstart.desktop" ) );
+        OUString aPath( "${BRAND_BASE_DIR}/share/xdg/qstart.desktop"  );
         Bootstrap::expandMacros( aPath );
 
         OUString aDesktopFile;
diff --git a/sfx2/source/appl/shutdowniconw32.cxx b/sfx2/source/appl/shutdowniconw32.cxx
index a735f2eaf3a2..0d3b86c46e53 100644
--- a/sfx2/source/appl/shutdowniconw32.cxx
+++ b/sfx2/source/appl/shutdowniconw32.cxx
@@ -181,7 +181,7 @@ static HMENU createSystrayMenu( )
     ::std::set< ::rtl::OUString > aFileNewAppsAvailable;
     SvtDynamicMenuOptions aOpt;
     Sequence < Sequence < PropertyValue > > aNewMenu = aOpt.GetMenu( E_NEWMENU );
-    const ::rtl::OUString sURLKey( RTL_CONSTASCII_USTRINGPARAM( "URL" ) );
+    const ::rtl::OUString sURLKey( "URL"  );
 
     const Sequence< PropertyValue >* pNewMenu = aNewMenu.getConstArray();
     const Sequence< PropertyValue >* pNewMenuEnd = aNewMenu.getConstArray() + aNewMenu.getLength();
@@ -236,7 +236,7 @@ static HMENU createSystrayMenu( )
     addMenuItem( hMenu, IDM_TEMPLATE, ICON_TEMPLATE,
         pShutdownIcon->GetResString( STR_QUICKSTART_FROMTEMPLATE ), pos, true, aEmpty);
     addMenuItem( hMenu, static_cast< UINT >( -1 ), 0, OUString(), pos, false, aEmpty );
-    addMenuItem( hMenu, IDM_OPEN,   ICON_OPEN, pShutdownIcon->GetResString( STR_QUICKSTART_FILEOPEN ), pos, true, OUString(RTL_CONSTASCII_USTRINGPARAM("SHELL32")));
+    addMenuItem( hMenu, IDM_OPEN,   ICON_OPEN, pShutdownIcon->GetResString( STR_QUICKSTART_FILEOPEN ), pos, true, OUString("SHELL32"));
     addMenuItem( hMenu, static_cast< UINT >( -1 ), 0, OUString(), pos, false, aEmpty );
 #endif
     addMenuItem( hMenu, IDM_INSTALL,0, pShutdownIcon->GetResString( STR_QUICKSTART_PRELAUNCH ), pos, false, aEmpty );
@@ -446,22 +446,22 @@ LRESULT CALLBACK executerWndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lP
                         ShutdownIcon::FileOpen();
                 break;
                 case IDM_WRITER:
-                    ShutdownIcon::OpenURL( OUString( RTL_CONSTASCII_USTRINGPARAM( WRITER_URL ) ), OUString( RTL_CONSTASCII_USTRINGPARAM( "_default" ) ) );
+                    ShutdownIcon::OpenURL( OUString( WRITER_URL  ), OUString( "_default"  ) );
                 break;
                 case IDM_CALC:
-                    ShutdownIcon::OpenURL( OUString( RTL_CONSTASCII_USTRINGPARAM( CALC_URL ) ), OUString( RTL_CONSTASCII_USTRINGPARAM( "_default" ) ) );
+                    ShutdownIcon::OpenURL( OUString( CALC_URL  ), OUString( "_default"  ) );
                 break;
                 case IDM_IMPRESS:
-                    ShutdownIcon::OpenURL( OUString( RTL_CONSTASCII_USTRINGPARAM( IMPRESS_WIZARD_URL ) ), OUString( RTL_CONSTASCII_USTRINGPARAM( "_default" ) ) );
+                    ShutdownIcon::OpenURL( OUString( IMPRESS_WIZARD_URL  ), OUString( "_default"  ) );
                 break;
                 case IDM_DRAW:
-                    ShutdownIcon::OpenURL( OUString( RTL_CONSTASCII_USTRINGPARAM( DRAW_URL ) ), OUString( RTL_CONSTASCII_USTRINGPARAM( "_default" ) ) );
+                    ShutdownIcon::OpenURL( OUString( DRAW_URL  ), OUString( "_default"  ) );
                 break;
                 case IDM_BASE:
-                    ShutdownIcon::OpenURL( OUString( RTL_CONSTASCII_USTRINGPARAM( BASE_URL ) ), OUString( RTL_CONSTASCII_USTRINGPARAM( "_default" ) ) );
+                    ShutdownIcon::OpenURL( OUString( BASE_URL  ), OUString( "_default"  ) );
                 break;
                 case IDM_MATH:
-                    ShutdownIcon::OpenURL( OUString( RTL_CONSTASCII_USTRINGPARAM( MATH_URL ) ), OUString( RTL_CONSTASCII_USTRINGPARAM( "_default" ) ) );
+                    ShutdownIcon::OpenURL( OUString( MATH_URL  ), OUString( "_default"  ) );
                 break;
                 case IDM_TEMPLATE:
                     if ( !ShutdownIcon::bModalMode )
@@ -839,7 +839,7 @@ bool ShutdownIcon::IsQuickstarterInstalled()
         aOfficepath = aOfficepath.copy(0, i);
 
     OUString quickstartExe(aOfficepath);
-    quickstartExe += OUString( RTL_CONSTASCII_USTRINGPARAM( "\\quickstart.exe" ) );
+    quickstartExe += OUString( "\\quickstart.exe"  );
 
     return FileExistsW( reinterpret_cast<LPCWSTR>(quickstartExe.getStr()) );
 }
@@ -855,7 +855,7 @@ void ShutdownIcon::EnableAutostartW32( const rtl::OUString &aShortcut )
         aOfficepath = aOfficepath.copy(0, i);
 
     OUString quickstartExe(aOfficepath);
-    quickstartExe += OUString( RTL_CONSTASCII_USTRINGPARAM( "\\quickstart.exe" ) );
+    quickstartExe += OUString( "\\quickstart.exe"  );
 
     CreateShortcut( quickstartExe, aOfficepath, aShortcut, OUString(), OUString() );
 }
diff --git a/sfx2/source/control/querystatus.cxx b/sfx2/source/control/querystatus.cxx
index 5d6c2ee2117c..76f985bdccc1 100644
--- a/sfx2/source/control/querystatus.cxx
+++ b/sfx2/source/control/querystatus.cxx
@@ -96,7 +96,7 @@ SfxQueryStatus_Impl::SfxQueryStatus_Impl( const Reference< XDispatchProvider >&
 {
     m_aCommand.Complete = rCommand;
     Reference < XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance(
-                                            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer"))), UNO_QUERY );
+                                            rtl::OUString("com.sun.star.util.URLTransformer")), UNO_QUERY );
     xTrans->parseStrict( m_aCommand );
     if ( rDispatchProvider.is() )
         m_xDispatch = rDispatchProvider->queryDispatch( m_aCommand, rtl::OUString(), 0 );
diff --git a/sfx2/source/control/request.cxx b/sfx2/source/control/request.cxx
index 2bdc5d16e3a0..78f0a7da6bca 100644
--- a/sfx2/source/control/request.cxx
+++ b/sfx2/source/control/request.cxx
@@ -374,7 +374,7 @@ void SfxRequest_Impl::Record
                 com::sun::star::uno::UNO_QUERY);
 
         com::sun::star::uno::Reference< com::sun::star::util::XURLTransformer > xTransform(
-                xFactory->createInstance(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer"))),
+                xFactory->createInstance(rtl::OUString("com.sun.star.util.URLTransformer")),
                 com::sun::star::uno::UNO_QUERY);
 
         com::sun::star::util::URL aURL;
@@ -826,7 +826,7 @@ com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder > SfxRe
 
     if(xSet.is())
     {
-        com::sun::star::uno::Any aProp = xSet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DispatchRecorderSupplier")));
+        com::sun::star::uno::Any aProp = xSet->getPropertyValue(rtl::OUString("DispatchRecorderSupplier"));
         com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorderSupplier > xSupplier;
         aProp >>= xSupplier;
         if(xSupplier.is())
diff --git a/sfx2/source/control/sfxstatuslistener.cxx b/sfx2/source/control/sfxstatuslistener.cxx
index 0fa06828e1ec..8d4d2e58f762 100644
--- a/sfx2/source/control/sfxstatuslistener.cxx
+++ b/sfx2/source/control/sfxstatuslistener.cxx
@@ -67,7 +67,7 @@ SfxStatusListener::SfxStatusListener( const Reference< XDispatchProvider >& rDis
 {
     m_aCommand.Complete = rCommand;
     Reference < XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance(
-                                            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer"))), UNO_QUERY );
+                                            rtl::OUString("com.sun.star.util.URLTransformer")), UNO_QUERY );
     xTrans->parseStrict( m_aCommand );
     if ( rDispatchProvider.is() )
         m_xDispatch = rDispatchProvider->queryDispatch( m_aCommand, rtl::OUString(), 0 );
diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx
index 4c40b6734a00..e6f39e660c89 100644
--- a/sfx2/source/dialog/splitwin.cxx
+++ b/sfx2/source/dialog/splitwin.cxx
@@ -54,7 +54,7 @@ using namespace ::rtl;
 
 #define VERSION 1
 #define nPixel  30L
-#define USERITEM_NAME           OUString(RTL_CONSTASCII_USTRINGPARAM("UserItem"))
+#define USERITEM_NAME           OUString("UserItem")
 
 struct SfxDock_Impl
 {
diff --git a/sfx2/source/doc/plugin.cxx b/sfx2/source/doc/plugin.cxx
index 0f706c6da911..68fb03b71d10 100644
--- a/sfx2/source/doc/plugin.cxx
+++ b/sfx2/source/doc/plugin.cxx
@@ -101,7 +101,7 @@ sal_Bool SAL_CALL PluginObject::load(
     const uno::Reference < frame::XFrame >& xFrame )
 throw( uno::RuntimeException )
 {
-    uno::Reference< plugin::XPluginManager > xPMgr( mxFact->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.plugin.PluginManager")) ), uno::UNO_QUERY );
+    uno::Reference< plugin::XPluginManager > xPMgr( mxFact->createInstance( ::rtl::OUString("com.sun.star.plugin.PluginManager") ), uno::UNO_QUERY );
     if (!xPMgr.is() )
         return sal_False;
 
@@ -145,9 +145,9 @@ throw( uno::RuntimeException )
                     uno::Reference< beans::XPropertySet > xProp( xModel, ::uno::UNO_QUERY );
                     if( xProp.is() )
                     {
-                        uno::Any aValue = xProp->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "URL" ) ) );
+                        uno::Any aValue = xProp->getPropertyValue( ::rtl::OUString( "URL"  ) );
                         aValue >>= maURL;
-                        aValue = xProp->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TYPE" ) ) );
+                        aValue = xProp->getPropertyValue( ::rtl::OUString( "TYPE"  ) );
                         aValue >>= maMimeType;
                     }
                 }
diff --git a/sfx2/source/doc/printhelper.cxx b/sfx2/source/doc/printhelper.cxx
index 33b33a679104..2728c03169f5 100644
--- a/sfx2/source/doc/printhelper.cxx
+++ b/sfx2/source/doc/printhelper.cxx
@@ -655,7 +655,7 @@ void SAL_CALL SfxPrintHelper::print(const uno::Sequence< beans::PropertyValue >&
                 aCheckedArgs[nProps++].Value <<= sFileURL;
                 // and append the local filename
                 aCheckedArgs.realloc( aCheckedArgs.getLength()+1 );
-                aCheckedArgs[nProps].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LocalFileName"));
+                aCheckedArgs[nProps].Name = rtl::OUString("LocalFileName");
                 aCheckedArgs[nProps++].Value <<= ::rtl::OUString( sTemp );
             }
             else
@@ -671,7 +671,7 @@ void SAL_CALL SfxPrintHelper::print(const uno::Sequence< beans::PropertyValue >&
                 aCheckedArgs[nProps++].Value <<= sTemp;
                 // and append the local filename
                 aCheckedArgs.realloc( aCheckedArgs.getLength()+1 );
-                aCheckedArgs[nProps].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LocalFileName"));
+                aCheckedArgs[nProps].Name = rtl::OUString("LocalFileName");
                 aCheckedArgs[nProps++].Value <<= ::rtl::OUString( sPath );
             }
             else
@@ -689,7 +689,7 @@ void SAL_CALL SfxPrintHelper::print(const uno::Sequence< beans::PropertyValue >&
                 pUCBPrintTempFile->EnableKillingFile();
 
                 //FIXME: does it work?
-                aCheckedArgs[nProps].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LocalFileName"));
+                aCheckedArgs[nProps].Name = rtl::OUString("LocalFileName");
                 aCheckedArgs[nProps++].Value <<= ::rtl::OUString( pUCBPrintTempFile->GetFileName() );
                 sUcbUrl = sURL;
             }
@@ -714,7 +714,7 @@ void SAL_CALL SfxPrintHelper::print(const uno::Sequence< beans::PropertyValue >&
             sal_Bool bTemp = sal_Bool();
             if ( rProp.Value >>= bTemp )
             {
-                aCheckedArgs[nProps].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Collate"));
+                aCheckedArgs[nProps].Name = rtl::OUString("Collate");
                 aCheckedArgs[nProps++].Value <<= bTemp;
             }
             else
diff --git a/sfx2/source/statbar/stbitem.cxx b/sfx2/source/statbar/stbitem.cxx
index c74c66e0d209..7c7254f8f99c 100644
--- a/sfx2/source/statbar/stbitem.cxx
+++ b/sfx2/source/statbar/stbitem.cxx
@@ -87,7 +87,7 @@ svt::StatusbarController* SAL_CALL SfxStatusBarControllerFactory(
     util::URL aTargetURL;
     aTargetURL.Complete = aCommandURL;
     uno::Reference < util::XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance(
-        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer"))), uno::UNO_QUERY );
+        rtl::OUString("com.sun.star.util.URLTransformer")), uno::UNO_QUERY );
     xTrans->parseStrict( aTargetURL );
 
     SfxObjectShell* pObjShell = NULL;
diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx
index d1bab1090826..af628d16a190 100644
--- a/sfx2/source/view/sfxbasecontroller.cxx
+++ b/sfx2/source/view/sfxbasecontroller.cxx
@@ -412,7 +412,7 @@ void SAL_CALL IMPL_SfxBaseController_CloseListenerHelper::queryClosing( const EV
                     pShell->TakeFrameOwnerShip_Impl();
             }
 
-            throw com::sun::star::util::CloseVetoException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Controller disagree ...")),static_cast< ::cppu::OWeakObject*>(this));
+            throw com::sun::star::util::CloseVetoException(::rtl::OUString("Controller disagree ..."),static_cast< ::cppu::OWeakObject*>(this));
         }
     }
 }
@@ -1217,7 +1217,7 @@ throw (::com::sun::star::uno::RuntimeException)
 
         SfxViewFrame* pViewFrame( m_pData->m_pViewShell->GetFrame() );
         SfxSlotPool*  pPool( &SfxSlotPool::GetSlotPool( pViewFrame ));
-        rtl::OUString aCmdPrefix( RTL_CONSTASCII_USTRINGPARAM( ".uno:" ));
+        rtl::OUString aCmdPrefix( ".uno:" );
 
         SfxSlotPool* pSlotPool = pPool ? pPool : &SFX_SLOTPOOL();
         for ( sal_uInt16 i=0; i<pSlotPool->GetGroupCount(); i++ )
@@ -1297,8 +1297,8 @@ void SfxBaseController::ConnectSfxFrame_Impl( const ConnectSfxFrame i_eConnect )
                     {
                         uno::Reference< beans::XPropertySet > xFrameProps( m_pData->m_xFrame, uno::UNO_QUERY_THROW );
                         uno::Reference< beans::XPropertySet > xLayouterProps(
-                            xFrameProps->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" ) ) ), uno::UNO_QUERY_THROW );
-                        xLayouterProps->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PreserveContentSize" ) ), uno::makeAny( sal_True ) );
+                            xFrameProps->getPropertyValue( ::rtl::OUString( "LayoutManager"  ) ), uno::UNO_QUERY_THROW );
+                        xLayouterProps->setPropertyValue( ::rtl::OUString( "PreserveContentSize"  ), uno::makeAny( sal_True ) );
                     }
                     catch (const uno::Exception&)
                     {