targeted string re-work

Change-Id: Ic08995a67a407576da475a6716b1218e45b60dfd

2 files changed, 13 insertions, 20 deletions

diff --git a/ucb/source/sorter/sortdynres.cxx b/ucb/source/sorter/sortdynres.cxx
index 1b6c57dea78e..f208402784c1 100644
--- a/ucb/source/sorter/sortdynres.cxx
+++ b/ucb/source/sorter/sortdynres.cxx
@@ -135,10 +135,8 @@ XTYPEPROVIDER_IMPL_3( SortedDynamicResultSet,
 //--------------------------------------------------------------------------
 
 XSERVICEINFO_NOFACTORY_IMPL_1( SortedDynamicResultSet,
-                                   OUString(RTL_CONSTASCII_USTRINGPARAM(
-                                   "com.sun.star.comp.ucb.SortedDynamicResultSet" )),
-                                   OUString(RTL_CONSTASCII_USTRINGPARAM(
-                                   DYNAMIC_RESULTSET_SERVICE_NAME )) );
+                                   OUString( "com.sun.star.comp.ucb.SortedDynamicResultSet" ),
+                                   OUString( DYNAMIC_RESULTSET_SERVICE_NAME ) );
 
 //--------------------------------------------------------------------------
 // XComponent methods.
@@ -254,8 +252,7 @@ SortedDynamicResultSet::connectToCache(
         {
             xStubFactory = Reference< XCachedDynamicResultSetStubFactory >(
                 mxSMgr->createInstance(
-                    OUString(RTL_CONSTASCII_USTRINGPARAM(
-                        "com.sun.star.ucb.CachedDynamicResultSetStubFactory" )) ),
+                    OUString( "com.sun.star.ucb.CachedDynamicResultSetStubFactory" ) ),
                 UNO_QUERY );
         }
         catch ( Exception const & )
@@ -340,7 +337,7 @@ SortedDynamicResultSet::impl_notify( const ListEvent& Changes )
     Any  aRet;
 
     try {
-        aRet = pCurSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("IsRowCountFinal")) );
+        aRet = pCurSet->getPropertyValue( OUString("IsRowCountFinal") );
     }
     catch (const UnknownPropertyException&) {}
     catch (const WrappedTargetException&) {}
@@ -511,10 +508,8 @@ XTYPEPROVIDER_IMPL_3( SortedDynamicResultSetFactory,
 //--------------------------------------------------------------------------
 
 XSERVICEINFO_IMPL_1( SortedDynamicResultSetFactory,
-                         OUString(RTL_CONSTASCII_USTRINGPARAM(
-                        "com.sun.star.comp.ucb.SortedDynamicResultSetFactory" )),
-                         OUString(RTL_CONSTASCII_USTRINGPARAM(
-                         DYNAMIC_RESULTSET_FACTORY_NAME )) );
+                         OUString( "com.sun.star.comp.ucb.SortedDynamicResultSetFactory" ),
+                         OUString( DYNAMIC_RESULTSET_FACTORY_NAME ) );
 
 //--------------------------------------------------------------------------
 // Service factory implementation.
diff --git a/ucb/source/sorter/sortresult.cxx b/ucb/source/sorter/sortresult.cxx
index 06401419071d..d75eaeff3c08 100644
--- a/ucb/source/sorter/sortresult.cxx
+++ b/ucb/source/sorter/sortresult.cxx
@@ -247,10 +247,8 @@ XTYPEPROVIDER_IMPL_9( SortedResultSet,
 //--------------------------------------------------------------------------
 
 XSERVICEINFO_NOFACTORY_IMPL_1( SortedResultSet,
-                               OUString(RTL_CONSTASCII_USTRINGPARAM(
-                                "com.sun.star.comp.ucb.SortedResultSet" )),
-                               OUString(RTL_CONSTASCII_USTRINGPARAM(
-                                RESULTSET_SERVICE_NAME )) );
+                               OUString( "com.sun.star.comp.ucb.SortedResultSet" ),
+                               OUString( RESULTSET_SERVICE_NAME ) );
 
 //--------------------------------------------------------------------------
 // XComponent methods.
@@ -949,7 +947,7 @@ Any SAL_CALL SortedResultSet::getPropertyValue( const OUString& PropertyName )
         if ( bOrgFinal )
         {
             aOrgRet = Reference< XPropertySet >::query(mxOriginal)->
-                getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("RowCount")) );
+                getPropertyValue( OUString("RowCount") );
             sal_uInt32  nOrgCount = 0;
             aOrgRet >>= nOrgCount;
             if ( nOrgCount == maS2O.Count() )
@@ -1496,7 +1494,7 @@ void SortedResultSet::CheckProperties( long nOldCount, sal_Bool bWasFinal )
             sal_Bool bIsFinal = sal_False;
             PropertyChangeEvent aEvt;
 
-            aEvt.PropertyName = OUString(RTL_CONSTASCII_USTRINGPARAM("RowCount"));
+            aEvt.PropertyName = OUString("RowCount");
             aEvt.Further = sal_False;
             aEvt.PropertyHandle = -1;
             aEvt.OldValue <<= nOldCount;
@@ -1504,7 +1502,7 @@ void SortedResultSet::CheckProperties( long nOldCount, sal_Bool bWasFinal )
 
             PropertyChanged( aEvt );
 
-            OUString aName = OUString(RTL_CONSTASCII_USTRINGPARAM("IsRowCountFinal"));
+            OUString aName = OUString("IsRowCountFinal");
             Any aRet = getPropertyValue( aName );
             if ( (aRet >>= bIsFinal) && bIsFinal != bWasFinal )
             {
@@ -2010,12 +2008,12 @@ void SimpleList::Replace( void* pData, sal_uInt32 nPos )
 
 SRSPropertySetInfo::SRSPropertySetInfo()
 {
-    maProps[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM("RowCount"));
+    maProps[0].Name = OUString("RowCount");
     maProps[0].Handle = -1;
     maProps[0].Type = ::getCppuType( (const OUString*) NULL );
     maProps[0].Attributes = -1;
 
-    maProps[1].Name = OUString(RTL_CONSTASCII_USTRINGPARAM("IsRowCountFinal"));
+    maProps[1].Name = OUString("IsRowCountFinal");
     maProps[1].Handle = -1;
     maProps[1].Type = ::getBooleanCppuType();
     maProps[1].Attributes = -1;