targeted string re-work

Change-Id: I120b321166bb078b44d8b9894a1f906e9c6a611f

10 files changed, 107 insertions, 109 deletions

diff --git a/sfx2/qa/cppunit/test_metadatable.cxx b/sfx2/qa/cppunit/test_metadatable.cxx
index 8a6db03b99c2..dcec3aed005f 100644
--- a/sfx2/qa/cppunit/test_metadatable.cxx
+++ b/sfx2/qa/cppunit/test_metadatable.cxx
@@ -117,12 +117,12 @@ void MetadatableTest::test()
     MockMetadatable m4(*pReg);
     MockMetadatable m5(*pReg);
     ::rtl::OUString empty;
-    ::rtl::OUString content( RTL_CONSTASCII_USTRINGPARAM("content.xml") );
-    ::rtl::OUString styles( RTL_CONSTASCII_USTRINGPARAM("styles.xml") );
-    ::rtl::OUString sid1( RTL_CONSTASCII_USTRINGPARAM("id1") );
-    ::rtl::OUString sid2( RTL_CONSTASCII_USTRINGPARAM("id2") );
-    ::rtl::OUString sid3( RTL_CONSTASCII_USTRINGPARAM("id3") );
-    ::rtl::OUString sid4( RTL_CONSTASCII_USTRINGPARAM("id4") );
+    ::rtl::OUString content( "content.xml" );
+    ::rtl::OUString styles( "styles.xml" );
+    ::rtl::OUString sid1( "id1" );
+    ::rtl::OUString sid2( "id2" );
+    ::rtl::OUString sid3( "id3" );
+    ::rtl::OUString sid4( "id4" );
     beans::StringPair id1(content, sid1);
     beans::StringPair id2(content, sid2);
     beans::StringPair id3(content, sid3);
diff --git a/sfx2/source/appl/xpackcreator.cxx b/sfx2/source/appl/xpackcreator.cxx
index 44c4ed180959..07cc2256c961 100644
--- a/sfx2/source/appl/xpackcreator.cxx
+++ b/sfx2/source/appl/xpackcreator.cxx
@@ -46,15 +46,15 @@ using namespace ::com::sun::star;
 uno::Sequence< ::rtl::OUString > SAL_CALL OPackageStructureCreator::impl_getStaticSupportedServiceNames()
 {
     uno::Sequence< ::rtl::OUString > aRet(2);
-    aRet[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.embed.PackageStructureCreator"));
-    aRet[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.embed.PackageStructureCreator"));
+    aRet[0] = ::rtl::OUString("com.sun.star.embed.PackageStructureCreator");
+    aRet[1] = ::rtl::OUString("com.sun.star.comp.embed.PackageStructureCreator");
     return aRet;
 }
 
 //-------------------------------------------------------------------------
 ::rtl::OUString SAL_CALL OPackageStructureCreator::impl_getStaticImplementationName()
 {
-    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.embed.PackageStructureCreator"));
+    return ::rtl::OUString("com.sun.star.comp.embed.PackageStructureCreator");
 }
 
 //-------------------------------------------------------------------------
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 360590f75588..aa537a6a5304 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -108,7 +108,7 @@ SfxUnoControllerItem::SfxUnoControllerItem( SfxControllerItem *pItem, SfxBinding
     DBG_ASSERT( !pCtrlItem || !pCtrlItem->IsBound(), "ControllerItem is incorrect!" );
 
     aCommand.Complete = rCmd;
-    Reference < XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer"))), UNO_QUERY );
+    Reference < XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance( rtl::OUString("com.sun.star.util.URLTransformer")), UNO_QUERY );
     xTrans->parseStrict( aCommand );
     pBindings->RegisterUnoController_Impl( this );
 }
@@ -464,7 +464,7 @@ SfxDispatchController_Impl::SfxDispatchController_Impl(
         rtl::OStringBuffer aTmp(RTL_CONSTASCII_STRINGPARAM(".uno:"));
         aTmp.append(pUnoName);
         aDispatchURL.Complete = ::rtl::OStringToOUString(aTmp.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US);
-        Reference < ::com::sun::star::util::XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer"))), UNO_QUERY );
+        Reference < ::com::sun::star::util::XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance( rtl::OUString("com.sun.star.util.URLTransformer")), UNO_QUERY );
         xTrans->parseStrict( aDispatchURL );
     }
 
@@ -688,7 +688,7 @@ void SAL_CALL SfxDispatchController_Impl::dispatch( const ::com::sun::star::util
             // so we must retrieve this as an argument from the parsed URL
             lNewArgs.realloc( lNewArgs.getLength()+1 );
             nMarkArg = lNewArgs.getLength()-1;
-            lNewArgs[nMarkArg].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Bookmark"));
+            lNewArgs[nMarkArg].Name = ::rtl::OUString("Bookmark");
             lNewArgs[nMarkArg].Value <<= aURL.Mark;
         }
 
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index 64d28b731c10..fe4e8be65a8c 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -52,7 +52,7 @@
 using namespace ::com::sun::star::uno;
 using namespace ::rtl;
 
