summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@collabora.com>2014-04-27 17:01:10 +0200
committerLuboš Luňák <l.lunak@collabora.com>2014-04-27 17:01:46 +0200
commit37c3a1c097567de818daec1e68ef132d57bcf17a (patch)
tree1199d05c7b35ae134b27da651ef6636e4f91d2e1 /sw
parente474c95cdec503bc2abb90619a7a3677d2942a63 (diff)
const
Change-Id: I0ce6965f191d1455bcc7a793025282e20b7433a5
Diffstat (limited to 'sw')
-rw-r--r--sw/source/core/uibase/inc/column.hxx2
-rw-r--r--sw/source/core/uibase/inc/drpcps.hxx2
-rw-r--r--sw/source/core/uibase/inc/frmpage.hxx4
-rw-r--r--sw/source/core/uibase/inc/numpara.hxx2
-rw-r--r--sw/source/core/uibase/inc/pgfnote.hxx2
-rw-r--r--sw/source/core/uibase/inc/pggrid.hxx2
-rw-r--r--sw/source/core/uibase/inc/swuiccoll.hxx2
-rw-r--r--sw/source/core/uibase/inc/wrap.hxx2
-rw-r--r--sw/source/ui/chrdlg/drpcps.cxx4
-rw-r--r--sw/source/ui/chrdlg/numpara.cxx4
-rw-r--r--sw/source/ui/chrdlg/swuiccoll.cxx4
-rw-r--r--sw/source/ui/frmdlg/column.cxx2
-rw-r--r--sw/source/ui/frmdlg/frmpage.cxx8
-rw-r--r--sw/source/ui/frmdlg/wrap.cxx4
-rw-r--r--sw/source/ui/misc/pgfnote.cxx4
-rw-r--r--sw/source/ui/misc/pggrid.cxx4
16 files changed, 26 insertions, 26 deletions
diff --git a/sw/source/core/uibase/inc/column.hxx b/sw/source/core/uibase/inc/column.hxx
index 42d26138d4bd..991450dba17d 100644
--- a/sw/source/core/uibase/inc/column.hxx
+++ b/sw/source/core/uibase/inc/column.hxx
@@ -175,7 +175,7 @@ public:
virtual ~SwColumnPage();
static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet);
- static sal_uInt16* GetRanges();
+ static const sal_uInt16* GetRanges();
virtual bool FillItemSet(SfxItemSet &rSet) SAL_OVERRIDE;
virtual void Reset(const SfxItemSet &rSet) SAL_OVERRIDE;
diff --git a/sw/source/core/uibase/inc/drpcps.hxx b/sw/source/core/uibase/inc/drpcps.hxx
index 7b315276bb15..1a41ce20a00b 100644
--- a/sw/source/core/uibase/inc/drpcps.hxx
+++ b/sw/source/core/uibase/inc/drpcps.hxx
@@ -87,7 +87,7 @@ friend class SwDropCapsPict;
public:
static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet);
- static sal_uInt16* GetRanges();
+ static const sal_uInt16* GetRanges();
virtual bool FillItemSet( SfxItemSet &rSet) SAL_OVERRIDE;
virtual void Reset (const SfxItemSet &rSet) SAL_OVERRIDE;
diff --git a/sw/source/core/uibase/inc/frmpage.hxx b/sw/source/core/uibase/inc/frmpage.hxx
index 09d1d930ab1a..01d535dd4e59 100644
--- a/sw/source/core/uibase/inc/frmpage.hxx
+++ b/sw/source/core/uibase/inc/frmpage.hxx
@@ -188,7 +188,7 @@ class SwFrmPage: public SfxTabPage
public:
static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet);
- static sal_uInt16* GetRanges();
+ static const sal_uInt16* GetRanges();
virtual bool FillItemSet(SfxItemSet &rSet) SAL_OVERRIDE;
virtual void Reset(const SfxItemSet &rSet) SAL_OVERRIDE;
@@ -311,7 +311,7 @@ class SwFrmAddPage : public SfxTabPage
public:
static SfxTabPage* Create(Window *pParent, const SfxItemSet &rSet);
- static sal_uInt16* GetRanges();
+ static const sal_uInt16* GetRanges();
virtual bool FillItemSet(SfxItemSet &rSet) SAL_OVERRIDE;
virtual void Reset(const SfxItemSet &rSet) SAL_OVERRIDE;
diff --git a/sw/source/core/uibase/inc/numpara.hxx b/sw/source/core/uibase/inc/numpara.hxx
index 37b267373c02..6b2d0daf01a9 100644
--- a/sw/source/core/uibase/inc/numpara.hxx
+++ b/sw/source/core/uibase/inc/numpara.hxx
@@ -69,7 +69,7 @@ public:
static SfxTabPage* Create( Window* pParent,
const SfxItemSet& rSet );
- static sal_uInt16* GetRanges();
+ static const sal_uInt16* GetRanges();
virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
diff --git a/sw/source/core/uibase/inc/pgfnote.hxx b/sw/source/core/uibase/inc/pgfnote.hxx
index cfcd6b13136b..4cb6365e6f35 100644
--- a/sw/source/core/uibase/inc/pgfnote.hxx
+++ b/sw/source/core/uibase/inc/pgfnote.hxx
@@ -35,7 +35,7 @@ class SwFootNotePage: public SfxTabPage
{
public:
static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet);
- static sal_uInt16* GetRanges();
+ static const sal_uInt16* GetRanges();
virtual bool FillItemSet(SfxItemSet &rSet) SAL_OVERRIDE;
virtual void Reset(const SfxItemSet &rSet) SAL_OVERRIDE;
diff --git a/sw/source/core/uibase/inc/pggrid.hxx b/sw/source/core/uibase/inc/pggrid.hxx
index 9d98db0f6c03..3acb5aba3591 100644
--- a/sw/source/core/uibase/inc/pggrid.hxx
+++ b/sw/source/core/uibase/inc/pggrid.hxx
@@ -87,7 +87,7 @@ class SwTextGridPage: public SfxTabPage
public:
static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet);
- static sal_uInt16* GetRanges();
+ static const sal_uInt16* GetRanges();
virtual bool FillItemSet(SfxItemSet &rSet) SAL_OVERRIDE;
virtual void Reset(const SfxItemSet &rSet) SAL_OVERRIDE;
diff --git a/sw/source/core/uibase/inc/swuiccoll.hxx b/sw/source/core/uibase/inc/swuiccoll.hxx
index 3f5fd1fba7f4..06f20041015f 100644
--- a/sw/source/core/uibase/inc/swuiccoll.hxx
+++ b/sw/source/core/uibase/inc/swuiccoll.hxx
@@ -62,7 +62,7 @@ class SwCondCollPage : public SfxTabPage
public:
static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet);
- static sal_uInt16* GetRanges();
+ static const sal_uInt16* GetRanges();
virtual bool FillItemSet( SfxItemSet &rSet) SAL_OVERRIDE;
virtual void Reset (const SfxItemSet &rSet) SAL_OVERRIDE;
diff --git a/sw/source/core/uibase/inc/wrap.hxx b/sw/source/core/uibase/inc/wrap.hxx
index fac955c29bb6..6a58d8b36b70 100644
--- a/sw/source/core/uibase/inc/wrap.hxx
+++ b/sw/source/core/uibase/inc/wrap.hxx
@@ -105,7 +105,7 @@ public:
virtual bool FillItemSet(SfxItemSet &rSet) SAL_OVERRIDE;
virtual void Reset(const SfxItemSet &rSet) SAL_OVERRIDE;
- static sal_uInt16* GetRanges();
+ static const sal_uInt16* GetRanges();
inline void SetNewFrame(sal_Bool bNewFrame) { bNew = bNewFrame; }
inline void SetFormatUsed(sal_Bool bFmt, sal_Bool bDrw) { bFormat = bFmt;
bDrawMode = bDrw; }
diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx
index e35a10b83bc3..8b9787aef626 100644
--- a/sw/source/ui/chrdlg/drpcps.cxx
+++ b/sw/source/ui/chrdlg/drpcps.cxx
@@ -54,7 +54,7 @@ using namespace css;
using namespace css::uno;
using namespace css::lang;
-static sal_uInt16 aPageRg[] = {
+static const sal_uInt16 aPageRg[] = {
RES_PARATR_DROP, RES_PARATR_DROP,
0
};
@@ -737,7 +737,7 @@ IMPL_LINK_NOARG_INLINE_START(SwDropCapsPage, SelectHdl)
}
IMPL_LINK_NOARG_INLINE_END(SwDropCapsPage, SelectHdl)
-sal_uInt16* SwDropCapsPage::GetRanges()
+const sal_uInt16* SwDropCapsPage::GetRanges()
{
return aPageRg;
}
diff --git a/sw/source/ui/chrdlg/numpara.cxx b/sw/source/ui/chrdlg/numpara.cxx
index 0db7854c015d..88078074811f 100644
--- a/sw/source/ui/chrdlg/numpara.cxx
+++ b/sw/source/ui/chrdlg/numpara.cxx
@@ -35,7 +35,7 @@
// Globals ******************************************************************
-static sal_uInt16 aPageRg[] = {
+static const sal_uInt16 aPageRg[] = {
FN_NUMBER_NEWSTART, FN_NUMBER_NEWSTART_AT,
0
};
@@ -98,7 +98,7 @@ SfxTabPage* SwParagraphNumTabPage::Create( Window* pParent,
return new SwParagraphNumTabPage(pParent, rSet);
}
-sal_uInt16* SwParagraphNumTabPage::GetRanges()
+const sal_uInt16* SwParagraphNumTabPage::GetRanges()
{
return aPageRg;
}
diff --git a/sw/source/ui/chrdlg/swuiccoll.cxx b/sw/source/ui/chrdlg/swuiccoll.cxx
index faca1bcd6c97..f60dcb3d2597 100644
--- a/sw/source/ui/chrdlg/swuiccoll.cxx
+++ b/sw/source/ui/chrdlg/swuiccoll.cxx
@@ -39,7 +39,7 @@
#include "swuiccoll.hxx"
-static sal_uInt16 aPageRg[] = {
+static const sal_uInt16 aPageRg[] = {
FN_COND_COLL, FN_COND_COLL,
0
};
@@ -197,7 +197,7 @@ void SwCondCollPage::Reset(const SfxItemSet &/*rSet*/)
}
-sal_uInt16* SwCondCollPage::GetRanges()
+const sal_uInt16* SwCondCollPage::GetRanges()
{
return aPageRg;
}
diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx
index adb744e2a5c1..12abb8e882ee 100644
--- a/sw/source/ui/frmdlg/column.cxx
+++ b/sw/source/ui/frmdlg/column.cxx
@@ -1267,7 +1267,7 @@ int SwColumnPage::DeactivatePage(SfxItemSet *_pSet)
return sal_True;
}
-sal_uInt16* SwColumnPage::GetRanges()
+const sal_uInt16* SwColumnPage::GetRanges()
{
return aPageRg;
}
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index 361668a309d9..03c2b05b0fea 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -361,14 +361,14 @@ static FrmMap aVAsCharHtmlMap[] =
{SwFPos::CENTER_VERT, SwFPos::CENTER_VERT, text::VertOrientation::LINE_CENTER, LB_REL_ROW}
};
-static sal_uInt16 aPageRg[] = {
+static const sal_uInt16 aPageRg[] = {
RES_FRM_SIZE, RES_FRM_SIZE,
RES_VERT_ORIENT, RES_ANCHOR,
RES_COL, RES_COL,
RES_FOLLOW_TEXT_FLOW, RES_FOLLOW_TEXT_FLOW,
0
};
-static sal_uInt16 aAddPgRg[] = {
+static const sal_uInt16 aAddPgRg[] = {
RES_PROTECT, RES_PROTECT,
RES_PRINT, RES_PRINT,
FN_SET_FRM_NAME, FN_SET_FRM_NAME,
@@ -2323,7 +2323,7 @@ void SwFrmPage::Init(const SfxItemSet& rSet, sal_Bool bReset)
m_pRelHeightRelationLB->SelectEntryPos(0);
}
-sal_uInt16* SwFrmPage::GetRanges()
+const sal_uInt16* SwFrmPage::GetRanges()
{
return aPageRg;
}
@@ -3120,7 +3120,7 @@ bool SwFrmAddPage::FillItemSet(SfxItemSet &rSet)
return bRet;
}
-sal_uInt16* SwFrmAddPage::GetRanges()
+const sal_uInt16* SwFrmAddPage::GetRanges()
{
return aAddPgRg;
}
diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx
index f18f687483f5..f5079d749eaf 100644
--- a/sw/source/ui/frmdlg/wrap.cxx
+++ b/sw/source/ui/frmdlg/wrap.cxx
@@ -43,7 +43,7 @@
using namespace ::com::sun::star;
-static sal_uInt16 aWrapPageRg[] = {
+static const sal_uInt16 aWrapPageRg[] = {
RES_LR_SPACE, RES_UL_SPACE,
RES_PROTECT, RES_SURROUND,
RES_PRINT, RES_PRINT,
@@ -626,7 +626,7 @@ IMPL_LINK_NOARG(SwWrapTabPage, ContourHdl)
return 0;
}
-sal_uInt16* SwWrapTabPage::GetRanges()
+const sal_uInt16* SwWrapTabPage::GetRanges()
{
return aWrapPageRg;
}
diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx
index 711a0d469b3c..ec6a4f0275d3 100644
--- a/sw/source/ui/misc/pgfnote.cxx
+++ b/sw/source/ui/misc/pgfnote.cxx
@@ -43,7 +43,7 @@
using namespace ::com::sun::star;
-static sal_uInt16 aPageRg[] = {
+static const sal_uInt16 aPageRg[] = {
FN_PARAM_FTN_INFO, FN_PARAM_FTN_INFO,
0
};
@@ -362,7 +362,7 @@ int SwFootNotePage::DeactivatePage( SfxItemSet* _pSet)
return sal_True;
}
-sal_uInt16* SwFootNotePage::GetRanges()
+const sal_uInt16* SwFootNotePage::GetRanges()
{
return aPageRg;
}
diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx
index c83e4201ffad..1060896e61b1 100644
--- a/sw/source/ui/misc/pggrid.cxx
+++ b/sw/source/ui/misc/pggrid.cxx
@@ -353,9 +353,9 @@ void SwTextGridPage::SetLinesOrCharsRanges(FixedText & rField, const sal_Int32 n
rField.SetText( aFieldStr );
}
-sal_uInt16* SwTextGridPage::GetRanges()
+const sal_uInt16* SwTextGridPage::GetRanges()
{
- static sal_uInt16 aPageRg[] = {
+ static const sal_uInt16 aPageRg[] = {
RES_TEXTGRID, RES_TEXTGRID,
0};
return aPageRg;