String(SdResId(foo)) -> SD_RESSTR(foo)

Change-Id: Ifc683c67ef3a1b228e28faf645a44ca911b6ad0f

3 files changed, 23 insertions, 23 deletions

diff --git a/sd/source/ui/unoidl/unolayer.cxx b/sd/source/ui/unoidl/unolayer.cxx
index bf523c10fb0f..fbf14f515106 100644
--- a/sd/source/ui/unoidl/unolayer.cxx
+++ b/sd/source/ui/unoidl/unolayer.cxx
@@ -84,23 +84,23 @@ String SdLayer::convertToInternalName( const OUString& rName )
 {
     if ( rName == sUNO_LayerName_background )
     {
-        return String( SdResId( STR_LAYER_BCKGRND ) );
+        return SD_RESSTR( STR_LAYER_BCKGRND );
     }
     else if ( rName == sUNO_LayerName_background_objects )
     {
-        return  String( SdResId( STR_LAYER_BCKGRNDOBJ ) );
+        return  SD_RESSTR( STR_LAYER_BCKGRNDOBJ );
     }
     else if ( rName == sUNO_LayerName_layout )
     {
-        return  String( SdResId( STR_LAYER_LAYOUT ) );
+        return  SD_RESSTR( STR_LAYER_LAYOUT );
     }
     else if ( rName == sUNO_LayerName_controls )
     {
-        return  String( SdResId( STR_LAYER_CONTROLS ) );
+        return  SD_RESSTR( STR_LAYER_CONTROLS );
     }
     else if ( rName == sUNO_LayerName_measurelines )
     {
-        return  String( SdResId( STR_LAYER_MEASURELINES ) );
+        return  SD_RESSTR( STR_LAYER_MEASURELINES );
     }
     else
     {
@@ -110,23 +110,23 @@ String SdLayer::convertToInternalName( const OUString& rName )
 
 OUString SdLayer::convertToExternalName( const String& rName )
 {
-    if( rName == String( SdResId( STR_LAYER_BCKGRND ) ) )
+    if( rName == SD_RESSTR( STR_LAYER_BCKGRND ) )
     {
         return OUString( sUNO_LayerName_background );
     }
-    else if( rName == String( SdResId( STR_LAYER_BCKGRNDOBJ ) ) )
+    else if( rName == SD_RESSTR( STR_LAYER_BCKGRNDOBJ ) )
     {
         return OUString( sUNO_LayerName_background_objects );
     }
-    else if( rName == String( SdResId( STR_LAYER_LAYOUT ) ) )
+    else if( rName == SD_RESSTR( STR_LAYER_LAYOUT ) )
     {
         return OUString( sUNO_LayerName_layout );
     }
-    else if( rName == String( SdResId( STR_LAYER_CONTROLS ) ) )
+    else if( rName == SD_RESSTR( STR_LAYER_CONTROLS ) )
     {
         return OUString( sUNO_LayerName_controls );
     }
-    else if( rName == String( SdResId( STR_LAYER_MEASURELINES ) ) )
+    else if( rName == SD_RESSTR( STR_LAYER_MEASURELINES ) )
     {
         return OUString( sUNO_LayerName_measurelines );
     }
@@ -530,7 +530,7 @@ uno::Reference< drawing::XLayer > SAL_CALL SdLayerManager::insertNewByIndex( sal
         // Test for existing names
         while( aLayerName.Len()==0 || rLayerAdmin.GetLayer( aLayerName, sal_False) )
         {
-            aLayerName = String(SdResId(STR_LAYER));
+            aLayerName = SD_RESSTR(STR_LAYER);
             aLayerName += OUString::number(nLayer);
             ++nLayer;
         }
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 58a819f23aba..6a55af3ad1f3 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -452,8 +452,8 @@ SdPage* SdXImpressDocument::InsertSdPage( sal_uInt16 nPage, sal_Bool bDuplicate
 {
     sal_uInt16 nPageCount = mpDoc->GetSdPageCount( PK_STANDARD );
     SdrLayerAdmin& rLayerAdmin = mpDoc->GetLayerAdmin();
-    sal_uInt8 aBckgrnd = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRND)), sal_False);
-    sal_uInt8 aBckgrndObj = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRNDOBJ)), sal_False);
+    sal_uInt8 aBckgrnd = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND), sal_False);
+    sal_uInt8 aBckgrndObj = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ), sal_False);
 
     SdPage* pStandardPage = NULL;
 
@@ -514,8 +514,8 @@ SdPage* SdXImpressDocument::InsertSdPage( sal_uInt16 nPage, sal_Bool bDuplicate
             pStandardPage->SetAutoLayout(AUTOLAYOUT_NONE, sal_True );
         }
 
-        aBckgrnd = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRND)), sal_False);
-        aBckgrndObj = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRNDOBJ)), sal_False);
+        aBckgrnd = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND), sal_False);
+        aBckgrndObj = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ), sal_False);
         aVisibleLayers.Set(aBckgrnd, bIsPageBack);
         aVisibleLayers.Set(aBckgrndObj, bIsPageObj);
         pStandardPage->TRG_SetMasterPageVisibleLayers(aVisibleLayers);
