summaryrefslogtreecommitdiffstats
path: root/sd/source/ui/controller/slidelayoutcontroller.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sd/source/ui/controller/slidelayoutcontroller.cxx')
-rw-r--r--sd/source/ui/controller/slidelayoutcontroller.cxx14
1 files changed, 8 insertions, 6 deletions
diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx
index cbfd847204b8..06814feda90f 100644
--- a/sd/source/ui/controller/slidelayoutcontroller.cxx
+++ b/sd/source/ui/controller/slidelayoutcontroller.cxx
@@ -79,17 +79,19 @@ private:
struct snewfoil_value_info_layout
{
- const char* msBmpResId;
+ rtl::OUStringConstExpr msBmpResId;
TranslateId mpStrResId;
AutoLayout maAutoLayout;
};
}
+constexpr OUStringLiteral EMPTY = u"";
+
const snewfoil_value_info_layout notes[] =
{
{BMP_FOILN_01, STR_AUTOLAYOUT_NOTES, AUTOLAYOUT_NOTES},
- {nullptr, {}, AUTOLAYOUT_NONE},
+ {EMPTY, {}, AUTOLAYOUT_NONE},
};
const snewfoil_value_info_layout handout[] =
@@ -100,7 +102,7 @@ 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},
- {nullptr, {}, AUTOLAYOUT_NONE},
+ {EMPTY, {}, AUTOLAYOUT_NONE},
};
const snewfoil_value_info_layout standard[] =
@@ -117,7 +119,7 @@ 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 },
- {nullptr, {}, AUTOLAYOUT_NONE}
+ {EMPTY, {}, AUTOLAYOUT_NONE}
};
const snewfoil_value_info_layout v_standard[] =
@@ -127,7 +129,7 @@ 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 },
- {nullptr, {}, AUTOLAYOUT_NONE}
+ {EMPTY, {}, AUTOLAYOUT_NONE}
};
static void fillLayoutValueSet( ValueSet* pValue, const snewfoil_value_info_layout* pInfo )
@@ -136,7 +138,7 @@ static void fillLayoutValueSet( ValueSet* pValue, const snewfoil_value_info_layo
for( ; pInfo->mpStrResId; pInfo++ )
{
OUString aText(SdResId(pInfo->mpStrResId));
- Image aImg(StockImage::Yes, OUString::createFromAscii(pInfo->msBmpResId));
+ Image aImg(StockImage::Yes, pInfo->msBmpResId);
pValue->InsertItem(static_cast<sal_uInt16>(pInfo->maAutoLayout)+1, aImg, aText);
aLayoutItemSize.setWidth( std::max( aLayoutItemSize.Width(), aImg.GetSizePixel().Width() ) );
aLayoutItemSize.setHeight( std::max( aLayoutItemSize.Height(), aImg.GetSizePixel().Height() ) );