targeted string re-work

Change-Id: Ia43a1ac7e55f3823255d739fb0930fa23ec5ab27

5 files changed, 31 insertions, 31 deletions

diff --git a/sfx2/source/appl/helpinterceptor.cxx b/sfx2/source/appl/helpinterceptor.cxx
index 47d22e9b74e2..601c315c06a8 100644
--- a/sfx2/source/appl/helpinterceptor.cxx
+++ b/sfx2/source/appl/helpinterceptor.cxx
@@ -152,7 +152,7 @@ Reference< XDispatch > SAL_CALL HelpInterceptor_Impl::queryDispatch(
     if ( m_xSlaveDispatcher.is() )
         xResult = m_xSlaveDispatcher->queryDispatch( aURL, aTargetFrameName, nSearchFlags );
 
-    sal_Bool bHelpURL = aURL.Complete.toAsciiLowerCase().match(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.help")),0);
+    sal_Bool bHelpURL = aURL.Complete.toAsciiLowerCase().match(rtl::OUString("vnd.sun.star.help"),0);
 
     if ( bHelpURL )
     {
diff --git a/sfx2/source/bastyp/helper.cxx b/sfx2/source/bastyp/helper.cxx
index 5da2d95414ef..5739aa6fc74b 100644
--- a/sfx2/source/bastyp/helper.cxx
+++ b/sfx2/source/bastyp/helper.cxx
@@ -96,9 +96,9 @@ uno::Sequence < OUString > SfxContentHelper::GetResultSet( const String& rURL )
         uno::Reference< ucb::XDynamicResultSet > xDynResultSet;
         uno::Sequence< OUString > aProps(3);
         OUString* pProps = aProps.getArray();
-        pProps[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("Title"));
-        pProps[1] = OUString(RTL_CONSTASCII_USTRINGPARAM("ContentType"));
-        pProps[2] = OUString(RTL_CONSTASCII_USTRINGPARAM("IsFolder"));
+        pProps[0] = OUString("Title");
+        pProps[1] = OUString("ContentType");
+        pProps[2] = OUString("IsFolder");
 
         try
         {
@@ -180,14 +180,14 @@ uno::Sequence< OUString > SfxContentHelper::GetHelpTreeViewContents( const Strin
     {
         uno::Reference< lang::XMultiServiceFactory > xFactory = ::comphelper::getProcessServiceFactory();
         uno::Reference< task::XInteractionHandler > xInteractionHandler = uno::Reference< task::XInteractionHandler > (
-                    xFactory->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.task.InteractionHandler") ) ), uno::UNO_QUERY );
+                    xFactory->createInstance( ::rtl::OUString( "com.sun.star.task.InteractionHandler" ) ), uno::UNO_QUERY );
 
         ::ucbhelper::Content aCnt( rURL, new ::ucbhelper::CommandEnvironment( xInteractionHandler, uno::Reference< ucb::XProgressHandler >() ) );
         uno::Reference< sdbc::XResultSet > xResultSet;
         uno::Sequence< OUString > aProps(2);
         OUString* pProps = aProps.getArray();
-        pProps[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("Title"));
-        pProps[1] = OUString(RTL_CONSTASCII_USTRINGPARAM("IsFolder"));
+        pProps[0] = OUString("Title");
+        pProps[1] = OUString("IsFolder");
 
         try
         {
@@ -264,7 +264,7 @@ String SfxContentHelper::GetActiveHelpString( const String& rURL )
     {
         uno::Reference< lang::XMultiServiceFactory > xFactory = ::comphelper::getProcessServiceFactory();
         uno::Reference< task::XInteractionHandler > xInteractionHandler = uno::Reference< task::XInteractionHandler > (
-                    xFactory->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.task.InteractionHandler") ) ), uno::UNO_QUERY );
+                    xFactory->createInstance( ::rtl::OUString( "com.sun.star.task.InteractionHandler" ) ), uno::UNO_QUERY );
         ::ucbhelper::Content aCnt( rURL, new ::ucbhelper::CommandEnvironment( xInteractionHandler, uno::Reference< ucb::XProgressHandler >() ) );
         // open the "active help" stream
         uno::Reference< io::XInputStream > xStream = aCnt.openStream();
@@ -298,7 +298,7 @@ sal_Bool SfxContentHelper::IsHelpErrorDocument( const String& rURL )
     {
         ::ucbhelper::Content aCnt( INetURLObject( rURL ).GetMainURL( INetURLObject::NO_DECODE ),
                       uno::Reference< ucb::XCommandEnvironment > () );
-        if ( !( aCnt.getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("IsErrorDocument")) ) >>= bRet ) )
+        if ( !( aCnt.getPropertyValue( OUString("IsErrorDocument") ) >>= bRet ) )
         {
             SAL_WARN( "sfx2.bastyp", "Property 'IsErrorDocument' is missing" );
         }
@@ -321,7 +321,7 @@ sal_uIntPtr SfxContentHelper::GetSize( const String& rContent )
     try
     {
         ::ucbhelper::Content aCnt( aObj.GetMainURL( INetURLObject::NO_DECODE ), uno::Reference< ucb::XCommandEnvironment > () );
-        aCnt.getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("Size")) ) >>= nTemp;
+        aCnt.getPropertyValue( OUString("Size") ) >>= nTemp;
     }
     catch( const ucb::CommandAbortedException& )
     {
diff --git a/sfx2/source/doc/graphhelp.cxx b/sfx2/source/doc/graphhelp.cxx
index 8e79f753da79..8ed8bd8e9a1a 100644
--- a/sfx2/source/doc/graphhelp.cxx
+++ b/sfx2/source/doc/graphhelp.cxx
@@ -116,7 +116,7 @@ void* GraphicHelper::getEnhMetaFileFromGDI_Impl( const GDIMetaFile* pGDIMeta )
 #ifdef WNT
     if ( pGDIMeta )
     {
-        String aStr = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".emf"));
+        String aStr = ::rtl::OUString(".emf");
         ::utl::TempFile aTempFile( ::rtl::OUString(),
                                    &aStr,
                                    NULL,
@@ -462,25 +462,25 @@ sal_Bool GraphicHelper::getThumbnailReplacement_Impl( sal_Int32 nResID, const un
             {
                 uno::Reference< graphic::XGraphicProvider > xGraphProvider(
                     xServiceManager->createInstance(
-                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.graphic.GraphicProvider")) ),
+                        ::rtl::OUString("com.sun.star.graphic.GraphicProvider") ),
                     uno::UNO_QUERY );
                 if ( xGraphProvider.is() )
                 {
-                    ::rtl::OUString aURL(RTL_CONSTASCII_USTRINGPARAM("private:resource/sfx/bitmapex/"));
+                    ::rtl::OUString aURL("private:resource/sfx/bitmapex/");
                     aURL += ::rtl::OUString::valueOf( nResID );
 
                     uno::Sequence< beans::PropertyValue > aMediaProps( 1 );
-                    aMediaProps[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL"));
+                    aMediaProps[0].Name = ::rtl::OUString("URL");
                     aMediaProps[0].Value <<= aURL;
 
                     uno::Reference< graphic::XGraphic > xGraphic = xGraphProvider->queryGraphic( aMediaProps );
                     if ( xGraphic.is() )
                     {
                         uno::Sequence< beans::PropertyValue > aStoreProps( 2 );
-                        aStoreProps[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OutputStream"));
+                        aStoreProps[0].Name = ::rtl::OUString("OutputStream");
                         aStoreProps[0].Value <<= xStream;
-                        aStoreProps[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MimeType"));
-                        aStoreProps[1].Value <<= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("image/png"));
+                        aStoreProps[1].Name = ::rtl::OUString("MimeType");
+                        aStoreProps[1].Value <<= ::rtl::OUString("image/png");
 
                         xGraphProvider->storeGraphic( xGraphic, aStoreProps );
                         bResult = sal_True;
diff --git a/sfx2/source/doc/iframe.cxx b/sfx2/source/doc/iframe.cxx
index 69f740c8f19c..096902da7eaf 100644
--- a/sfx2/source/doc/iframe.cxx
+++ b/sfx2/source/doc/iframe.cxx
@@ -141,7 +141,7 @@ throw( uno::RuntimeException )
         // we must destroy the IFrame before the parent is destroyed
         xWindow->addEventListener( this );
 
-        mxFrame = uno::Reference< frame::XFrame >( mxFact->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Frame")) ),
+        mxFrame = uno::Reference< frame::XFrame >( mxFact->createInstance( ::rtl::OUString("com.sun.star.frame.Frame") ),
                     uno::UNO_QUERY );
         uno::Reference < awt::XWindow > xWin( pWin->GetComponentInterface(), uno::UNO_QUERY );
         mxFrame->initialize( xWin );
@@ -155,15 +155,15 @@ throw( uno::RuntimeException )
 
         util::URL aTargetURL;
         aTargetURL.Complete = ::rtl::OUString( maFrmDescr.GetURL().GetMainURL( INetURLObject::NO_DECODE ) );
-        uno::Reference < util::XURLTransformer > xTrans( mxFact->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer"))), uno::UNO_QUERY );
+        uno::Reference < util::XURLTransformer > xTrans( mxFact->createInstance( rtl::OUString("com.sun.star.util.URLTransformer")), uno::UNO_QUERY );
         xTrans->parseStrict( aTargetURL );
 
         uno::Sequence < beans::PropertyValue > aProps(2);
-        aProps[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PluginMode"));
+        aProps[0].Name = ::rtl::OUString("PluginMode");
         aProps[0].Value <<= (sal_Int16) 2;
-        aProps[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReadOnly"));
+        aProps[1].Name = ::rtl::OUString("ReadOnly");
         aProps[1].Value <<= (sal_Bool) sal_True;
-        uno::Reference < frame::XDispatch > xDisp = xProv->queryDispatch( aTargetURL, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_self")), 0 );
+        uno::Reference < frame::XDispatch > xDisp = xProv->queryDispatch( aTargetURL, ::rtl::OUString("_self"), 0 );
         if ( xDisp.is() )
             xDisp->dispatch( aTargetURL, aProps );
 
@@ -367,7 +367,7 @@ void SAL_CALL IFrameObject::removeVetoableChangeListener(const ::rtl::OUString&,
 ::sal_Int16 SAL_CALL IFrameObject::execute() throw (::com::sun::star::uno::RuntimeException)
 {
     SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
-    VclAbstractDialog* pDlg = pFact->CreateEditObjectDialog( NULL, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:InsertObjectFloatingFrame")), mxObj );
+    VclAbstractDialog* pDlg = pFact->CreateEditObjectDialog( NULL, rtl::OUString(".uno:InsertObjectFloatingFrame"), mxObj );
     if ( pDlg )
         pDlg->Execute();
     return 0;
diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx
index ec198973c59a..2892be7bfc23 100644
--- a/sfx2/source/view/ipclient.cxx
+++ b/sfx2/source/view/ipclient.cxx
@@ -256,14 +256,14 @@ void SAL_CALL SfxInPlaceClient_Impl::saveObject()
         // during storing of the embedded object
         uno::Reference< lang::XInitialization > xInit(
             xSrvMgr->createInstance(
-                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.framework.StatusIndicatorFactory" ))),
+                rtl::OUString( "com.sun.star.comp.framework.StatusIndicatorFactory" )),
             uno::UNO_QUERY_THROW );
         beans::PropertyValue aProperty;
         uno::Sequence< uno::Any > aArgs( 2 );
-        aProperty.Name  = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DisableReschedule" ));
+        aProperty.Name  = rtl::OUString( "DisableReschedule" );
         aProperty.Value = uno::makeAny( sal_True );
         aArgs[0] = uno::makeAny( aProperty );
-        aProperty.Name  = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Frame" ));
+        aProperty.Name  = rtl::OUString( "Frame" );
         aProperty.Value = uno::makeAny( xFrame );
         aArgs[1] = uno::makeAny( aProperty );
 
@@ -276,7 +276,7 @@ void SAL_CALL SfxInPlaceClient_Impl::saveObject()
             {
                 uno::Reference< task::XStatusIndicatorFactory > xStatusIndicatorFactory( xInit, uno::UNO_QUERY_THROW );
                 xStatusIndicator = xStatusIndicatorFactory->createStatusIndicator();
-                xPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IndicatorInterception" )), uno::makeAny( xStatusIndicator ));
+                xPropSet->setPropertyValue( rtl::OUString( "IndicatorInterception" ), uno::makeAny( xStatusIndicator ));
             }
             catch ( const uno::RuntimeException& )
             {
@@ -305,7 +305,7 @@ void SAL_CALL SfxInPlaceClient_Impl::saveObject()
         if ( xPropSet.is() )
         {
             xStatusIndicator.clear();
-            xPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IndicatorInterception" )), uno::makeAny( xStatusIndicator ));
+            xPropSet->setPropertyValue( rtl::OUString( "IndicatorInterception" ), uno::makeAny( xStatusIndicator ));
         }
     }
     catch ( const uno::RuntimeException& )
@@ -420,7 +420,7 @@ uno::Reference< ::com::sun::star::frame::XLayoutManager > SAL_CALL SfxInPlaceCli
     uno::Reference< ::com::sun::star::frame::XLayoutManager > xMan;
     try
     {
-        uno::Any aAny = xFrame->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LayoutManager")) );
+        uno::Any aAny = xFrame->getPropertyValue( ::rtl::OUString("LayoutManager") );
         aAny >>= xMan;
     }
     catch ( uno::Exception& )
@@ -917,11 +917,11 @@ ErrCode SfxInPlaceClient::DoVerb( long nVerb )
                     uno::Reference< lang::XMultiServiceFactory > xEmptyFactory;
                     SfxStoringHelper aHelper( xEmptyFactory );
                     uno::Sequence< beans::PropertyValue > aDispatchArgs( 1 );
-                    aDispatchArgs[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SaveTo" ) );
+                    aDispatchArgs[0].Name = ::rtl::OUString( "SaveTo"  );
                     aDispatchArgs[0].Value <<= (sal_Bool)sal_True;
 
                     aHelper.GUIStoreModel( xEmbModel,
-                                            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SaveAs" ) ),
+                                            ::rtl::OUString( "SaveAs"  ),
                                             aDispatchArgs,
                                             sal_False,
                                             ::rtl::OUString() );