summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorTakeshi Abe <tabe@fixedpoint.jp>2013-08-19 07:45:55 +0900
committerTakeshi Abe <tabe@fixedpoint.jp>2013-08-19 07:47:34 +0900
commitf4004429d339009bec6babe30becdc9c727940b8 (patch)
treed55920c147eb53b758cd4b56b6851580148a3edb /sd
parent88960707cc891a5bfc260ce7568a75c1c8419f73 (diff)
Mark as const
Change-Id: Ic81dd60fadecf72f25792903985f2b387df7a7a0
Diffstat (limited to 'sd')
-rw-r--r--sd/source/filter/eppt/pptx-epptooxml.cxx4
-rw-r--r--sd/source/ui/controller/slidelayoutcontroller.cxx12
-rw-r--r--sd/source/ui/dlg/gluectrl.cxx2
-rw-r--r--sd/source/ui/sidebar/LayoutMenu.cxx8
-rw-r--r--sd/source/ui/toolpanel/LayoutMenu.cxx8
-rw-r--r--sd/source/ui/view/viewoverlaymanager.cxx4
6 files changed, 19 insertions, 19 deletions
diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx
index 2535689a39ff..ca78715b6869 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -142,7 +142,7 @@ struct PPTXLayoutInfo {
const char* sType;
};
-static PPTXLayoutInfo aLayoutInfo[LAYOUT_SIZE] = {
+static const PPTXLayoutInfo aLayoutInfo[LAYOUT_SIZE] = {
{ 20, "Blank Slide", "blank" },
{ 0, "Title Slide", "tx" },
{ 1, "Title, Content", "obj" },
@@ -2158,7 +2158,7 @@ OUString PowerPointExport::implGetImplementationName() const
// UNO component
-static struct cppu::ImplementationEntry g_entries[] =
+static const struct cppu::ImplementationEntry g_entries[] =
{
{
oox::core::PowerPointExport_createInstance,
diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx
index 38626bbce054..8a3fd5e5f3de 100644
--- a/sd/source/ui/controller/slidelayoutcontroller.cxx
+++ b/sd/source/ui/controller/slidelayoutcontroller.cxx
@@ -97,13 +97,13 @@ struct snewfoil_value_info
AutoLayout maAutoLayout;
};
-static snewfoil_value_info notes[] =
+static const snewfoil_value_info notes[] =
{
{BMP_FOILN_01, STR_AUTOLAYOUT_NOTES, WritingMode_LR_TB, AUTOLAYOUT_NOTES},
{0, 0, WritingMode_LR_TB, AUTOLAYOUT_NONE},
};
-static snewfoil_value_info handout[] =
+static const snewfoil_value_info handout[] =
{
{BMP_FOILH_01, STR_AUTOLAYOUT_HANDOUT1, WritingMode_LR_TB, AUTOLAYOUT_HANDOUT1},
{BMP_FOILH_02, STR_AUTOLAYOUT_HANDOUT2, WritingMode_LR_TB, AUTOLAYOUT_HANDOUT2},
@@ -114,7 +114,7 @@ static snewfoil_value_info handout[] =
{0, 0, WritingMode_LR_TB, AUTOLAYOUT_NONE},
};
-static snewfoil_value_info standard[] =
+static const snewfoil_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 },
@@ -131,7 +131,7 @@ static snewfoil_value_info standard[] =
{0, 0, WritingMode_LR_TB, AUTOLAYOUT_NONE}
};
-static snewfoil_value_info v_standard[] =
+static const snewfoil_value_info v_standard[] =
{
// vertical
{BMP_LAYOUT_VERTICAL02, STR_AL_VERT_TITLE_TEXT_CHART, WritingMode_TB_RL, AUTOLAYOUT_VERTICAL_TITLE_TEXT_CHART },
@@ -143,7 +143,7 @@ static snewfoil_value_info v_standard[] =
// -----------------------------------------------------------------------
-static void fillLayoutValueSet( ValueSet* pValue, snewfoil_value_info* pInfo )
+static void fillLayoutValueSet( ValueSet* pValue, const snewfoil_value_info* pInfo )
{
Size aLayoutItemSize;
for( ; pInfo->mnBmpResId; pInfo++ )
@@ -198,7 +198,7 @@ LayoutToolbarMenu::LayoutToolbarMenu( SlideLayoutController& rController, const
mpLayoutSet1 = createEmptyValueSetControl();
mpLayoutSet1->SetSelectHdl( LINK( this, LayoutToolbarMenu, SelectHdl ) );
- snewfoil_value_info* pInfo = 0;
+ const snewfoil_value_info* pInfo = 0;
sal_Int16 nColCount = 4;
switch( eMode )
{
diff --git a/sd/source/ui/dlg/gluectrl.cxx b/sd/source/ui/dlg/gluectrl.cxx
index b1f760eee7cc..e0d09bac1708 100644
--- a/sd/source/ui/dlg/gluectrl.cxx
+++ b/sd/source/ui/dlg/gluectrl.cxx
@@ -38,7 +38,7 @@ using namespace ::com::sun::star::frame;
// at the moment, Joe only supports the methods specified below
#define ESCDIR_COUNT 5
-static sal_uInt16 aEscDirArray[] =
+static const sal_uInt16 aEscDirArray[] =
{
SDRESC_SMART,
SDRESC_LEFT,
diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx
index 0e4b23497f0f..e55f7e15e78a 100644
--- a/sd/source/ui/sidebar/LayoutMenu.cxx
+++ b/sd/source/ui/sidebar/LayoutMenu.cxx
@@ -77,14 +77,14 @@ struct snewfoil_value_info
AutoLayout maAutoLayout;
};
-static snewfoil_value_info notes[] =
+static const snewfoil_value_info notes[] =
{
{BMP_FOILN_01, STR_AUTOLAYOUT_NOTES, WritingMode_LR_TB,
AUTOLAYOUT_NOTES},
{0, 0, WritingMode_LR_TB, AUTOLAYOUT_NONE},
};
-static snewfoil_value_info handout[] =
+static const snewfoil_value_info handout[] =
{
{BMP_FOILH_01, STR_AUTOLAYOUT_HANDOUT1, WritingMode_LR_TB,
AUTOLAYOUT_HANDOUT1},
@@ -101,7 +101,7 @@ static snewfoil_value_info handout[] =
{0, 0, WritingMode_LR_TB, AUTOLAYOUT_NONE},
};
-static snewfoil_value_info standard[] =
+static const snewfoil_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},
@@ -624,7 +624,7 @@ void LayoutMenu::Fill (void)
catch (RuntimeException&)
{}
- snewfoil_value_info* pInfo = NULL;
+ const snewfoil_value_info* pInfo = NULL;
if (sCenterPaneViewName.equals(framework::FrameworkHelper::msNotesViewURL))
{
pInfo = notes;
diff --git a/sd/source/ui/toolpanel/LayoutMenu.cxx b/sd/source/ui/toolpanel/LayoutMenu.cxx
index 8f444a355c6b..1e345848b0f1 100644
--- a/sd/source/ui/toolpanel/LayoutMenu.cxx
+++ b/sd/source/ui/toolpanel/LayoutMenu.cxx
@@ -117,14 +117,14 @@ struct snewfoil_value_info
AutoLayout maAutoLayout;
};
-static snewfoil_value_info notes[] =
+static const snewfoil_value_info notes[] =
{
{BMP_FOILN_01, STR_AUTOLAYOUT_NOTES, WritingMode_LR_TB,
AUTOLAYOUT_NOTES},
{0, 0, WritingMode_LR_TB, AUTOLAYOUT_NONE},
};
-static snewfoil_value_info handout[] =
+static const snewfoil_value_info handout[] =
{
{BMP_FOILH_01, STR_AUTOLAYOUT_HANDOUT1, WritingMode_LR_TB,
AUTOLAYOUT_HANDOUT1},
@@ -141,7 +141,7 @@ static snewfoil_value_info handout[] =
{0, 0, WritingMode_LR_TB, AUTOLAYOUT_NONE},
};
-static snewfoil_value_info standard[] =
+static const snewfoil_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},
@@ -774,7 +774,7 @@ void LayoutMenu::Fill (void)
catch (RuntimeException&)
{}
- snewfoil_value_info* pInfo = NULL;
+ const snewfoil_value_info* pInfo = NULL;
if (sCenterPaneViewName.equals(framework::FrameworkHelper::msNotesViewURL))
{
pInfo = notes;
diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx
index e834999a5350..a0cc1332a5c2 100644
--- a/sd/source/ui/view/viewoverlaymanager.cxx
+++ b/sd/source/ui/view/viewoverlaymanager.cxx
@@ -65,8 +65,8 @@ class ImageButtonHdl;
// --------------------------------------------------------------------
-static sal_uInt16 gButtonSlots[] = { SID_INSERT_TABLE, SID_INSERT_DIAGRAM, SID_INSERT_GRAPHIC, SID_INSERT_AVMEDIA };
-static sal_uInt16 gButtonToolTips[] = { STR_INSERT_TABLE, STR_INSERT_CHART, STR_INSERT_PICTURE, STR_INSERT_MOVIE };
+static const sal_uInt16 gButtonSlots[] = { SID_INSERT_TABLE, SID_INSERT_DIAGRAM, SID_INSERT_GRAPHIC, SID_INSERT_AVMEDIA };
+static const sal_uInt16 gButtonToolTips[] = { STR_INSERT_TABLE, STR_INSERT_CHART, STR_INSERT_PICTURE, STR_INSERT_MOVIE };
// --------------------------------------------------------------------