sd/inc/bitmaps.hlst | 16 ++++++------
sd/source/ui/controller/displaymodecontroller.cxx | 8 +++---
sd/source/ui/controller/slidelayoutcontroller.cxx | 28 +++++++++++-----------
sd/source/ui/dlg/sdpreslt.cxx | 2 -
sd/source/ui/sidebar/LayoutMenu.cxx | 24 +++++++++---------
5 files changed, 39 insertions(+), 39 deletions(-)
New commits:
commit 568293d7ce6d96ba71ae8c2d591b6cf237e31db1
Author: Tor Lillqvist <t...@collabora.com>
AuthorDate: Thu Jan 6 15:03:05 2022 +0200
Commit: Tor Lillqvist <t...@collabora.com>
CommitDate: Thu Jan 6 20:22:44 2022 +0100
It's called a slide, not a foil
Change-Id: I8b5b062faf9d2728c729384bbdafead00d5bf917
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128042
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist <t...@collabora.com>
diff --git a/sd/inc/bitmaps.hlst b/sd/inc/bitmaps.hlst
index 5b3ae7851897..9e66e87dd032 100644
--- a/sd/inc/bitmaps.hlst
+++ b/sd/inc/bitmaps.hlst
@@ -26,13 +26,13 @@ inline constexpr OUStringLiteral BMP_LAYOUT_HEAD06 =
u"sd/res/layout_head06.png"
inline constexpr OUStringLiteral BMP_LAYOUT_TEXTONLY =
u"sd/res/layout_textonly.png";
inline constexpr OUStringLiteral BMP_LAYOUT_VERTICAL01 =
u"sd/res/layout_vertical01.png";
inline constexpr OUStringLiteral BMP_LAYOUT_VERTICAL02 =
u"sd/res/layout_vertical02.png";
-inline constexpr OUStringLiteral BMP_FOIL_NONE = u"sd/res/foilnone.png";
-inline constexpr OUStringLiteral BMP_FOILH_01 = u"sd/res/foilh01.png";
-inline constexpr OUStringLiteral BMP_FOILH_02 = u"sd/res/foilh02.png";
-inline constexpr OUStringLiteral BMP_FOILH_03 = u"sd/res/foilh03.png";
-inline constexpr OUStringLiteral BMP_FOILH_04 = u"sd/res/foilh04.png";
-inline constexpr OUStringLiteral BMP_FOILH_06 = u"sd/res/foilh06.png";
-inline constexpr OUStringLiteral BMP_FOILH_09 = u"sd/res/foilh09.png";
+inline constexpr OUStringLiteral BMP_SLIDE_NONE = u"sd/res/foilnone.png";
+inline constexpr OUStringLiteral BMP_SLIDEH_01 = u"sd/res/foilh01.png";
+inline constexpr OUStringLiteral BMP_SLIDEH_02 = u"sd/res/foilh02.png";
+inline constexpr OUStringLiteral BMP_SLIDEH_03 = u"sd/res/foilh03.png";
+inline constexpr OUStringLiteral BMP_SLIDEH_04 = u"sd/res/foilh04.png";
+inline constexpr OUStringLiteral BMP_SLIDEH_06 = u"sd/res/foilh06.png";
+inline constexpr OUStringLiteral BMP_SLIDEH_09 = u"sd/res/foilh09.png";
inline constexpr OUStringLiteral BMP_DISPLAYMODE_SLIDE =
u"sd/res/displaymode_slide.png";
inline constexpr OUStringLiteral BMP_DISPLAYMODE_OUTLINE =
u"sd/res/displaymode_outline.png";
inline constexpr OUStringLiteral BMP_DISPLAYMODE_NOTES =
u"sd/res/displaymode_notes.png";
@@ -56,7 +56,7 @@ inline constexpr OUStringLiteral BMP_PLACEHOLDER_MOVIE_LARGE
= u"sd/res/placehol
inline constexpr OUStringLiteral BMP_PLACEHOLDER_MOVIE_LARGE_HOVER =
u"sd/res/placeholder_movie_large_hover.png";
inline constexpr OUStringLiteral BMP_PLACEHOLDER_TABLE_LARGE =
u"sd/res/placeholder_table_large.png";
inline constexpr OUStringLiteral BMP_PLACEHOLDER_TABLE_LARGE_HOVER =
u"sd/res/placeholder_table_large_hover.png";
-inline constexpr OUStringLiteral BMP_FOILN_01 = u"sd/res/foiln01.png";
+inline constexpr OUStringLiteral BMP_SLIDEN_01 = u"sd/res/foiln01.png";
inline constexpr OUStringLiteral BMP_PAGE = u"sd/res/page.png";
inline constexpr OUStringLiteral BMP_PAGE_EXCLUDED = u"sd/res/pageexcl.png";
inline constexpr OUStringLiteral BMP_PAGEOBJS_EXCLUDED =
u"sd/res/pagobjex.png";
diff --git a/sd/source/ui/controller/displaymodecontroller.cxx
b/sd/source/ui/controller/displaymodecontroller.cxx
index 7c29a03659b6..81ad2d19e477 100644
--- a/sd/source/ui/controller/displaymodecontroller.cxx
+++ b/sd/source/ui/controller/displaymodecontroller.cxx
@@ -70,7 +70,7 @@ private:
DECL_LINK(SelectValueSetHdl, ValueSet*, void);
};
-struct snewfoil_value_info
+struct snew_slide_value_info
{
sal_uInt16 mnId;
OUString msBmpResId;
@@ -80,7 +80,7 @@ struct snewfoil_value_info
}
-const snewfoil_value_info editmodes[] =
+const snew_slide_value_info editmodes[] =
{
{1,
BMP_DISPLAYMODE_SLIDE,
@@ -101,7 +101,7 @@ const snewfoil_value_info editmodes[] =
{0, "", {}, "" }
};
-const snewfoil_value_info mastermodes[] =
+const snew_slide_value_info mastermodes[] =
{
{5,
BMP_DISPLAYMODE_SLIDE_MASTER,
@@ -119,7 +119,7 @@ const snewfoil_value_info mastermodes[] =
};
-static void fillLayoutValueSet(ValueSet* pValue, const snewfoil_value_info*
pInfo)
+static void fillLayoutValueSet(ValueSet* pValue, const snew_slide_value_info*
pInfo)
{
Size aLayoutItemSize;
for( ; pInfo->mnId; pInfo++ )
diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx
b/sd/source/ui/controller/slidelayoutcontroller.cxx
index 06814feda90f..55a4d0419b82 100644
--- a/sd/source/ui/controller/slidelayoutcontroller.cxx
+++ b/sd/source/ui/controller/slidelayoutcontroller.cxx
@@ -77,7 +77,7 @@ private:
std::unique_ptr<weld::Button> mxMoreButton;
};
-struct snewfoil_value_info_layout
+struct snew_slide_value_info_layout
{
rtl::OUStringConstExpr msBmpResId;
TranslateId mpStrResId;
@@ -88,24 +88,24 @@ struct snewfoil_value_info_layout
constexpr OUStringLiteral EMPTY = u"";
-const snewfoil_value_info_layout notes[] =
+const snew_slide_value_info_layout notes[] =
{
- {BMP_FOILN_01, STR_AUTOLAYOUT_NOTES, AUTOLAYOUT_NOTES},
+ {BMP_SLIDEN_01, STR_AUTOLAYOUT_NOTES, AUTOLAYOUT_NOTES},
{EMPTY, {}, AUTOLAYOUT_NONE},
};
-const snewfoil_value_info_layout handout[] =
+const snew_slide_value_info_layout handout[] =
{
- {BMP_FOILH_01, STR_AUTOLAYOUT_HANDOUT1, AUTOLAYOUT_HANDOUT1},
- {BMP_FOILH_02, STR_AUTOLAYOUT_HANDOUT2, AUTOLAYOUT_HANDOUT2},
- {BMP_FOILH_03, STR_AUTOLAYOUT_HANDOUT3, AUTOLAYOUT_HANDOUT3},
- {BMP_FOILH_04, STR_AUTOLAYOUT_HANDOUT4, AUTOLAYOUT_HANDOUT4},
- {BMP_FOILH_06, STR_AUTOLAYOUT_HANDOUT6, AUTOLAYOUT_HANDOUT6},
- {BMP_FOILH_09, STR_AUTOLAYOUT_HANDOUT9, AUTOLAYOUT_HANDOUT9},
+ {BMP_SLIDEH_01, STR_AUTOLAYOUT_HANDOUT1, AUTOLAYOUT_HANDOUT1},
+ {BMP_SLIDEH_02, STR_AUTOLAYOUT_HANDOUT2, AUTOLAYOUT_HANDOUT2},
+ {BMP_SLIDEH_03, STR_AUTOLAYOUT_HANDOUT3, AUTOLAYOUT_HANDOUT3},
+ {BMP_SLIDEH_04, STR_AUTOLAYOUT_HANDOUT4, AUTOLAYOUT_HANDOUT4},
+ {BMP_SLIDEH_06, STR_AUTOLAYOUT_HANDOUT6, AUTOLAYOUT_HANDOUT6},
+ {BMP_SLIDEH_09, STR_AUTOLAYOUT_HANDOUT9, AUTOLAYOUT_HANDOUT9},
{EMPTY, {}, AUTOLAYOUT_NONE},
};
-const snewfoil_value_info_layout standard[] =
+const snew_slide_value_info_layout standard[] =
{
{BMP_LAYOUT_EMPTY, STR_AUTOLAYOUT_NONE, AUTOLAYOUT_NONE
},
{BMP_LAYOUT_HEAD03, STR_AUTOLAYOUT_TITLE,
AUTOLAYOUT_TITLE },
@@ -122,7 +122,7 @@ const snewfoil_value_info_layout standard[] =
{EMPTY, {}, AUTOLAYOUT_NONE}
};
-const snewfoil_value_info_layout v_standard[] =
+const snew_slide_value_info_layout v_standard[] =
{
// vertical
{BMP_LAYOUT_VERTICAL02, STR_AL_VERT_TITLE_TEXT_CHART,
AUTOLAYOUT_VTITLE_VCONTENT_OVER_VCONTENT },
@@ -132,7 +132,7 @@ const snewfoil_value_info_layout v_standard[] =
{EMPTY, {}, AUTOLAYOUT_NONE}
};
-static void fillLayoutValueSet( ValueSet* pValue, const
snewfoil_value_info_layout* pInfo )
+static void fillLayoutValueSet( ValueSet* pValue, const
snew_slide_value_info_layout* pInfo )
{
Size aLayoutItemSize;
for( ; pInfo->mpStrResId; pInfo++ )
@@ -188,7 +188,7 @@ LayoutToolbarMenu::LayoutToolbarMenu(SlideLayoutController*
pControl, weld::Widg
mxLayoutSet1->SetSelectHdl( LINK( this, LayoutToolbarMenu,
SelectValueSetHdl ) );
- const snewfoil_value_info_layout* pInfo = nullptr;
+ const snew_slide_value_info_layout* pInfo = nullptr;
sal_Int16 nColCount = 4;
switch( eMode )
{
diff --git a/sd/source/ui/dlg/sdpreslt.cxx b/sd/source/ui/dlg/sdpreslt.cxx
index bfd0c9ea5513..6dda740bf887 100644
--- a/sd/source/ui/dlg/sdpreslt.cxx
+++ b/sd/source/ui/dlg/sdpreslt.cxx
@@ -254,7 +254,7 @@ IMPL_LINK_NOARG(SdPresLayoutDlg, ClickLoadHdl,
weld::Button&, void)
// empty layout
maLayoutNames.push_back(maStrNone);
m_xVS->InsertItem( static_cast<sal_uInt16>(maLayoutNames.size()),
- Image(BMP_FOIL_NONE), maStrNone );
+ Image(BMP_SLIDE_NONE), maStrNone );
}
if (!bCancel)
diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx
b/sd/source/ui/sidebar/LayoutMenu.cxx
index ffc5795e5e44..17ca028c2caf 100644
--- a/sd/source/ui/sidebar/LayoutMenu.cxx
+++ b/sd/source/ui/sidebar/LayoutMenu.cxx
@@ -72,7 +72,7 @@ namespace sd::sidebar {
namespace {
-struct snewfoil_value_info
+struct snew_slide_value_info
{
rtl::OUStringConstExpr msBmpResId;
TranslateId mpStrResId;
@@ -84,31 +84,31 @@ struct snewfoil_value_info
constexpr OUStringLiteral EMPTY = u"";
-const snewfoil_value_info notes[] =
+const snew_slide_value_info notes[] =
{
- {BMP_FOILN_01, STR_AUTOLAYOUT_NOTES, WritingMode_LR_TB,
+ {BMP_SLIDEN_01, STR_AUTOLAYOUT_NOTES, WritingMode_LR_TB,
AUTOLAYOUT_NOTES},
{EMPTY, {}, WritingMode_LR_TB, AUTOLAYOUT_NONE},
};
-const snewfoil_value_info handout[] =
+const snew_slide_value_info handout[] =
{
- {BMP_FOILH_01, STR_AUTOLAYOUT_HANDOUT1, WritingMode_LR_TB,
+ {BMP_SLIDEH_01, STR_AUTOLAYOUT_HANDOUT1, WritingMode_LR_TB,
AUTOLAYOUT_HANDOUT1},
- {BMP_FOILH_02, STR_AUTOLAYOUT_HANDOUT2, WritingMode_LR_TB,
+ {BMP_SLIDEH_02, STR_AUTOLAYOUT_HANDOUT2, WritingMode_LR_TB,
AUTOLAYOUT_HANDOUT2},
- {BMP_FOILH_03, STR_AUTOLAYOUT_HANDOUT3, WritingMode_LR_TB,
+ {BMP_SLIDEH_03, STR_AUTOLAYOUT_HANDOUT3, WritingMode_LR_TB,
AUTOLAYOUT_HANDOUT3},
- {BMP_FOILH_04, STR_AUTOLAYOUT_HANDOUT4, WritingMode_LR_TB,
+ {BMP_SLIDEH_04, STR_AUTOLAYOUT_HANDOUT4, WritingMode_LR_TB,
AUTOLAYOUT_HANDOUT4},
- {BMP_FOILH_06, STR_AUTOLAYOUT_HANDOUT6, WritingMode_LR_TB,
+ {BMP_SLIDEH_06, STR_AUTOLAYOUT_HANDOUT6, WritingMode_LR_TB,
AUTOLAYOUT_HANDOUT6},
- {BMP_FOILH_09, STR_AUTOLAYOUT_HANDOUT9, WritingMode_LR_TB,
+ {BMP_SLIDEH_09, STR_AUTOLAYOUT_HANDOUT9, WritingMode_LR_TB,
AUTOLAYOUT_HANDOUT9},
{EMPTY, {}, WritingMode_LR_TB, AUTOLAYOUT_NONE},
};
-const snewfoil_value_info standard[] =
+const snew_slide_value_info standard[] =
{
{BMP_LAYOUT_EMPTY, STR_AUTOLAYOUT_NONE, WritingMode_LR_TB,
AUTOLAYOUT_NONE},
{BMP_LAYOUT_HEAD03, STR_AUTOLAYOUT_TITLE, WritingMode_LR_TB,
AUTOLAYOUT_TITLE},
@@ -520,7 +520,7 @@ void LayoutMenu::Fill()
catch (RuntimeException&)
{}
- const snewfoil_value_info* pInfo = nullptr;
+ const snew_slide_value_info* pInfo = nullptr;
if (sCenterPaneViewName == framework::FrameworkHelper::msNotesViewURL)
{
pInfo = notes;
