targeted string re-work

Change-Id: Id47f6b85f2516826108ea2b2be9ef6fccf1ba264

7 files changed, 44 insertions, 44 deletions

diff --git a/svx/source/dialog/pfiledlg.cxx b/svx/source/dialog/pfiledlg.cxx
index 4ebb51356be8..340e549b5300 100644
--- a/svx/source/dialog/pfiledlg.cxx
+++ b/svx/source/dialog/pfiledlg.cxx
@@ -83,7 +83,7 @@ SvxPluginFileDlg::SvxPluginFileDlg (Window *, sal_uInt16 nKind )
     if( xMgr.is() )
     {
         uno::Reference< plugin::XPluginManager > rPluginManager( xMgr->createInstance(
-            OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.plugin.PluginManager")) ), uno::UNO_QUERY );
+            OUString("com.sun.star.plugin.PluginManager") ), uno::UNO_QUERY );
         if ( rPluginManager.is() )
         {
             const uno::Sequence<plugin::PluginDescription > aSeq( rPluginManager->getPluginDescriptions() );
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index eaaa637d759c..e577e09d3525 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -129,12 +129,12 @@ struct SearchDlg_Impl
         bDeltaCalculated( sal_False ),
         pRanges         ( NULL )
         {
-            aCommand1URL.Complete = aCommand1URL.Main = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.search:SearchViaComponent1"));
-            aCommand1URL.Protocol = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.search:"));
-            aCommand1URL.Path = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SearchViaComponent1"));
-            aCommand2URL.Complete = aCommand2URL.Main = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.search:SearchViaComponent2"));
-            aCommand2URL.Protocol = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.search:"));
-            aCommand2URL.Path = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SearchViaComponent2"));
+            aCommand1URL.Complete = aCommand1URL.Main = rtl::OUString("vnd.sun.search:SearchViaComponent1");
+            aCommand1URL.Protocol = rtl::OUString("vnd.sun.search:");
+            aCommand1URL.Path = rtl::OUString("SearchViaComponent1");
+            aCommand2URL.Complete = aCommand2URL.Main = rtl::OUString("vnd.sun.search:SearchViaComponent2");
+            aCommand2URL.Protocol = rtl::OUString("vnd.sun.search:");
+            aCommand2URL.Path = rtl::OUString("SearchViaComponent2");
         }
     ~SearchDlg_Impl() { delete[] pRanges; }
 };
@@ -452,7 +452,7 @@ void SvxSearchDialog::Construct_Impl()
     // vnd.sun.star::SearchViaComponent1 and 2 are supported
     const uno::Reference< frame::XFrame >xFrame = rBindings.GetActiveFrame();
     const uno::Reference< frame::XDispatchProvider > xDispatchProv(xFrame, uno::UNO_QUERY);
-    rtl::OUString sTarget(RTL_CONSTASCII_USTRINGPARAM("_self"));
+    rtl::OUString sTarget("_self");
 
     bool bSearchComponent1 = false;
     bool bSearchComponent2 = false;
@@ -473,27 +473,27 @@ void SvxSearchDialog::Construct_Impl()
         {
             uno::Reference< lang::XMultiServiceFactory >  xMgr = getProcessServiceFactory();
             uno::Reference< lang::XMultiServiceFactory > xConfigurationProvider(xMgr->createInstance(
-                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.configuration.ConfigurationProvider"))),
+                    ::rtl::OUString(  "com.sun.star.configuration.ConfigurationProvider")),
                     uno::UNO_QUERY);
             uno::Sequence< uno::Any > aArgs(1);
-            ::rtl::OUString sPath(RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.Common/SearchOptions/"));
+            ::rtl::OUString sPath( "/org.openoffice.Office.Common/SearchOptions/");
             aArgs[0] <<= sPath;
 
             uno::Reference< uno::XInterface > xIFace = xConfigurationProvider->createInstanceWithArguments(
-                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.configuration.ConfigurationUpdateAccess")),
+                        ::rtl::OUString( "com.sun.star.configuration.ConfigurationUpdateAccess"),
                         aArgs);
             uno::Reference< container::XNameAccess> xDirectAccess(xIFace, uno::UNO_QUERY);
             if(xDirectAccess.is())
             {
                 ::rtl::OUString sTemp;
-                ::rtl::OUString sProperty(RTL_CONSTASCII_USTRINGPARAM( "ComponentSearchGroupLabel"));
+                ::rtl::OUString sProperty( "ComponentSearchGroupLabel");
                 uno::Any aRet = xDirectAccess->getByName(sProperty);
                 aRet >>= sTemp;
                 aSearchComponentFL.SetText( sTemp );
-                aRet = xDirectAccess->getByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ComponentSearchCommandLabel1")));
+                aRet = xDirectAccess->getByName(::rtl::OUString( "ComponentSearchCommandLabel1"));
                 aRet >>= sTemp;
                 aSearchComponent1PB.SetText( sTemp );
-                aRet = xDirectAccess->getByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ComponentSearchCommandLabel2")));
+                aRet = xDirectAccess->getByName(::rtl::OUString( "ComponentSearchCommandLabel2"));
                 aRet >>= sTemp;
                 aSearchComponent2PB.SetText( sTemp );
             }
@@ -1541,9 +1541,9 @@ IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn )
     {
         uno::Sequence < beans::PropertyValue > aArgs(2);
         beans::PropertyValue* pArgs = aArgs.getArray();
-        pArgs[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SearchString"));
+        pArgs[0].Name = ::rtl::OUString("SearchString");
         pArgs[0].Value <<= ::rtl::OUString(aSearchLB.GetText());
-        pArgs[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParentWindow"));
+        pArgs[1].Name = ::rtl::OUString("ParentWindow");
         pArgs[1].Value <<= VCLUnoHelper::GetInterface( this );
         if(pBtn == &aSearchComponent1PB)
         {
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index 8b18e12efe4d..1e66287d8b83 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -416,7 +416,7 @@ Reference< XCustomShapeEngine > SdrObjCustomShape::GetCustomShapeEngine( const S
         {
             Sequence< Any > aArgument( 1 );
             Sequence< PropertyValue > aPropValues( 1 );
-            aPropValues[ 0 ].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CustomShape"));
+            aPropValues[ 0 ].Name = rtl::OUString("CustomShape");
             aPropValues[ 0 ].Value <<= aXShape;
             aArgument[ 0 ] <<= aPropValues;
             Reference< XInterface > xInterface( xFactory->createInstanceWithArguments( aEngine, aArgument ) );
@@ -1053,7 +1053,7 @@ void SdrObjCustomShape::MergeDefaultAttributes( const rtl::OUString* pType )
     }
 
     // Equations //
-    const rtl::OUString sEquations( RTL_CONSTASCII_USTRINGPARAM( "Equations" ) );
+    const rtl::OUString sEquations(  "Equations"  );
     pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sEquations );
     if ( !pAny && pDefCustomShape && pDefCustomShape->nCalculation && pDefCustomShape->pCalculation )
     {
@@ -1070,7 +1070,7 @@ void SdrObjCustomShape::MergeDefaultAttributes( const rtl::OUString* pType )
     }
 
     // Handles //
-    const rtl::OUString sHandles( RTL_CONSTASCII_USTRINGPARAM( "Handles" ) );
+    const rtl::OUString sHandles(  "Handles"  );
     pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sHandles );
     if ( !pAny && pDefCustomShape && pDefCustomShape->nHandles && pDefCustomShape->pHandles )
     {
@@ -1260,7 +1260,7 @@ sal_Bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType )
 
         case DEFAULT_EQUATIONS :
         {
-            const rtl::OUString sEquations( RTL_CONSTASCII_USTRINGPARAM( "Equations" ) );
+            const rtl::OUString sEquations(  "Equations"  );
             pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sEquations );
             if ( pAny && pDefCustomShape && pDefCustomShape->nCalculation && pDefCustomShape->pCalculation )
             {
@@ -1285,7 +1285,7 @@ sal_Bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType )
 
         case DEFAULT_TEXTFRAMES :
         {
-            const rtl::OUString sTextFrames( RTL_CONSTASCII_USTRINGPARAM( "TextFrames" ) );
+            const rtl::OUString sTextFrames(  "TextFrames"  );
             pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sPath, sTextFrames );
             if ( pAny && pDefCustomShape && pDefCustomShape->nTextRect && pDefCustomShape->pTextRect )
             {
@@ -1313,7 +1313,7 @@ sal_Bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType )
 
         case DEFAULT_HANDLES :
         {
-            const rtl::OUString sHandles( RTL_CONSTASCII_USTRINGPARAM( "Handles" ) );
+            const rtl::OUString sHandles(  "Handles"  );
             pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sHandles );
             if ( pAny && pDefCustomShape && pDefCustomShape->nHandles && pDefCustomShape->pHandles )
             {
@@ -3178,11 +3178,11 @@ sdr::contact::ViewContact* SdrObjCustomShape::CreateObjectSpecificViewContact()
 bool SdrObjCustomShape::doConstructOrthogonal(const ::rtl::OUString& rName)
 {
     bool bRetval(false);
-    static ::rtl::OUString Imps_sNameASOrtho_quadrat( RTL_CONSTASCII_USTRINGPARAM( "quadrat" ) );
-    static ::rtl::OUString Imps_sNameASOrtho_round_quadrat( RTL_CONSTASCII_USTRINGPARAM( "round-quadrat" ) );
-    static ::rtl::OUString Imps_sNameASOrtho_circle( RTL_CONSTASCII_USTRINGPARAM( "circle" ) );
-    static ::rtl::OUString Imps_sNameASOrtho_circle_pie( RTL_CONSTASCII_USTRINGPARAM( "circle-pie" ) );
-    static ::rtl::OUString Imps_sNameASOrtho_ring( RTL_CONSTASCII_USTRINGPARAM( "ring" ) );
+    static ::rtl::OUString Imps_sNameASOrtho_quadrat(  "quadrat"  );
+    static ::rtl::OUString Imps_sNameASOrtho_round_quadrat(  "round-quadrat"  );
+    static ::rtl::OUString Imps_sNameASOrtho_circle(  "circle"  );
+    static ::rtl::OUString Imps_sNameASOrtho_circle_pie(  "circle-pie"  );
+    static ::rtl::OUString Imps_sNameASOrtho_ring(  "ring"  );
 
     if(Imps_sNameASOrtho_quadrat.equalsIgnoreAsciiCase(rName))
     {
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index e768ca88cc9a..8c111dce9133 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -438,7 +438,7 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::deactivatedUI()
     com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager > xLayoutManager(getLayoutManager());
     if ( xLayoutManager.is() )
     {
-        const static rtl::OUString aMenuBarURL( RTL_CONSTASCII_USTRINGPARAM( "private:resource/menubar/menubar" ));
+        const static rtl::OUString aMenuBarURL(  "private:resource/menubar/menubar" );
         if ( !xLayoutManager->isElementVisible( aMenuBarURL ) )
             xLayoutManager->createElement( aMenuBarURL );
     }
@@ -454,7 +454,7 @@ uno::Reference< ::com::sun::star::frame::XLayoutManager > SAL_CALL SdrLightEmbed
     uno::Reference < beans::XPropertySet > xFrame( lcl_getFrame_throw(mpObj));
     try
     {
-        xMan.set(xFrame->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LayoutManager")) ),uno::UNO_QUERY);
+        xMan.set(xFrame->getPropertyValue( ::rtl::OUString("LayoutManager") ),uno::UNO_QUERY);
     }
     catch ( uno::Exception& )
     {
@@ -908,7 +908,7 @@ sal_Bool SdrOle2Obj::UpdateLinkURL_Impl()
 
                         // TODO/LATER: there should be possible to get current mediadescriptor settings from the object
                         uno::Sequence< beans::PropertyValue > aArgs( 1 );
-                        aArgs[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "URL" ) );
+                        aArgs[0].Name = ::rtl::OUString(  "URL"  );
                         aArgs[0].Value <<= ::rtl::OUString( aNewLinkURL );
                         xPersObj->reload( aArgs, uno::Sequence< beans::PropertyValue >() );
 
diff --git a/svx/source/svdraw/svdotextpathdecomposition.cxx b/svx/source/svdraw/svdotextpathdecomposition.cxx
index 0276f0599f65..c5eeafacfdd7 100644
--- a/svx/source/svdraw/svdotextpathdecomposition.cxx
+++ b/svx/source/svdraw/svdotextpathdecomposition.cxx
@@ -272,7 +272,7 @@ namespace
         {
             // prepare BreakIterator
             Reference < XMultiServiceFactory > xMSF = ::comphelper::getProcessServiceFactory();
-            Reference < XInterface > xInterface = xMSF->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.BreakIterator")));
+            Reference < XInterface > xInterface = xMSF->createInstance(::rtl::OUString("com.sun.star.i18n.BreakIterator"));
 
             if(xInterface.is())
             {
diff --git a/svx/source/svdraw/svdouno.cxx b/svx/source/svdraw/svdouno.cxx
index bd8836343fa7..78868bc34f6d 100644
--- a/svx/source/svdraw/svdouno.cxx
+++ b/svx/source/svdraw/svdouno.cxx
@@ -254,7 +254,7 @@ void SdrUnoObj::SetContextWritingMode( const sal_Int16 _nContextWritingMode )
     {
         uno::Reference< beans::XPropertySet > xModelProperties( GetUnoControlModel(), uno::UNO_QUERY_THROW );
         xModelProperties->setPropertyValue(
-            ::rtl::OUString::intern( RTL_CONSTASCII_USTRINGPARAM( "ContextWritingMode" ) ),
+            ::rtl::OUString::intern(  "ContextWritingMode"  ),
             uno::makeAny( _nContextWritingMode )
         );
     }
@@ -343,7 +343,7 @@ SdrUnoObj& SdrUnoObj::operator= (const SdrUnoObj& rObj)
     uno::Reference< beans::XPropertySet > xSet(xUnoControlModel, uno::UNO_QUERY);
     if (xSet.is())
     {
-        uno::Any aValue( xSet->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultControl"))) );
+        uno::Any aValue( xSet->getPropertyValue( rtl::OUString("DefaultControl")) );
         ::rtl::OUString aStr;
 
         if( aValue >>= aStr )
diff --git a/svx/source/unodraw/recoveryui.cxx b/svx/source/unodraw/recoveryui.cxx
index c831fbaeae55..27dfa6e9670b 100644
--- a/svx/source/unodraw/recoveryui.cxx
+++ b/svx/source/unodraw/recoveryui.cxx
@@ -45,8 +45,8 @@
 //===============================================
 // const
 
-#define IMPLEMENTATIONNAME_RECOVERYUI       ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.svx.RecoveryUI"))
-#define SERVICENAME_RECOVERYUI              ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.dialog.RecoveryUI"))
+#define IMPLEMENTATIONNAME_RECOVERYUI       ::rtl::OUString("com.sun.star.comp.svx.RecoveryUI")
+#define SERVICENAME_RECOVERYUI              ::rtl::OUString("com.sun.star.dialog.RecoveryUI")
 
 //===============================================
 // namespace
@@ -191,16 +191,16 @@ static OUString GetCrashConfigDir()
 {
 
 #if defined(WNT)
-    OUString    ustrValue = OUString(RTL_CONSTASCII_USTRINGPARAM("${$BRAND_BASE_DIR/program/bootstrap.ini:UserInstallation}"));
+    OUString    ustrValue = OUString("${$BRAND_BASE_DIR/program/bootstrap.ini:UserInstallation}");
 #elif defined(MACOSX)
-    OUString    ustrValue = OUString(RTL_CONSTASCII_USTRINGPARAM("~"));
+    OUString    ustrValue = OUString("~");
 #else
-    OUString    ustrValue = OUString(RTL_CONSTASCII_USTRINGPARAM("$SYSUSERCONFIG"));
+    OUString    ustrValue = OUString("$SYSUSERCONFIG");
 #endif
     Bootstrap::expandMacros( ustrValue );
 
 #if defined(WNT)
-    ustrValue += OUString(RTL_CONSTASCII_USTRINGPARAM("/user/crashdata"));
+    ustrValue += OUString("/user/crashdata");
 #endif
     return ustrValue;
 }
@@ -218,8 +218,8 @@ static OUString GetUnsentURL()
 {
     OUString    aURL = GetCrashConfigDir();
 
-    aURL += OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ) );
-    aURL += OUString( RTL_CONSTASCII_USTRINGPARAM( LCKFILE ) );
+    aURL += OUString(  "/"  );
+    aURL += OUString(  LCKFILE  );
 
     return aURL;
 }
@@ -292,9 +292,9 @@ void RecoveryUI::impl_doRecovery()
 {
     sal_Bool bRecoveryOnly( sal_False );
 
-    ::rtl::OUString CFG_PACKAGE_RECOVERY( RTL_CONSTASCII_USTRINGPARAM  ( "org.openoffice.Office.Recovery/" ));
-    ::rtl::OUString CFG_PATH_CRASHREPORTER( RTL_CONSTASCII_USTRINGPARAM( "CrashReporter"                 ));
-    ::rtl::OUString CFG_ENTRY_ENABLED( RTL_CONSTASCII_USTRINGPARAM     ( "Enabled"                       ));
+    ::rtl::OUString CFG_PACKAGE_RECOVERY( "org.openoffice.Office.Recovery/");
+    ::rtl::OUString CFG_PATH_CRASHREPORTER(  "CrashReporter" );
+    ::rtl::OUString CFG_ENTRY_ENABLED( "Enabled" );
 
     sal_Bool bCrashRepEnabled(sal_False);
     css::uno::Any aVal = ::comphelper::ConfigurationHelper::readDirectKey(