-#define USERITEM_NAME           OUString(RTL_CONSTASCII_USTRINGPARAM("UserItem"))
+#define USERITEM_NAME           OUString("UserItem")
 
 TYPEINIT1(SfxTabDialogItem,SfxSetItem);
 
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index e06df27a42af..3a2a8ecd846d 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -2571,12 +2571,12 @@ IMPL_LINK( SfxTemplateDialog_Impl, ToolBoxRClick, ToolBox *, pBox )
         boost::scoped_ptr<PopupMenu> pMenu(new PopupMenu);
         uno::Reference< container::XNameAccess > xNameAccess(
                     ::comphelper::getProcessServiceFactory()->
-                    createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-                            "com.sun.star.frame.UICommandDescription")) ), uno::UNO_QUERY );
+                    createInstance( ::rtl::OUString(
+                            "com.sun.star.frame.UICommandDescription") ), uno::UNO_QUERY );
         uno::Reference< container::XNameAccess > xUICommands;
         if ( xNameAccess.is() )
         {
-            rtl::OUString sTextDoc(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextDocument"));
+            rtl::OUString sTextDoc("com.sun.star.text.TextDocument");
             if(xNameAccess->hasByName(sTextDoc))
             {
                 uno::Any a = xNameAccess->getByName( sTextDoc );
@@ -2588,18 +2588,18 @@ IMPL_LINK( SfxTemplateDialog_Impl, ToolBoxRClick, ToolBox *, pBox )
         try
         {
             uno::Sequence< beans::PropertyValue > aPropSeq;
-            uno::Any aCommand = xUICommands->getByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:StyleNewByExample")));
+            uno::Any aCommand = xUICommands->getByName(::rtl::OUString(".uno:StyleNewByExample"));
             ::rtl::OUString sLabel = lcl_GetLabel( aCommand );
             pMenu->InsertItem( SID_STYLE_NEW_BY_EXAMPLE, sLabel );
             pMenu->SetHelpId(SID_STYLE_NEW_BY_EXAMPLE, HID_TEMPLDLG_NEWBYEXAMPLE);
 
-            aCommand = xUICommands->getByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:StyleUpdateByExample")));
+            aCommand = xUICommands->getByName(::rtl::OUString(".uno:StyleUpdateByExample"));
             sLabel = lcl_GetLabel( aCommand );
 
             pMenu->InsertItem( SID_STYLE_UPDATE_BY_EXAMPLE, sLabel );
             pMenu->SetHelpId(SID_STYLE_UPDATE_BY_EXAMPLE, HID_TEMPLDLG_UPDATEBYEXAMPLE);
 
-            aCommand = xUICommands->getByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:LoadStyles")));
+            aCommand = xUICommands->getByName(::rtl::OUString(".uno:LoadStyles"));
             sLabel = lcl_GetLabel( aCommand );
             pMenu->InsertItem( SID_TEMPLATE_LOAD, sLabel );
             pMenu->SetHelpId(SID_TEMPLATE_LOAD, ".uno:LoadStyles");
diff --git a/sfx2/source/menu/thessubmenu.cxx b/sfx2/source/menu/thessubmenu.cxx
index 21d44dc8ced5..c5665c7a59f3 100644
--- a/sfx2/source/menu/thessubmenu.cxx
+++ b/sfx2/source/menu/thessubmenu.cxx
@@ -79,8 +79,7 @@ SfxThesSubMenuHelper::SfxThesSubMenuHelper()
     {
         uno::Reference< lang::XMultiServiceFactory >  xMSF( ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW );
         m_xLngMgr = uno::Reference< linguistic2::XLinguServiceManager >( xMSF->createInstance(
-                OUString( RTL_CONSTASCII_USTRINGPARAM(
-                    "com.sun.star.linguistic2.LinguServiceManager" ))), uno::UNO_QUERY_THROW );
+                OUString( "com.sun.star.linguistic2.LinguServiceManager" )), uno::UNO_QUERY_THROW );
         m_xThesarus = m_xLngMgr->getThesaurus();
     }
     catch (const uno::Exception &)
@@ -154,7 +153,7 @@ String SfxThesSubMenuHelper::GetThesImplName( const lang::Locale &rLocale ) cons
     if (m_xLngMgr.is())
     {
         uno::Sequence< OUString > aServiceNames = m_xLngMgr->getConfiguredServices(
-                OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.linguistic2.Thesaurus")), rLocale );
+                OUString("com.sun.star.linguistic2.Thesaurus"), rLocale );
         // there should be at most one thesaurus configured for each language
         DBG_ASSERT( aServiceNames.getLength() <= 1, "more than one thesaurus found. Should not be possible" );
         if (aServiceNames.getLength() == 1)
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx
index 25ef143b4c30..d288eef37ece 100644
--- a/sfx2/source/toolbox/tbxitem.cxx
+++ b/sfx2/source/toolbox/tbxitem.cxx
@@ -143,7 +143,7 @@ svt::ToolboxController* SAL_CALL SfxToolBoxControllerFactory( const Reference< X
 
     URL aTargetURL;
     aTargetURL.Complete = aCommandURL;
-    Reference < XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer"))), UNO_QUERY );
+    Reference < XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance( rtl::OUString("com.sun.star.util.URLTransformer")), UNO_QUERY );
     xTrans->parseStrict( aTargetURL );
     if ( !aTargetURL.Arguments.isEmpty() )
         return NULL;
@@ -438,7 +438,7 @@ void SfxToolBoxControl::Dispatch(
         ::com::sun::star::util::URL aTargetURL;
         aTargetURL.Complete = rCommand;
         Reference < XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance(
-                                            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer"))),
+                                            rtl::OUString("com.sun.star.util.URLTransformer")),
                                           UNO_QUERY );
         xTrans->parseStrict( aTargetURL );
 
@@ -708,7 +708,7 @@ throw (::com::sun::star::uno::RuntimeException)
         {
             try
             {
-                xPropSet->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ResourceURL" ))) >>= aSubToolBarResName;
+                xPropSet->getPropertyValue( ::rtl::OUString( "ResourceURL" )) >>= aSubToolBarResName;
             }
             catch ( com::sun::star::beans::UnknownPropertyException& )
             {
@@ -742,7 +742,7 @@ throw (::com::sun::star::uno::RuntimeException)
             Reference< ::com::sun::star::beans::XPropertySet > xProp( xUIElement, UNO_QUERY );
             if ( xSubToolBar.is() && xProp.is() )
             {
-                rtl::OUString aPersistentString( RTL_CONSTASCII_USTRINGPARAM( "Persistent" ));
+                rtl::OUString aPersistentString( "Persistent" );
                 try
                 {
                     Window*  pTbxWindow = VCLUnoHelper::GetWindow( xSubToolBar );
@@ -758,7 +758,7 @@ throw (::com::sun::star::uno::RuntimeException)
                         xLayoutManager->setElementPos( aSubToolBarResName, aEvent.FloatingPosition );
                         xLayoutManager->showElement( aSubToolBarResName );
 
-                        xProp->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Persistent" )), a );
+                        xProp->setPropertyValue( rtl::OUString( "Persistent" ), a );
                     }
                 }
                 catch ( ::com::sun::star::uno::RuntimeException& )
@@ -803,18 +803,17 @@ void SfxToolBoxControl::createAndPositionSubToolBar( const ::rtl::OUString& rSub
         {
             xUIEementFactory = Reference< XUIElementFactory >(
                 xServiceManager->createInstance(
-                    rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
-                        "com.sun.star.ui.UIElementFactoryManager" ))),
+                    rtl::OUString( "com.sun.star.ui.UIElementFactoryManager" )),
                 UNO_QUERY );
             xWeakUIElementFactory = xUIEementFactory;
         }
 
         Sequence< PropertyValue > aPropSeq( 3 );
-        aPropSeq[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Frame" ));
+        aPropSeq[0].Name = rtl::OUString( "Frame" );
         aPropSeq[0].Value <<= xFrame;
-        aPropSeq[1].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Persistent" ));
+        aPropSeq[1].Name = rtl::OUString( "Persistent" );
         aPropSeq[1].Value <<= sal_False;
-        aPropSeq[2].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PopupMode" ));
+        aPropSeq[2].Name = rtl::OUString( "PopupMode" );
         aPropSeq[2].Value <<= sal_True;
 
         try
@@ -1604,7 +1603,7 @@ void SfxAppToolBoxControl_Impl::Select( sal_Bool bMod1 )
             aTargetURL.Complete = aLastURL;
             getURLTransformer()->parseStrict( aTargetURL );
 
-            ::rtl::OUString aTarget( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_default")));
+            ::rtl::OUString aTarget( ::rtl::OUString("_default"));
             if ( pMenu )
             {
                 ::framework::MenuConfiguration::Attributes* pMenuAttributes =
@@ -1620,8 +1619,8 @@ void SfxAppToolBoxControl_Impl::Select( sal_Bool bMod1 )
             {
                 Sequence< PropertyValue > aArgs( 1 );
 
-                aArgs[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Referer"));
-                aArgs[0].Value = makeAny( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SFX_REFERER_USER )) );
+                aArgs[0].Name = ::rtl::OUString("Referer");
+                aArgs[0].Value = makeAny( ::rtl::OUString(SFX_REFERER_USER ) );
 
                 ExecuteInfo* pExecuteInfo = new ExecuteInfo;
                 pExecuteInfo->xDispatch     = xDispatch;
@@ -1652,7 +1651,7 @@ long Select_Impl( void* /*pHdl*/, void* pVoid )
     URL aTargetURL;
     aTargetURL.Complete = aURL;
     Reference < XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance(
-                                            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer"))),
+                                            rtl::OUString("com.sun.star.util.URLTransformer")),
                                           UNO_QUERY );
     xTrans->parseStrict( aTargetURL );
 
@@ -1664,7 +1663,7 @@ long Select_Impl( void* /*pHdl*/, void* pVoid )
             xDisp = xProv->queryDispatch( aTargetURL, ::rtl::OUString(), 0 );
         else
         {
-            ::rtl::OUString aTargetFrame( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_blank")) );
+            ::rtl::OUString aTargetFrame( ::rtl::OUString("_blank") );
             ::framework::MenuConfiguration::Attributes* pMenuAttributes =
                 (::framework::MenuConfiguration::Attributes*)pMenu->GetUserValue( pMenu->GetCurItemId() );
 
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 155c194d05ee..72da247620a9 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -216,7 +216,7 @@ static sal_Bool AskPasswordToModify_Impl( const uno::Reference< task::XInteracti
                 else
                 {
                     // the binary format
-                    bResult = ( SfxMedium::CreatePasswordToModifyHash( pPasswordRequest->getPasswordToModify(), ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.TextDocument" ) ).equals( pFilter->GetServiceName() ) ) == nPasswordHash );
+                    bResult = ( SfxMedium::CreatePasswordToModifyHash( pPasswordRequest->getPasswordToModify(), ::rtl::OUString( "com.sun.star.text.TextDocument"  ).equals( pFilter->GetServiceName() ) ) == nPasswordHash );
                 }
             }
             else
@@ -696,7 +696,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq )
 
                 if (!pInteractionItem)
                 {
-                    Reference < ::com::sun::star::task::XInteractionHandler > xHdl( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.uui.UUIInteractionHandler"))), UNO_QUERY );
+                    Reference < ::com::sun::star::task::XInteractionHandler > xHdl( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString("com.sun.star.comp.uui.UUIInteractionHandler")), UNO_QUERY );
                     if (xHdl.is())
                         pNewSet->Put( SfxUnoAnyItem(SID_INTERACTIONHANDLER,::com::sun::star::uno::makeAny(xHdl)) );
                 }
@@ -1968,12 +1968,12 @@ SfxViewShell* SfxViewFrame::LoadViewIntoFrame_Impl( const SfxObjectShell& i_rDoc
     else
         aTransformLoadArgs.remove( "Hidden" );
 
-    ::rtl::OUString sURL( RTL_CONSTASCII_USTRINGPARAM( "private:object" ) );
+    ::rtl::OUString sURL( "private:object"  );
     if ( sURL.isEmpty() )
         sURL = i_rDoc.GetFactory().GetFactoryURL();
 
     Reference< XComponentLoader > xLoader( i_rFrame, UNO_QUERY_THROW );
-    xLoader->loadComponentFromURL( sURL, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_self")), 0,
+    xLoader->loadComponentFromURL( sURL, ::rtl::OUString("_self"), 0,
         aTransformLoadArgs.getPropertyValues() );
 
     SfxViewShell* pViewShell = SfxViewShell::Get( i_rFrame->getController() );
@@ -2342,16 +2342,16 @@ void SfxViewFrame::ExecView_Impl
 */
 sal_Bool impl_maxOpenDocCountReached()
 {
-    static ::rtl::OUString SERVICE_DESKTOP(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop"));
+    static ::rtl::OUString SERVICE_DESKTOP("com.sun.star.frame.Desktop");
 
     try
     {
         css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR = ::comphelper::getProcessServiceFactory();
         css::uno::Any aVal = ::comphelper::ConfigurationHelper::readDirectKey(
                                 xSMGR,
-                                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Common/")),
-                                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Misc")),
-                                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MaxOpenDocuments")),
+                                ::rtl::OUString("org.openoffice.Office.Common/"),
+                                ::rtl::OUString("Misc"),
+                                ::rtl::OUString("MaxOpenDocuments"),
                                 ::comphelper::ConfigurationHelper::E_READONLY);
 
         // NIL means: count of allowed documents = infinite !
@@ -2643,7 +2643,7 @@ void SfxViewFrame::AddDispatchMacroToBasic_Impl( const ::rtl::OUString& sMacro )
         String aLocation;
         Reference< XMultiServiceFactory > xSMgr = ::comphelper::getProcessServiceFactory();
         Reference< com::sun::star::uri::XUriReferenceFactory > xFactory( xSMgr->createInstance(
-            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uri.UriReferenceFactory")) ), UNO_QUERY );
+            ::rtl::OUString("com.sun.star.uri.UriReferenceFactory") ), UNO_QUERY );
         if ( xFactory.is() )
         {
             Reference< com::sun::star::uri::XVndSunStarScriptUrl > xUrl( xFactory->parse( aScriptURL ), UNO_QUERY );
@@ -2660,7 +2660,7 @@ void SfxViewFrame::AddDispatchMacroToBasic_Impl( const ::rtl::OUString& sMacro )
                     aMacroName = aName.getToken( 0, cTok, nIndex );
 
                 // get location
-                ::rtl::OUString aLocKey(RTL_CONSTASCII_USTRINGPARAM("location"));
+                ::rtl::OUString aLocKey("location");
                 if ( xUrl->hasParameter( aLocKey ) )
                     aLocation = xUrl->getParameter( aLocKey );
             }
@@ -2814,7 +2814,7 @@ void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq )
         case SID_RECORDMACRO :
         {
             // try to find any active recorder on this frame
-            ::rtl::OUString sProperty(RTL_CONSTASCII_USTRINGPARAM("DispatchRecorderSupplier"));
+            ::rtl::OUString sProperty("DispatchRecorderSupplier");
             com::sun::star::uno::Reference< com::sun::star::frame::XFrame > xFrame(
                     GetFrame().GetFrameInterface(),
                     com::sun::star::uno::UNO_QUERY);
@@ -2859,11 +2859,11 @@ void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq )
                         com::sun::star::uno::UNO_QUERY);
 
                 xRecorder = com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder >(
-                        xFactory->createInstance(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.DispatchRecorder"))),
+                        xFactory->createInstance(rtl::OUString("com.sun.star.frame.DispatchRecorder")),
                         com::sun::star::uno::UNO_QUERY);
 
                 xSupplier = com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorderSupplier >(
-                        xFactory->createInstance(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.DispatchRecorderSupplier"))),
+                        xFactory->createInstance(rtl::OUString("com.sun.star.frame.DispatchRecorderSupplier")),
                         com::sun::star::uno::UNO_QUERY);
 
                 xSupplier->setDispatchRecorder(xRecorder);
@@ -2890,7 +2890,7 @@ void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq )
             {
                 try
                 {
-                    Any aValue = xPropSet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" )));
+                    Any aValue = xPropSet->getPropertyValue( rtl::OUString( "LayoutManager" ));
                     aValue >>= xLayoutManager;
                 }
                 catch ( Exception& )
@@ -2900,7 +2900,7 @@ void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq )
 
             if ( xLayoutManager.is() )
             {
-                rtl::OUString aStatusbarResString( RTL_CONSTASCII_USTRINGPARAM( "private:resource/statusbar/statusbar" ));
+                rtl::OUString aStatusbarResString( "private:resource/statusbar/statusbar" );
                 // Evaluate parameter.
                 SFX_REQUEST_ARG(rReq, pShowItem, SfxBoolItem, rReq.GetSlot(), sal_False);
                 sal_Bool bShow( sal_True );
@@ -2944,7 +2944,7 @@ void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq )
                     {
                         try
                         {
-                            Any aValue = xPropSet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" )));
+                            Any aValue = xPropSet->getPropertyValue( rtl::OUString( "LayoutManager" ));
                             aValue >>= xLayoutManager;
                         }
                         catch ( Exception& )
@@ -2961,7 +2961,7 @@ void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq )
                             try
                             {
                                 xLMPropSet->setPropertyValue(
-                                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "HideCurrentUI" )),
+                                    ::rtl::OUString( "HideCurrentUI" ),
                                     makeAny( bNewFullScreenMode ));
                             }
                             catch ( ::com::sun::star::beans::UnknownPropertyException& )
@@ -3020,7 +3020,7 @@ void SfxViewFrame::MiscState_Impl(SfxItemSet &rSet)
                         break;
                     }
 
-                    ::rtl::OUString sProperty(RTL_CONSTASCII_USTRINGPARAM("DispatchRecorderSupplier"));
+                    ::rtl::OUString sProperty("DispatchRecorderSupplier");
                     com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > xSet(
                             GetFrame().GetFrameInterface(),
                             com::sun::star::uno::UNO_QUERY);
@@ -3045,7 +3045,7 @@ void SfxViewFrame::MiscState_Impl(SfxItemSet &rSet)
                         break;
                     }
 
-                    ::rtl::OUString sProperty(RTL_CONSTASCII_USTRINGPARAM("DispatchRecorderSupplier"));
+                    ::rtl::OUString sProperty("DispatchRecorderSupplier");
                     com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > xSet(
                             GetFrame().GetFrameInterface(),
                             com::sun::star::uno::UNO_QUERY);
@@ -3064,13 +3064,13 @@ void SfxViewFrame::MiscState_Impl(SfxItemSet &rSet)
                             GetFrame().GetFrameInterface(),
                             com::sun::star::uno::UNO_QUERY);
                     com::sun::star::uno::Any aProp = xSet->getPropertyValue(
-                        rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" )) );
+                        rtl::OUString( "LayoutManager" ) );
 
                     if ( !( aProp >>= xLayoutManager ))
                         rSet.Put( SfxBoolItem( nWhich, sal_False ));
                     else
                     {
-                        rtl::OUString aStatusbarResString( RTL_CONSTASCII_USTRINGPARAM( "private:resource/statusbar/statusbar" ));
+                        rtl::OUString aStatusbarResString( "private:resource/statusbar/statusbar" );
                         sal_Bool bShow = xLayoutManager->isElementVisible( aStatusbarResString );
                         rSet.Put( SfxBoolItem( nWhich, bShow ));
                     }
@@ -3149,20 +3149,20 @@ void SfxViewFrame::ChildWindowExecute( SfxRequest &rReq )
         else
         {
             ::com::sun::star::util::URL aTargetURL;
-            aTargetURL.Complete = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".component:DB/DataSourceBrowser"));
-            Reference < ::com::sun::star::util::XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer"))), UNO_QUERY );
+            aTargetURL.Complete = ::rtl::OUString(".component:DB/DataSourceBrowser");
+            Reference < ::com::sun::star::util::XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance( rtl::OUString("com.sun.star.util.URLTransformer")), UNO_QUERY );
             xTrans->parseStrict( aTargetURL );
 
             Reference < XDispatchProvider > xProv( xFrame, UNO_QUERY );
             Reference < ::com::sun::star::frame::XDispatch > xDisp;
             if ( xProv.is() )
-                xDisp = xProv->queryDispatch( aTargetURL, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_beamer")), 31 );
+                xDisp = xProv->queryDispatch( aTargetURL, ::rtl::OUString("_beamer"), 31 );
             if ( xDisp.is() )
             {
                 Sequence < ::com::sun::star::beans::PropertyValue > aArgs(1);
                 ::com::sun::star::beans::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");
                 xDisp->dispatch( aTargetURL, aArgs );
             }
         }
diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx
index 405390b6b455..a8c19a2b0145 100644
--- a/sfx2/source/view/viewprn.cxx
+++ b/sfx2/source/view/viewprn.cxx
@@ -141,10 +141,10 @@ SfxPrinterController::SfxPrinterController( const boost::shared_ptr<Printer>& i_
             setValue( rProps[nProp].Name, rProps[nProp].Value );
 
         Sequence< beans::PropertyValue > aRenderOptions( 3 );
-        aRenderOptions[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ExtraPrintUIOptions" ) );
-        aRenderOptions[1].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "View" ) );
+        aRenderOptions[0].Name = rtl::OUString( "ExtraPrintUIOptions"  );
+        aRenderOptions[1].Name = rtl::OUString( "View"  );
         aRenderOptions[1].Value = i_rViewProp;
-        aRenderOptions[2].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsPrinter" ) );
+        aRenderOptions[2].Name = rtl::OUString( "IsPrinter"  );
         aRenderOptions[2].Value <<= sal_True;
         try
         {
@@ -169,10 +169,10 @@ SfxPrinterController::SfxPrinterController( const boost::shared_ptr<Printer>& i_
     }
 
     // set some job parameters
-    setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsApi" ) ), makeAny( i_bApi ) );
-    setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsDirect" ) ), makeAny( i_bDirect ) );
-    setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsPrinter" ) ), makeAny( sal_True ) );
-    setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "View" ) ), i_rViewProp );
+    setValue( rtl::OUString( "IsApi"  ), makeAny( i_bApi ) );
+    setValue( rtl::OUString( "IsDirect"  ), makeAny( i_bDirect ) );
+    setValue( rtl::OUString( "IsPrinter"  ), makeAny( sal_True ) );
+    setValue( rtl::OUString( "View"  ), i_rViewProp );
 }
 
 void SfxPrinterController::Notify( SfxBroadcaster& , const SfxHint& rHint )
@@ -195,7 +195,7 @@ SfxPrinterController::~SfxPrinterController()
 
 const Any& SfxPrinterController::getSelectionObject() const
 {
-    const beans::PropertyValue* pVal = getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintSelectionOnly" ) ) );
+    const beans::PropertyValue* pVal = getValue( rtl::OUString( "PrintSelectionOnly"  ) );
     if( pVal )
     {
         sal_Bool bSel = sal_False;
@@ -204,7 +204,7 @@ const Any& SfxPrinterController::getSelectionObject() const
     }
 
     sal_Int32 nChoice = 0;
-    pVal = getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintContent" ) ) );
+    pVal = getValue( rtl::OUString( "PrintContent"  ) );
     if( pVal )
         pVal->Value >>= nChoice;
     return (nChoice > 1) ? maSelection : maCompleteSelection;
@@ -222,7 +222,7 @@ Sequence< beans::PropertyValue > SfxPrinterController::getMergedOptions() const
     }
 
     Sequence< beans::PropertyValue > aRenderOptions( 1 );
-    aRenderOptions[ 0 ].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "RenderDevice" ) );
+    aRenderOptions[ 0 ].Name = rtl::OUString( "RenderDevice"  );
     aRenderOptions[ 0 ].Value <<= mxDevice;
 
     aRenderOptions = getJobProperties( aRenderOptions );
