[Libreoffice-commits] core.git: sc/source

[Tomoyuki Kubota (via logerrit)]

 sc/source/core/data/stlpool.cxx |   14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

New commits:
commit bbd21f4069fd17a0f6b734b62a45f1fefc9c1f7f
Author:     Tomoyuki Kubota <himajin100...@gmail.com>
AuthorDate: Mon Oct 25 09:11:25 2021 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Mon Oct 25 11:02:55 2021 +0200

    expanding macro SCSTR
    
    Change-Id: If497954b4e70e0a4dbd7268a25727a2478b95184
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124018
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/sc/source/core/data/stlpool.cxx b/sc/source/core/data/stlpool.cxx
index 5c0a5b313c18..a1082b6f5054 100644
--- a/sc/source/core/data/stlpool.cxx
+++ b/sc/source/core/data/stlpool.cxx
@@ -181,15 +181,13 @@ void ScStyleSheetPool::CopyStyleFrom( ScStyleSheetPool* 
pSrcPool,
 
 //                      Standard templates
 
-#define SCSTR(id)   ScResId(id)
-
 void ScStyleSheetPool::CopyStdStylesFrom( ScStyleSheetPool* pSrcPool )
 {
     //  Copy Default styles
 
-    CopyStyleFrom( pSrcPool, SCSTR(STR_STYLENAME_STANDARD),     
SfxStyleFamily::Para );
-    CopyStyleFrom( pSrcPool, SCSTR(STR_STYLENAME_STANDARD),     
SfxStyleFamily::Page );
-    CopyStyleFrom( pSrcPool, SCSTR(STR_STYLENAME_REPORT),       
SfxStyleFamily::Page );
+    CopyStyleFrom( pSrcPool, ScResId(STR_STYLENAME_STANDARD),     
SfxStyleFamily::Para );
+    CopyStyleFrom( pSrcPool, ScResId(STR_STYLENAME_STANDARD),     
SfxStyleFamily::Page );
+    CopyStyleFrom( pSrcPool, ScResId(STR_STYLENAME_REPORT),       
SfxStyleFamily::Page );
 }
 
 static void lcl_CheckFont( SfxItemSet& rSet, LanguageType eLang, 
DefaultFontType nFontType, sal_uInt16 nItemId )
@@ -295,7 +293,7 @@ void ScStyleSheetPool::CreateStandardStyles()
     // Footer:
     // [empty][Page \STR_PAGE\][empty]
 
-    aStr = SCSTR( STR_PAGE ) + " ";
+    aStr = ScResId( STR_PAGE ) + " ";
     aEdEngine.SetTextCurrentDefaults( aStr );
     nStrLen = aStr.getLength();
     aEdEngine.QuickInsertField( SvxFieldItem(SvxPageField(), 
EE_FEATURE_FIELD), ESelection(0,nStrLen,0,nStrLen) );
@@ -307,7 +305,7 @@ void ScStyleSheetPool::CreateStandardStyles()
 
     // 2. Report
 
-    pSheet = static_cast<ScStyleSheet*>( &Make( SCSTR( STR_STYLENAME_REPORT ),
+    pSheet = static_cast<ScStyleSheet*>( &Make( ScResId( STR_STYLENAME_REPORT 
),
                                     SfxStyleFamily::Page,
                                     SfxStyleSearchBits::ScStandard ) );
     pSet = &pSheet->GetItemSet();
@@ -360,7 +358,7 @@ void ScStyleSheetPool::CreateStandardStyles()
     // Footer:
     // [empty][Page: \PAGE\ / \PAGE\][empty]
 
-    aStr = SCSTR( STR_PAGE ) + " ";
+    aStr = ScResId( STR_PAGE ) + " ";
     nStrLen = aStr.getLength();
     aStr += " / ";
     sal_Int32 nStrLen2 = aStr.getLength();