diff options
| author | Tomoyuki Kubota <himajin100000@gmail.com> | 2021-10-25 09:11:25 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-10-25 11:02:55 +0200 |
| commit | bbd21f4069fd17a0f6b734b62a45f1fefc9c1f7f (patch) | |
| tree | 4fbe084f902a029a1dcff4f255485174c76360e0 /sc/source | |
| parent | 8b32a3edad52f8ac5e5f0f49b4f4e80954c2fd25 (diff) | |
expanding macro SCSTR
Change-Id: If497954b4e70e0a4dbd7268a25727a2478b95184
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124018
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sc/source')
| -rw-r--r-- | sc/source/core/data/stlpool.cxx | 14 |
1 files changed, 6 insertions, 8 deletions
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(); |