@@ -633,15 +633,15 @@ void SfxViewShell::ExecPrint( const uno::Sequence < beans::PropertyValue >& rPro
     pImp->m_pPrinterController = pController;
 
     SfxObjectShell *pObjShell = GetObjectShell();
-    pController->setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "JobName" ) ),
+    pController->setValue( rtl::OUString( "JobName"  ),
                         makeAny( rtl::OUString( pObjShell->GetTitle(0) ) ) );
 
     // FIXME: job setup
     SfxPrinter* pDocPrt = GetPrinter(sal_False);
     JobSetup aJobSetup = pDocPrt ? pDocPrt->GetJobSetup() : GetJobSetup();
     if( bIsDirect )
-        aJobSetup.SetValue( String( RTL_CONSTASCII_USTRINGPARAM( "IsQuickJob" ) ),
-                            String( RTL_CONSTASCII_USTRINGPARAM( "true" ) ) );
+        aJobSetup.SetValue( String( "IsQuickJob"  ),
+                            String( "true"  ) );
 
     Printer::PrintJob( pController, aJobSetup );
 }
@@ -718,19 +718,19 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq )
                 for ( sal_Int32 nProp=0; nProp<aProps.getLength(); nProp++ )
                 {
                     if ( aProps[nProp].Name == "Copies" )
-                        aProps[nProp]. Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CopyCount"));
+                        aProps[nProp]. Name = rtl::OUString("CopyCount");
                     else if ( aProps[nProp].Name == "RangeText" )
-                        aProps[nProp]. Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Pages"));
+                        aProps[nProp]. Name = rtl::OUString("Pages");
                     if ( aProps[nProp].Name == "Asynchron" )
                     {
-                        aProps[nProp]. Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Wait"));
+                        aProps[nProp]. Name = rtl::OUString("Wait");
                         sal_Bool bAsynchron = sal_False;
                         aProps[nProp].Value >>= bAsynchron;
                         aProps[nProp].Value <<= (sal_Bool) (!bAsynchron);
                     }
                     if ( aProps[nProp].Name == "Silent" )
                     {
-                        aProps[nProp]. Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MonitorVisible"));
+                        aProps[nProp]. Name = rtl::OUString("MonitorVisible");
                         sal_Bool bPrintSilent = sal_False;
                         aProps[nProp].Value >>= bPrintSilent;
                         aProps[nProp].Value <<= (sal_Bool) (!bPrintSilent);
@@ -746,7 +746,7 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq )
             {
                 sal_Int32 nLen = aProps.getLength();
                 aProps.realloc( nLen + 1 );
-                aProps[nLen].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintSelectionOnly" ) );
+                aProps[nLen].Name = rtl::OUString( "PrintSelectionOnly"  );
                 aProps[nLen].Value = makeAny( bSelection );
             }
 
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index 6b6b067acc0e..31f421f6bafa 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -245,7 +245,7 @@ static ::rtl::OUString RetrieveLabelFromCommand(
         {
             xModuleManager = css::uno::Reference< css::frame::XModuleManager >(
                 xSMGR->createInstance(
-                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ModuleManager" ))),
+                    ::rtl::OUString( "com.sun.star.frame.ModuleManager" )),
                     css::uno::UNO_QUERY_THROW );
             s_xModuleManager = xModuleManager;
         }
@@ -256,7 +256,7 @@ static ::rtl::OUString RetrieveLabelFromCommand(
         {
             xNameAccess = css::uno::Reference< css::container::XNameAccess >(
                 xSMGR->createInstance(
-                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.UICommandDescription" ))),
+                    ::rtl::OUString( "com.sun.star.frame.UICommandDescription" )),
                     css::uno::UNO_QUERY_THROW );
             s_xNameAccess = xNameAccess;
         }
@@ -326,9 +326,9 @@ static ::rtl::OUString impl_retrieveFilterNameFromTypeAndModule(
 {
     // Retrieve filter from type
     css::uno::Sequence< css::beans::NamedValue > aQuery( 2 );
-    aQuery[0].Name  = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Type" ));
+    aQuery[0].Name  = rtl::OUString( "Type" );
     aQuery[0].Value = css::uno::makeAny( rType );
-    aQuery[1].Name  = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DocumentService" ));
+    aQuery[1].Name  = rtl::OUString( "DocumentService" );
     aQuery[1].Value = css::uno::makeAny( rModuleIdentifier );
 
     css::uno::Reference< css::container::XEnumeration > xEnumeration =
@@ -339,11 +339,11 @@ static ::rtl::OUString impl_retrieveFilterNameFromTypeAndModule(
     {
         ::comphelper::SequenceAsHashMap aFilterPropsHM( xEnumeration->nextElement() );
         ::rtl::OUString aFilterName = aFilterPropsHM.getUnpackedValueOrDefault(
-            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name")),
+            ::rtl::OUString("Name"),
             ::rtl::OUString() );
 
         sal_Int32 nFilterFlags = aFilterPropsHM.getUnpackedValueOrDefault(
-            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Flags")),
+            ::rtl::OUString("Flags"),
             sal_Int32( 0 ) );
 
         if ( nFilterFlags & nFlags )
@@ -369,7 +369,7 @@ enum ETypeFamily
 ::rtl::OUString impl_searchFormatTypeForApp(const css::uno::Reference< css::frame::XFrame >& xFrame     ,
                                                   ETypeFamily                                eTypeFamily)
 {
-    static ::rtl::OUString SERVICENAME_MODULEMANAGER(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.ModuleManager"));
+    static ::rtl::OUString SERVICENAME_MODULEMANAGER("com.sun.star.frame.ModuleManager");
 
     try
     {
@@ -384,32 +384,32 @@ enum ETypeFamily
             case E_MS_DOC:
             {
                 if ( sModule == "com.sun.star.text.TextDocument" )
-                    sType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "writer_MS_Word_97" ));
+                    sType = ::rtl::OUString( "writer_MS_Word_97" );
                 else
                 if ( sModule == "com.sun.star.sheet.SpreadsheetDocument" )
-                    sType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "calc_MS_Excel_97" ));
+                    sType = ::rtl::OUString( "calc_MS_Excel_97" );
                 else
                 if ( sModule == "com.sun.star.drawing.DrawingDocument" )
-                    sType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "impress_MS_PowerPoint_97" ));
+                    sType = ::rtl::OUString( "impress_MS_PowerPoint_97" );
                 else
                 if ( sModule == "com.sun.star.presentation.PresentationDocument" )
-                    sType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "impress_MS_PowerPoint_97" ));
+                    sType = ::rtl::OUString( "impress_MS_PowerPoint_97" );
             }
             break;
 
             case E_OOO_DOC:
             {
                 if ( sModule == "com.sun.star.text.TextDocument" )
-                    sType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "writer8" ));
+                    sType = ::rtl::OUString( "writer8" );
                 else
                 if ( sModule == "com.sun.star.sheet.SpreadsheetDocument" )
-                    sType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "calc8" ));
+                    sType = ::rtl::OUString( "calc8" );
                 else
                 if ( sModule == "com.sun.star.drawing.DrawingDocument" )
