targeted string re-work

Change-Id: Ic08995a67a407576da475a6716b1218e45b60dfd

5 files changed, 27 insertions, 43 deletions

diff --git a/ucb/source/cacher/cachedcontentresultset.cxx b/ucb/source/cacher/cachedcontentresultset.cxx
index 4c66b382dbe0..e08b6572f530 100644
--- a/ucb/source/cacher/cachedcontentresultset.cxx
+++ b/ucb/source/cacher/cachedcontentresultset.cxx
@@ -443,10 +443,10 @@ public:
         throw( RuntimeException );
 };
 
-OUString    CCRS_PropertySetInfo::m_aPropertyNameForCount( RTL_CONSTASCII_USTRINGPARAM("RowCount") );
-OUString    CCRS_PropertySetInfo::m_aPropertyNameForFinalCount( RTL_CONSTASCII_USTRINGPARAM("IsRowCountFinal") );
-OUString    CCRS_PropertySetInfo::m_aPropertyNameForFetchSize( RTL_CONSTASCII_USTRINGPARAM("FetchSize") );
-OUString    CCRS_PropertySetInfo::m_aPropertyNameForFetchDirection( RTL_CONSTASCII_USTRINGPARAM("FetchDirection") );
+OUString    CCRS_PropertySetInfo::m_aPropertyNameForCount( "RowCount" );
+OUString    CCRS_PropertySetInfo::m_aPropertyNameForFinalCount( "IsRowCountFinal" );
+OUString    CCRS_PropertySetInfo::m_aPropertyNameForFetchSize( "FetchSize" );
+OUString    CCRS_PropertySetInfo::m_aPropertyNameForFetchDirection( "FetchDirection" );
 
 CCRS_PropertySetInfo::CCRS_PropertySetInfo(
         Reference< XPropertySetInfo > xInfo )
@@ -971,10 +971,10 @@ XTYPEPROVIDER_IMPL_11( CachedContentResultSet
 //--------------------------------------------------------------------------
 
 XSERVICEINFO_NOFACTORY_IMPL_1( CachedContentResultSet,
-                               OUString(RTL_CONSTASCII_USTRINGPARAM(
-                            "com.sun.star.comp.ucb.CachedContentResultSet" )),
-                            OUString(RTL_CONSTASCII_USTRINGPARAM(
-                            CACHED_CONTENT_RESULTSET_SERVICE_NAME )) );
+                               OUString(
+                            "com.sun.star.comp.ucb.CachedContentResultSet" ),
+                            OUString(
+                            CACHED_CONTENT_RESULTSET_SERVICE_NAME ) );
 
 //--------------------------------------------------------------------------
 // XPropertySet methods. ( inherited )
