diff options
Diffstat (limited to 'sd/source/ui/controller/slidelayoutcontroller.cxx')
| -rw-r--r-- | sd/source/ui/controller/slidelayoutcontroller.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx index b0fa04755aa9..5ebe1e8282ac 100644 --- a/sd/source/ui/controller/slidelayoutcontroller.cxx +++ b/sd/source/ui/controller/slidelayoutcontroller.cxx @@ -41,9 +41,9 @@ #include "app.hrc" #include "facreg.hxx" -#include "glob.hrc" #include "strings.hrc" -#include "res_bmp.hrc" +#include "strings.hrc" + #include "bitmaps.hlst" #include "sdresid.hxx" #include "pres.hxx" @@ -82,14 +82,14 @@ private: struct snewfoil_value_info_layout { const char* msBmpResId; - sal_uInt16 mnStrResId; + const char* mpStrResId; AutoLayout maAutoLayout; }; static const snewfoil_value_info_layout notes[] = { {BMP_FOILN_01, STR_AUTOLAYOUT_NOTES, AUTOLAYOUT_NOTES}, - {"", 0, AUTOLAYOUT_NONE}, + {nullptr, nullptr, AUTOLAYOUT_NONE}, }; static const snewfoil_value_info_layout handout[] = @@ -100,7 +100,7 @@ static const snewfoil_value_info_layout handout[] = {BMP_FOILH_04, STR_AUTOLAYOUT_HANDOUT4, AUTOLAYOUT_HANDOUT4}, {BMP_FOILH_06, STR_AUTOLAYOUT_HANDOUT6, AUTOLAYOUT_HANDOUT6}, {BMP_FOILH_09, STR_AUTOLAYOUT_HANDOUT9, AUTOLAYOUT_HANDOUT9}, - {"", 0, AUTOLAYOUT_NONE}, + {nullptr, nullptr, AUTOLAYOUT_NONE}, }; static const snewfoil_value_info_layout standard[] = @@ -117,7 +117,7 @@ static const snewfoil_value_info_layout standard[] = {BMP_LAYOUT_HEAD02B, STR_AUTOLAYOUT_CONTENT_OVER_CONTENT, AUTOLAYOUT_TITLE_CONTENT_OVER_CONTENT }, {BMP_LAYOUT_HEAD04, STR_AUTOLAYOUT_4CONTENT, AUTOLAYOUT_TITLE_4CONTENT }, {BMP_LAYOUT_HEAD06, STR_AUTOLAYOUT_6CONTENT, AUTOLAYOUT_TITLE_6CONTENT }, - {"", 0, AUTOLAYOUT_NONE} + {nullptr, nullptr, AUTOLAYOUT_NONE} }; static const snewfoil_value_info_layout v_standard[] = @@ -127,15 +127,15 @@ static const snewfoil_value_info_layout v_standard[] = {BMP_LAYOUT_VERTICAL01, STR_AL_VERT_TITLE_VERT_OUTLINE, AUTOLAYOUT_VTITLE_VCONTENT }, {BMP_LAYOUT_HEAD02, STR_AL_TITLE_VERT_OUTLINE, AUTOLAYOUT_TITLE_VCONTENT }, {BMP_LAYOUT_HEAD02A, STR_AL_TITLE_VERT_OUTLINE_CLIPART, AUTOLAYOUT_TITLE_2VTEXT }, - {"", 0, AUTOLAYOUT_NONE} + {nullptr, nullptr, AUTOLAYOUT_NONE} }; static void fillLayoutValueSet( ValueSet* pValue, const snewfoil_value_info_layout* pInfo ) { Size aLayoutItemSize; - for( ; pInfo->mnStrResId; pInfo++ ) + for( ; pInfo->mpStrResId; pInfo++ ) { - OUString aText( SdResId( pInfo->mnStrResId ) ); + OUString aText(SdResId(pInfo->mpStrResId)); BitmapEx aBmp(OUString::createFromAscii(pInfo->msBmpResId)); pValue->InsertItem(static_cast<sal_uInt16>(pInfo->maAutoLayout)+1, |