-                    sType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "draw8" ));
+                    sType = ::rtl::OUString( "draw8" );
                 else
                 if ( sModule == "com.sun.star.presentation.PresentationDocument" )
-                    sType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "impress8" ));
+                    sType = ::rtl::OUString( "impress8" );
             }
             break;
         }
@@ -481,20 +481,20 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq )
             {
                 try
                 {
-                    Any aValue = xPropSet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" )));
+                    Any aValue = xPropSet->getPropertyValue( rtl::OUString( "LayoutManager" ));
                     aValue >>= xLayoutManager;
                     if ( xLayoutManager.is() )
                     {
-                        rtl::OUString aTextResString( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/textobjectbar" ));
+                        rtl::OUString aTextResString( "private:resource/toolbar/textobjectbar" );
                         uno::Reference< ui::XUIElement > xElement = xLayoutManager->getElement( aTextResString );
                         if(!xElement.is())
                         {
-                            rtl::OUString aFrameResString( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/frameobjectbar" ));
+                            rtl::OUString aFrameResString( "private:resource/toolbar/frameobjectbar" );
                             xElement = xLayoutManager->getElement( aFrameResString );
                         }
                         if(!xElement.is())
                         {
-                            rtl::OUString aOleResString( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/oleobjectbar" ));
+                            rtl::OUString aOleResString( "private:resource/toolbar/oleobjectbar" );
                             xElement = xLayoutManager->getElement( aOleResString );
                         }
                         if(xElement.is())
@@ -575,7 +575,7 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq )
                     eResult = aModel.SaveAndSend( xFrame, rtl::OUString() );
                 else
                 if ( nId == SID_MAIL_SENDDOCASPDF )
-                    eResult = aModel.SaveAndSend( xFrame, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "pdf_Portable_Document_Format" )));
+                    eResult = aModel.SaveAndSend( xFrame, rtl::OUString( "pdf_Portable_Document_Format" ));
                 else
                 if ( nId == SID_MAIL_SENDDOCASMS )
                 {
@@ -615,7 +615,7 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq )
             css::uno::Reference < css::frame::XFrame >        xFrame( pFrame->GetFrame().GetFrameInterface() );
             css::uno::Reference< css::frame::XModel >         xModel;
 
-            const rtl::OUString aModuleManager( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ModuleManager" ));
+            const rtl::OUString aModuleManager( "com.sun.star.frame.ModuleManager" );
             css::uno::Reference< css::frame::XModuleManager > xModuleManager( xSMGR->createInstance( aModuleManager ), css::uno::UNO_QUERY_THROW );
             if ( !xModuleManager.is() )
             {
@@ -648,9 +648,9 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq )
             if ( xModel.is() && xStorable.is() )
             {
                 rtl::OUString aFilterName;
-                rtl::OUString aTypeName( RTL_CONSTASCII_USTRINGPARAM( HTML_DOCUMENT_TYPE ));
+                rtl::OUString aTypeName( HTML_DOCUMENT_TYPE );
                 rtl::OUString aFileName;
-                rtl::OUString aExtension( RTL_CONSTASCII_USTRINGPARAM( "htm" ));
+                rtl::OUString aExtension( "htm" );
 
                 rtl::OUString aLocation = xStorable->getLocation();
                 INetURLObject aFileObj( aLocation );
@@ -660,7 +660,7 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq )
 
                 css::uno::Reference< css::container::XContainerQuery > xContainerQuery(
                     xSMGR->createInstance( rtl::OUString(
-                        RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.FilterFactory" ))),
+                        "com.sun.star.document.FilterFactory" )),
                         css::uno::UNO_QUERY_THROW );
 
                 // Retrieve filter from type
@@ -670,7 +670,7 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq )
                 {
                     // Draw/Impress uses a different type. 2nd chance try to use alternative type name
                     aFilterName = impl_retrieveFilterNameFromTypeAndModule(
-                        xContainerQuery, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( HTML_GRAPHIC_TYPE )), aModule, nFilterFlags );
+                        xContainerQuery, ::rtl::OUString( HTML_GRAPHIC_TYPE ), aModule, nFilterFlags );
                 }
 
                 // No filter found => error
@@ -685,7 +685,7 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq )
                 if ( !bHasLocation )
                 {
                     // Create a default file name with the correct extension
-                    const rtl::OUString aPreviewFileName( RTL_CONSTASCII_USTRINGPARAM( "webpreview" ));
+                    const rtl::OUString aPreviewFileName( "webpreview" );
                     aFileName = aPreviewFileName;
                 }
                 else
@@ -708,7 +708,7 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq )
                 rtl::OUString aFileURL = aFilePathObj.GetMainURL( INetURLObject::NO_DECODE );
 
                 css::uno::Sequence< css::beans::PropertyValue > aArgs( 1 );
-                aArgs[0].Name  = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FilterName" ));
+                aArgs[0].Name  = rtl::OUString( "FilterName" );
                 aArgs[0].Value = css::uno::makeAny( aFilterName );
 
                 // Store document in the html format
@@ -841,7 +841,7 @@ void SfxViewShell::GetState_Impl( SfxItemSet &rSet )
 
                             ::rtl::OUStringBuffer aBuffer( 60 );
                             aBuffer.append( RetrieveLabelFromCommand(
-                                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:PrintDefault" )),
+                                ::rtl::OUString( ".uno:PrintDefault" ),
                                 xFrame ));
                             aBuffer.appendAscii(RTL_CONSTASCII_STRINGPARAM(" ("));
                             aBuffer.append( aPrinterName );