@@ -2150,8 +2150,7 @@ const Reference< XTypeConverter >& CachedContentResultSet::getTypeConverter()
         m_bTriedToGetTypeConverter = sal_True;
         m_xTypeConverter = Reference< XTypeConverter >(
                                 m_xSMgr->createInstance(
-                                    OUString(RTL_CONSTASCII_USTRINGPARAM(
-                                        "com.sun.star.script.Converter" )) ),
+                                    OUString( "com.sun.star.script.Converter" ) ),
                                 UNO_QUERY );
 
         OSL_ENSURE( m_xTypeConverter.is(),
@@ -2200,10 +2199,8 @@ XTYPEPROVIDER_IMPL_3( CachedContentResultSetFactory,
 //--------------------------------------------------------------------------
 
 XSERVICEINFO_IMPL_1( CachedContentResultSetFactory,
-                     OUString(RTL_CONSTASCII_USTRINGPARAM(
-                           "com.sun.star.comp.ucb.CachedContentResultSetFactory" )),
-                         OUString(RTL_CONSTASCII_USTRINGPARAM(
-                         CACHED_CONTENT_RESULTSET_FACTORY_NAME )) );
+                     OUString( "com.sun.star.comp.ucb.CachedContentResultSetFactory" ),
+                     OUString( CACHED_CONTENT_RESULTSET_FACTORY_NAME ) );
 
 //--------------------------------------------------------------------------
 // Service factory implementation.
diff --git a/ucb/source/cacher/cachedcontentresultsetstub.cxx b/ucb/source/cacher/cachedcontentresultsetstub.cxx
index b32a8b6b11ef..a3e858c59662 100644
--- a/ucb/source/cacher/cachedcontentresultsetstub.cxx
+++ b/ucb/source/cacher/cachedcontentresultsetstub.cxx
@@ -50,8 +50,8 @@ CachedContentResultSetStub::CachedContentResultSetStub( Reference< XResultSet >
                 , m_bFirstFetchSizePropagationDone( sal_False )
                 , m_nLastFetchSize( 1 )//this value is not important at all
                 , m_bLastFetchDirection( sal_True )//this value is not important at all
-                , m_aPropertyNameForFetchSize( OUString(RTL_CONSTASCII_USTRINGPARAM("FetchSize")) )
-                , m_aPropertyNameForFetchDirection( OUString(RTL_CONSTASCII_USTRINGPARAM("FetchDirection")) )
+                , m_aPropertyNameForFetchSize( OUString("FetchSize") )
+                , m_aPropertyNameForFetchDirection( OUString("FetchDirection") )
 {
     impl_init();
 }
@@ -172,10 +172,8 @@ Sequence< Type > SAL_CALL CachedContentResultSetStub
 //--------------------------------------------------------------------------
 
 XSERVICEINFO_NOFACTORY_IMPL_1( CachedContentResultSetStub,
-                        OUString(RTL_CONSTASCII_USTRINGPARAM(
-                        "com.sun.star.comp.ucb.CachedContentResultSetStub" )),
-                        OUString(RTL_CONSTASCII_USTRINGPARAM(
-                        CACHED_CRS_STUB_SERVICE_NAME )) );
+                        OUString( "com.sun.star.comp.ucb.CachedContentResultSetStub" ),
+                        OUString( CACHED_CRS_STUB_SERVICE_NAME ) );
 
 //-----------------------------------------------------------------
 // XFetchProvider methods.
@@ -531,10 +529,8 @@ XTYPEPROVIDER_IMPL_3( CachedContentResultSetStubFactory,
 //--------------------------------------------------------------------------
 
 XSERVICEINFO_IMPL_1( CachedContentResultSetStubFactory,
-                     OUString(RTL_CONSTASCII_USTRINGPARAM(
-                     "com.sun.star.comp.ucb.CachedContentResultSetStubFactory" )),
-                     OUString(RTL_CONSTASCII_USTRINGPARAM(
-                     CACHED_CRS_STUB_FACTORY_NAME )) );
+                     OUString( "com.sun.star.comp.ucb.CachedContentResultSetStubFactory" ),
+                     OUString( CACHED_CRS_STUB_FACTORY_NAME ) );
 
 //--------------------------------------------------------------------------
 // Service factory implementation.
diff --git a/ucb/source/cacher/cacheddynamicresultset.cxx b/ucb/source/cacher/cacheddynamicresultset.cxx
index 506c96f2e6dc..9075adc8484e 100644
--- a/ucb/source/cacher/cacheddynamicresultset.cxx
+++ b/ucb/source/cacher/cacheddynamicresultset.cxx
@@ -120,10 +120,8 @@ XTYPEPROVIDER_IMPL_4( CachedDynamicResultSet
 //--------------------------------------------------------------------------
 
 XSERVICEINFO_NOFACTORY_IMPL_1( CachedDynamicResultSet,
-                            OUString(RTL_CONSTASCII_USTRINGPARAM(
-                            "com.sun.star.comp.ucb.CachedDynamicResultSet" )),
-                            OUString(RTL_CONSTASCII_USTRINGPARAM(
-                            CACHED_DRS_SERVICE_NAME )) );
+                            OUString( "com.sun.star.comp.ucb.CachedDynamicResultSet" ),
+                            OUString( CACHED_DRS_SERVICE_NAME ) );
 
 //--------------------------------------------------------------------------
 // own methds. ( inherited )
@@ -176,10 +174,8 @@ XTYPEPROVIDER_IMPL_3( CachedDynamicResultSetFactory,
 //--------------------------------------------------------------------------
 
 XSERVICEINFO_IMPL_1( CachedDynamicResultSetFactory,
-                         OUString(RTL_CONSTASCII_USTRINGPARAM(
-                         "com.sun.star.comp.ucb.CachedDynamicResultSetFactory" )),
-                         OUString(RTL_CONSTASCII_USTRINGPARAM(
-                         CACHED_DRS_FACTORY_NAME )) );
+                         OUString( "com.sun.star.comp.ucb.CachedDynamicResultSetFactory" ),
+                         OUString( CACHED_DRS_FACTORY_NAME ) );
 
 //--------------------------------------------------------------------------
 // Service factory implementation.
diff --git a/ucb/source/cacher/cacheddynamicresultsetstub.cxx b/ucb/source/cacher/cacheddynamicresultsetstub.cxx
index 4bc18400f98c..01404c285004 100644
--- a/ucb/source/cacher/cacheddynamicresultsetstub.cxx
+++ b/ucb/source/cacher/cacheddynamicresultsetstub.cxx
@@ -122,10 +122,8 @@ XTYPEPROVIDER_IMPL_5( CachedDynamicResultSetStub
 //--------------------------------------------------------------------------
 
 XSERVICEINFO_NOFACTORY_IMPL_1( CachedDynamicResultSetStub,
-                        OUString(RTL_CONSTASCII_USTRINGPARAM(
-                        "com.sun.star.comp.ucb.CachedDynamicResultSetStub" )),
-                        OUString(RTL_CONSTASCII_USTRINGPARAM(
-                        CACHED_DRS_STUB_SERVICE_NAME )) );
+                        OUString( "com.sun.star.comp.ucb.CachedDynamicResultSetStub" ),
+                        OUString( CACHED_DRS_STUB_SERVICE_NAME ) );
 
 //--------------------------------------------------------------------------
 //--------------------------------------------------------------------------
@@ -166,10 +164,8 @@ XTYPEPROVIDER_IMPL_3( CachedDynamicResultSetStubFactory,
 //--------------------------------------------------------------------------
 
 XSERVICEINFO_IMPL_1( CachedDynamicResultSetStubFactory,
-                     OUString(RTL_CONSTASCII_USTRINGPARAM(
-                     "com.sun.star.comp.ucb.CachedDynamicResultSetStubFactory" )),
-                     OUString(RTL_CONSTASCII_USTRINGPARAM(
-                     CACHED_DRS_STUB_FACTORY_NAME )) );
+                     OUString( "com.sun.star.comp.ucb.CachedDynamicResultSetStubFactory" ),
+                     OUString( CACHED_DRS_STUB_FACTORY_NAME ) );
 
 //--------------------------------------------------------------------------
 // Service factory implementation.
@@ -216,8 +212,7 @@ void SAL_CALL CachedDynamicResultSetStubFactory
         try
         {
             xSortFactory = Reference< XSortedDynamicResultSetFactory >(
-                m_xSMgr->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM(
-                    "com.sun.star.ucb.SortedDynamicResultSetFactory" )) ),
+                m_xSMgr->createInstance( OUString( "com.sun.star.ucb.SortedDynamicResultSetFactory" ) ),
                 UNO_QUERY );
         }
         catch ( Exception const & )
diff --git a/ucb/source/cacher/contentresultsetwrapper.cxx b/ucb/source/cacher/contentresultsetwrapper.cxx
index 6b0c43367ac2..a31ed07fccce 100644
--- a/ucb/source/cacher/contentresultsetwrapper.cxx
+++ b/ucb/source/cacher/contentresultsetwrapper.cxx
@@ -319,7 +319,7 @@ sal_Bool SAL_CALL ContentResultSetWrapper
         }
         aGuard.reacquire();
 
-        OUString aName(RTL_CONSTASCII_USTRINGPARAM("ResultSetType"));
+        OUString aName("ResultSetType");
         //find out, if we are ForwardOnly and cache the value:
 
         impl_init_xPropertySetOrigin();