@@ -2706,7 +2706,7 @@ uno::Reference< drawing::XDrawPage > SAL_CALL SdMasterPagesAccess::insertNewByIn
 
         String aLayoutName( aPrefix );
         aLayoutName.AppendAscii( SD_LT_SEPARATOR );
-        aLayoutName += String(SdResId(STR_LAYOUT_OUTLINE));
+        aLayoutName += SD_RESSTR(STR_LAYOUT_OUTLINE);
 
         // create styles
         ((SdStyleSheetPool*)mpDoc->GetStyleSheetPool())->CreateLayoutStyleSheets( aPrefix );
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index 6a65ba079eb7..29356b67a246 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -755,7 +755,7 @@ void SAL_CALL SdGenericDrawPage::setPropertyValue( const OUString& aPropertyName
                 {
                     SdrLayerAdmin& rLayerAdmin = pDoc->GetLayerAdmin();
                     SetOfByte aVisibleLayers = pPage->TRG_GetMasterPageVisibleLayers();
-                    aVisibleLayers.Set(rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRND)), sal_False), bVisible);
+                    aVisibleLayers.Set(rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND), sal_False), bVisible);
                     pPage->TRG_SetMasterPageVisibleLayers(aVisibleLayers);
                 }
             }
@@ -775,7 +775,7 @@ void SAL_CALL SdGenericDrawPage::setPropertyValue( const OUString& aPropertyName
                 {
                     SdrLayerAdmin& rLayerAdmin = pDoc->GetLayerAdmin();
                     SetOfByte aVisibleLayers = pPage->TRG_GetMasterPageVisibleLayers();
-                    aVisibleLayers.Set(rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRNDOBJ)), sal_False), bVisible);
+                    aVisibleLayers.Set(rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ), sal_False), bVisible);
                     pPage->TRG_SetMasterPageVisibleLayers(aVisibleLayers);
                 }
             }
@@ -1174,7 +1174,7 @@ Any SAL_CALL SdGenericDrawPage::getPropertyValue( const OUString& PropertyName )
             {
                 SdrLayerAdmin& rLayerAdmin = pDoc->GetLayerAdmin();
                 SetOfByte aVisibleLayers = pPage->TRG_GetMasterPageVisibleLayers();
-                aAny <<= (sal_Bool)aVisibleLayers.IsSet(rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRND)), sal_False));
+                aAny <<= (sal_Bool)aVisibleLayers.IsSet(rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND), sal_False));
             }
             else
             {
@@ -1193,7 +1193,7 @@ Any SAL_CALL SdGenericDrawPage::getPropertyValue( const OUString& PropertyName )
             {
                 SdrLayerAdmin& rLayerAdmin = pDoc->GetLayerAdmin();
                 SetOfByte aVisibleLayers = pPage->TRG_GetMasterPageVisibleLayers();
-                aAny <<= (sal_Bool)aVisibleLayers.IsSet(rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRNDOBJ)), sal_False));
+                aAny <<= (sal_Bool)aVisibleLayers.IsSet(rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ), sal_False));
             }
             else
             {
@@ -2210,7 +2210,7 @@ String getUiNameFromPageApiNameImpl( const OUString& rApiName )
         if( nPageNumber != -1)
         {
             OUStringBuffer sBuffer;
-            sBuffer.append( String(SdResId(STR_PAGE)) );
+            sBuffer.append( SD_RESSTR(STR_PAGE) );
             sBuffer.append( sal_Unicode( ' ' ) );
             sBuffer.append( aNumber );
             return sBuffer.makeStringAndClear();
@@ -2934,7 +2934,7 @@ void SdMasterPage::setBackground( const Any& rValue )
             {
                 String aLayoutName( static_cast< SdPage* >( SvxFmDrawPage::mpPage )->GetLayoutName() );
                 aLayoutName.Erase(aLayoutName.Search(String(SD_LT_SEPARATOR))+4);
-                aLayoutName += String(SdResId(STR_LAYOUT_BACKGROUND));
+                aLayoutName += SD_RESSTR(STR_LAYOUT_BACKGROUND);
                 SfxStyleSheetBase* pStyleSheet = pSSPool->Find( aLayoutName, SD_STYLE_FAMILY_MASTERPAGE );
 
                 if( pStyleSheet )
@@ -2978,7 +2978,7 @@ void SdMasterPage::getBackground( Any& rValue ) throw()
             {
                 String aLayoutName( static_cast< SdPage* >(SvxFmDrawPage::mpPage)->GetLayoutName() );
                 aLayoutName.Erase( aLayoutName.Search(String(SD_LT_SEPARATOR))+4);
-                aLayoutName += String(SdResId(STR_LAYOUT_BACKGROUND));
+                aLayoutName += SD_RESSTR(STR_LAYOUT_BACKGROUND);
                 SfxStyleSheetBase* pStyleSheet = pSSPool->Find( aLayoutName, SD_STYLE_FAMILY_MASTERPAGE );
 
                 if( pStyleSheet )