[Libreoffice-commits] core.git: cui/source include/sfx2 include/svx sc/source sd/source svx/source sw/source
Luboš Luňák
l.lunak at collabora.com
Sun Apr 27 08:02:23 PDT 2014
cui/source/dialogs/postdlg.cxx | 4 ++--
cui/source/inc/align.hxx | 2 +-
cui/source/inc/backgrnd.hxx | 2 +-
cui/source/inc/border.hxx | 2 +-
cui/source/inc/chardlg.hxx | 8 ++++----
cui/source/inc/connect.hxx | 2 +-
cui/source/inc/cuitabarea.hxx | 6 +++---
cui/source/inc/cuitabline.hxx | 2 +-
cui/source/inc/dbregister.hxx | 2 +-
cui/source/inc/iconcdlg.hxx | 2 +-
cui/source/inc/labdlg.hxx | 2 +-
cui/source/inc/macropg.hxx | 2 +-
cui/source/inc/measure.hxx | 2 +-
cui/source/inc/numfmt.hxx | 2 +-
cui/source/inc/optasian.hxx | 2 +-
cui/source/inc/optlingu.hxx | 2 +-
cui/source/inc/optpath.hxx | 2 +-
cui/source/inc/page.hxx | 2 +-
cui/source/inc/paragrph.hxx | 8 ++++----
cui/source/inc/postdlg.hxx | 2 +-
cui/source/inc/swpossizetabpage.hxx | 2 +-
cui/source/inc/tabstpge.hxx | 2 +-
cui/source/inc/textanim.hxx | 2 +-
cui/source/inc/textattr.hxx | 2 +-
cui/source/inc/transfrm.hxx | 6 +++---
cui/source/options/optasian.cxx | 4 ++--
cui/source/options/optlingu.cxx | 4 ++--
cui/source/tabpages/align.cxx | 4 ++--
cui/source/tabpages/backgrnd.cxx | 4 ++--
cui/source/tabpages/border.cxx | 4 ++--
cui/source/tabpages/chardlg.cxx | 16 ++++++++--------
cui/source/tabpages/connect.cxx | 4 ++--
cui/source/tabpages/labdlg.cxx | 4 ++--
cui/source/tabpages/measure.cxx | 4 ++--
cui/source/tabpages/numfmt.cxx | 4 ++--
cui/source/tabpages/page.cxx | 6 +++---
cui/source/tabpages/paragrph.cxx | 16 ++++++++--------
cui/source/tabpages/swpossizetabpage.cxx | 4 ++--
cui/source/tabpages/tabstpge.cxx | 4 ++--
cui/source/tabpages/textanim.cxx | 4 ++--
cui/source/tabpages/textattr.cxx | 4 ++--
cui/source/tabpages/tparea.cxx | 8 ++++----
cui/source/tabpages/tpline.cxx | 4 ++--
cui/source/tabpages/tpshadow.cxx | 4 ++--
cui/source/tabpages/transfrm.cxx | 12 ++++++------
include/sfx2/basedlgs.hxx | 2 +-
include/sfx2/tabdlg.hxx | 2 +-
include/svx/hdft.hxx | 4 ++--
include/svx/svxdlg.hxx | 2 +-
sc/source/ui/attrdlg/tabpages.cxx | 4 ++--
sc/source/ui/dbgui/validate.cxx | 4 ++--
sc/source/ui/inc/tabpages.hxx | 2 +-
sc/source/ui/inc/tphf.hxx | 4 ++--
sc/source/ui/inc/tptable.hxx | 2 +-
sc/source/ui/inc/validate.hxx | 2 +-
sc/source/ui/pagedlg/tphf.cxx | 4 ++--
sc/source/ui/pagedlg/tptable.cxx | 4 ++--
sd/source/ui/dlg/paragr.cxx | 6 +++---
svx/source/dialog/hdft.cxx | 6 +++---
sw/source/core/uibase/inc/column.hxx | 2 +-
sw/source/core/uibase/inc/drpcps.hxx | 2 +-
sw/source/core/uibase/inc/frmpage.hxx | 4 ++--
sw/source/core/uibase/inc/numpara.hxx | 2 +-
sw/source/core/uibase/inc/pgfnote.hxx | 2 +-
sw/source/core/uibase/inc/pggrid.hxx | 2 +-
sw/source/core/uibase/inc/swuiccoll.hxx | 2 +-
sw/source/core/uibase/inc/wrap.hxx | 2 +-
sw/source/ui/chrdlg/drpcps.cxx | 4 ++--
sw/source/ui/chrdlg/numpara.cxx | 4 ++--
sw/source/ui/chrdlg/swuiccoll.cxx | 4 ++--
sw/source/ui/frmdlg/column.cxx | 2 +-
sw/source/ui/frmdlg/frmpage.cxx | 8 ++++----
sw/source/ui/frmdlg/wrap.cxx | 4 ++--
sw/source/ui/misc/pgfnote.cxx | 4 ++--
sw/source/ui/misc/pggrid.cxx | 4 ++--
75 files changed, 145 insertions(+), 145 deletions(-)
New commits:
commit 37c3a1c097567de818daec1e68ef132d57bcf17a
Author: Luboš Luňák <l.lunak at collabora.com>
Date: Sun Apr 27 17:01:10 2014 +0200
const
Change-Id: I0ce6965f191d1455bcc7a793025282e20b7433a5
diff --git a/cui/source/dialogs/postdlg.cxx b/cui/source/dialogs/postdlg.cxx
index 0b14ca6..c420eee 100644
--- a/cui/source/dialogs/postdlg.cxx
+++ b/cui/source/dialogs/postdlg.cxx
@@ -141,9 +141,9 @@ void SvxPostItDialog::ShowLastAuthor(const OUString& rAuthor, const OUString& rD
-sal_uInt16* SvxPostItDialog::GetRanges()
+const sal_uInt16* SvxPostItDialog::GetRanges()
{
- static sal_uInt16 pRanges[] =
+ static const sal_uInt16 pRanges[] =
{
SID_ATTR_POSTIT_AUTHOR,
SID_ATTR_POSTIT_TEXT,
diff --git a/cui/source/inc/align.hxx b/cui/source/inc/align.hxx
index 273b0a8..c9f61c6 100644
--- a/cui/source/inc/align.hxx
+++ b/cui/source/inc/align.hxx
@@ -60,7 +60,7 @@ public:
virtual ~AlignmentTabPage();
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
- 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/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx
index b8c77fd..011c56c 100644
--- a/cui/source/inc/backgrnd.hxx
+++ b/cui/source/inc/backgrnd.hxx
@@ -47,7 +47,7 @@ class SvxBackgroundTabPage : public SvxTabPage
using TabPage::DeactivatePage;
public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
- 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/cui/source/inc/border.hxx b/cui/source/inc/border.hxx
index 4820c3e..762c316 100644
--- a/cui/source/inc/border.hxx
+++ b/cui/source/inc/border.hxx
@@ -45,7 +45,7 @@ class SvxBorderTabPage : public SfxTabPage
public:
static SfxTabPage* Create( Window* pParent,
const SfxItemSet& rAttrSet);
- static sal_uInt16* GetRanges();
+ static const sal_uInt16* GetRanges();
virtual bool FillItemSet( SfxItemSet& rCoreAttrs ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE;
diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx
index c582d98..8d21e27 100644
--- a/cui/source/inc/chardlg.hxx
+++ b/cui/source/inc/chardlg.hxx
@@ -153,7 +153,7 @@ public:
virtual ~SvxCharNamePage();
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
- static sal_uInt16* GetRanges();
+ static const sal_uInt16* GetRanges();
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
@@ -232,7 +232,7 @@ public:
public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
- static sal_uInt16* GetRanges();
+ static const sal_uInt16* GetRanges();
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
@@ -311,7 +311,7 @@ public:
public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
- static sal_uInt16* GetRanges();
+ static const sal_uInt16* GetRanges();
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
@@ -354,7 +354,7 @@ public:
public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
- static sal_uInt16* GetRanges();
+ static const sal_uInt16* GetRanges();
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
diff --git a/cui/source/inc/connect.hxx b/cui/source/inc/connect.hxx
index f15f409..85d0e45 100644
--- a/cui/source/inc/connect.hxx
+++ b/cui/source/inc/connect.hxx
@@ -64,7 +64,7 @@ public:
virtual ~SvxConnectionPage();
static SfxTabPage* Create( Window*, const SfxItemSet& );
- static sal_uInt16* GetRanges();
+ static const sal_uInt16* GetRanges();
virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE;
diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index 5f58c56..b39c013 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -163,7 +163,7 @@ public:
void Construct();
static SfxTabPage* Create(Window*, const SfxItemSet&);
- static sal_uInt16* GetRanges();
+ static const sal_uInt16* GetRanges();
virtual bool FillItemSet(SfxItemSet&) SAL_OVERRIDE;
virtual void Reset(const SfxItemSet&) SAL_OVERRIDE;
@@ -293,7 +293,7 @@ public:
void Construct();
static SfxTabPage* Create( Window*, const SfxItemSet& );
- static sal_uInt16* GetRanges();
+ static const sal_uInt16* GetRanges();
virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE;
@@ -358,7 +358,7 @@ public:
void Construct();
static SfxTabPage* Create( Window*, const SfxItemSet& );
- static sal_uInt16* GetRanges();
+ static const sal_uInt16* GetRanges();
virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE;
diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx
index 9de7879..a1a2862 100644
--- a/cui/source/inc/cuitabline.hxx
+++ b/cui/source/inc/cuitabline.hxx
@@ -208,7 +208,7 @@ public:
void Construct();
static SfxTabPage* Create( Window*, const SfxItemSet& );
- static sal_uInt16* GetRanges();
+ static const sal_uInt16* GetRanges();
virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE;
diff --git a/cui/source/inc/dbregister.hxx b/cui/source/inc/dbregister.hxx
index 755232f..3e42795 100644
--- a/cui/source/inc/dbregister.hxx
+++ b/cui/source/inc/dbregister.hxx
@@ -93,7 +93,7 @@ namespace svx
virtual ~DbRegistrationOptionsPage();
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/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx
index 689938c..b7561a0 100644
--- a/cui/source/inc/iconcdlg.hxx
+++ b/cui/source/inc/iconcdlg.hxx
@@ -41,7 +41,7 @@ class IconChoicePage;
// Create-Function
typedef IconChoicePage* (*CreatePage)(Window *pParent, const SfxItemSet &rAttrSet);
-typedef sal_uInt16* (*GetPageRanges)(); // gives international Which-value
+typedef const sal_uInt16* (*GetPageRanges)(); // gives international Which-value
// position of iconchoicectrl
enum EIconChoicePos { PosLeft, PosRight, PosTop, PosBottom };
diff --git a/cui/source/inc/labdlg.hxx b/cui/source/inc/labdlg.hxx
index 9c85d7b..9970c14 100644
--- a/cui/source/inc/labdlg.hxx
+++ b/cui/source/inc/labdlg.hxx
@@ -76,7 +76,7 @@ public:
SvxCaptionTabPage( Window* pParent, const SfxItemSet& rInAttrs );
static SfxTabPage* Create( Window*, const SfxItemSet& );
- static sal_uInt16* GetRanges();
+ static const sal_uInt16* GetRanges();
virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE;
diff --git a/cui/source/inc/macropg.hxx b/cui/source/inc/macropg.hxx
index e8848a5..24ee564 100644
--- a/cui/source/inc/macropg.hxx
+++ b/cui/source/inc/macropg.hxx
@@ -107,7 +107,7 @@ public:
// class SvxMacroAssignDlg --------------------------------------------------
-typedef sal_uInt16* (*GetTabPageRanges)(); // gives international Which-values
+typedef const sal_uInt16* (*GetTabPageRanges)(); // gives international Which-values
class SvxMacroAssignSingleTabDialog : public SfxSingleTabDialog
{
diff --git a/cui/source/inc/measure.hxx b/cui/source/inc/measure.hxx
index 8ce7f1b..f8ce641 100644
--- a/cui/source/inc/measure.hxx
+++ b/cui/source/inc/measure.hxx
@@ -68,7 +68,7 @@ public:
virtual ~SvxMeasurePage();
static SfxTabPage* Create( Window*, const SfxItemSet& );
- static sal_uInt16* GetRanges();
+ static const sal_uInt16* GetRanges();
virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE;
diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx
index 5ff2bae..419ea6c 100644
--- a/cui/source/inc/numfmt.hxx
+++ b/cui/source/inc/numfmt.hxx
@@ -72,7 +72,7 @@ public:
static SfxTabPage* Create( Window* pParent,
const SfxItemSet& rAttrSet );
- 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/cui/source/inc/optasian.hxx b/cui/source/inc/optasian.hxx
index efb49dc..1efd15c 100644
--- a/cui/source/inc/optasian.hxx
+++ b/cui/source/inc/optasian.hxx
@@ -58,7 +58,7 @@ public:
virtual ~SvxAsianLayoutPage();
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
- 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/cui/source/inc/optlingu.hxx b/cui/source/inc/optlingu.hxx
index 47c1a5a..57ac9f3 100644
--- a/cui/source/inc/optlingu.hxx
+++ b/cui/source/inc/optlingu.hxx
@@ -149,7 +149,7 @@ private:
public:
virtual ~SvxLinguTabPage();
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/cui/source/inc/optpath.hxx b/cui/source/inc/optpath.hxx
index 5e1556c..0df9828 100644
--- a/cui/source/inc/optpath.hxx
+++ b/cui/source/inc/optpath.hxx
@@ -73,7 +73,7 @@ public:
virtual ~SvxPathTabPage();
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/cui/source/inc/page.hxx b/cui/source/inc/page.hxx
index a5881b9..ff4a3c3 100644
--- a/cui/source/inc/page.hxx
+++ b/cui/source/inc/page.hxx
@@ -178,7 +178,7 @@ protected:
public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
- static sal_uInt16* GetRanges();
+ static const sal_uInt16* GetRanges();
virtual bool FillItemSet( SfxItemSet& rOutSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx
index 7b74fcf..afa569a 100644
--- a/cui/source/inc/paragrph.hxx
+++ b/cui/source/inc/paragrph.hxx
@@ -100,7 +100,7 @@ public:
DECL_LINK(ELRLoseFocusHdl, void *);
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;
@@ -161,7 +161,7 @@ protected:
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;
@@ -193,7 +193,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;
@@ -273,7 +273,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/cui/source/inc/postdlg.hxx b/cui/source/inc/postdlg.hxx
index 8a25529..1f0f200 100644
--- a/cui/source/inc/postdlg.hxx
+++ b/cui/source/inc/postdlg.hxx
@@ -47,7 +47,7 @@ public:
bool bPrevNext = false);
virtual ~SvxPostItDialog();
- static sal_uInt16* GetRanges();
+ static const sal_uInt16* GetRanges();
const SfxItemSet* GetOutputItemSet() const { return pOutSet; }
Link GetPrevHdl() const { return aPrevHdlLink; }
diff --git a/cui/source/inc/swpossizetabpage.hxx b/cui/source/inc/swpossizetabpage.hxx
index 176ad22..48907f1 100644
--- a/cui/source/inc/swpossizetabpage.hxx
+++ b/cui/source/inc/swpossizetabpage.hxx
@@ -126,7 +126,7 @@ public:
virtual ~SvxSwPosSizeTabPage();
static SfxTabPage* Create( Window*, const SfxItemSet& );
- static sal_uInt16* GetRanges();
+ static const sal_uInt16* GetRanges();
virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE;
diff --git a/cui/source/inc/tabstpge.hxx b/cui/source/inc/tabstpge.hxx
index b4fd273..31b3e3d 100644
--- a/cui/source/inc/tabstpge.hxx
+++ b/cui/source/inc/tabstpge.hxx
@@ -51,7 +51,7 @@ public:
virtual ~SvxTabulatorTabPage();
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/cui/source/inc/textanim.hxx b/cui/source/inc/textanim.hxx
index 8ff4d3a..0e986a1 100644
--- a/cui/source/inc/textanim.hxx
+++ b/cui/source/inc/textanim.hxx
@@ -77,7 +77,7 @@ public:
virtual ~SvxTextAnimationPage();
static SfxTabPage* Create( Window*, const SfxItemSet& );
- static sal_uInt16* GetRanges();
+ static const sal_uInt16* GetRanges();
virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE;
diff --git a/cui/source/inc/textattr.hxx b/cui/source/inc/textattr.hxx
index fe40f00..18c3b4a 100644
--- a/cui/source/inc/textattr.hxx
+++ b/cui/source/inc/textattr.hxx
@@ -78,7 +78,7 @@ public:
virtual ~SvxTextAttrPage();
static SfxTabPage* Create( Window*, const SfxItemSet& );
- static sal_uInt16* GetRanges();
+ static const sal_uInt16* GetRanges();
virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE;
diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx
index d97856e..161a675 100644
--- a/cui/source/inc/transfrm.hxx
+++ b/cui/source/inc/transfrm.hxx
@@ -148,7 +148,7 @@ public:
SvxPositionSizeTabPage( Window* pParent, const SfxItemSet& rInAttrs );
static SfxTabPage* Create( Window*, const SfxItemSet& );
- static sal_uInt16* GetRanges();
+ static const sal_uInt16* GetRanges();
virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE;
@@ -203,7 +203,7 @@ public:
SvxAngleTabPage( Window* pParent, const SfxItemSet& rInAttrs );
static SfxTabPage* Create( Window*, const SfxItemSet& );
- static sal_uInt16* GetRanges();
+ static const sal_uInt16* GetRanges();
virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE;
@@ -247,7 +247,7 @@ public:
SvxSlantTabPage( Window* pParent, const SfxItemSet& rInAttrs );
static SfxTabPage* Create( Window*, const SfxItemSet& );
- static sal_uInt16* GetRanges();
+ static const sal_uInt16* GetRanges();
virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE;
diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx
index 5316e0a..7269d68 100644
--- a/cui/source/options/optasian.cxx
+++ b/cui/source/options/optasian.cxx
@@ -401,10 +401,10 @@ IMPL_LINK(SvxAsianLayoutPage, ModifyHdl, Edit*, pEdit)
return 0;
}
-sal_uInt16* SvxAsianLayoutPage::GetRanges()
+const sal_uInt16* SvxAsianLayoutPage::GetRanges()
{
//no items are used
- static sal_uInt16 pAsianLayoutRanges[] = { 0 };
+ static const sal_uInt16 pAsianLayoutRanges[] = { 0 };
return pAsianLayoutRanges;
}
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index 6a279b8..a46c2ee 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -152,7 +152,7 @@ static void lcl_OpenURL( const OUString& _sURL )
}
}
-static sal_uInt16 pRanges[] =
+static const sal_uInt16 pRanges[] =
{
SID_ATTR_SPELL,
SID_ATTR_SPELL,
@@ -1139,7 +1139,7 @@ SvxLinguTabPage::~SvxLinguTabPage()
// don't throw away overloaded
-sal_uInt16* SvxLinguTabPage::GetRanges()
+const sal_uInt16* SvxLinguTabPage::GetRanges()
{
//TL???
return pRanges;
diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx
index 3f56ffa..3a8b846 100644
--- a/cui/source/tabpages/align.cxx
+++ b/cui/source/tabpages/align.cxx
@@ -94,7 +94,7 @@ static const RotateModeConnection::MapEntryType s_pRotateModeMap[] =
-static sal_uInt16 s_pRanges[] =
+static const sal_uInt16 s_pRanges[] =
{
SID_ATTR_ALIGN_HOR_JUSTIFY,SID_ATTR_ALIGN_VER_JUSTIFY,
SID_ATTR_ALIGN_STACKED,SID_ATTR_ALIGN_LINEBREAK,
@@ -260,7 +260,7 @@ SfxTabPage* AlignmentTabPage::Create( Window* pParent, const SfxItemSet& rAttrSe
return new AlignmentTabPage( pParent, rAttrSet );
}
-sal_uInt16* AlignmentTabPage::GetRanges()
+const sal_uInt16* AlignmentTabPage::GetRanges()
{
return s_pRanges;
}
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index c4b5fd6..ea34a8a 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -58,7 +58,7 @@
using namespace ::com::sun::star;
// static ----------------------------------------------------------------
-static sal_uInt16 pRanges[] =
+static const sal_uInt16 pRanges[] =
{
SID_VIEW_FLD_PIC, SID_VIEW_FLD_PIC,
SID_ATTR_BRUSH, SID_ATTR_BRUSH,
@@ -441,7 +441,7 @@ SvxBackgroundTabPage::~SvxBackgroundTabPage()
-sal_uInt16* SvxBackgroundTabPage::GetRanges()
+const sal_uInt16* SvxBackgroundTabPage::GetRanges()
/* [Description]
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index 76b3e33..73a472f 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -66,7 +66,7 @@ using namespace ::editeng;
// static ----------------------------------------------------------------
-static sal_uInt16 pRanges[] =
+static const sal_uInt16 pRanges[] =
{
SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_SHADOW,
SID_ATTR_ALIGN_MARGIN, SID_ATTR_ALIGN_MARGIN,
@@ -342,7 +342,7 @@ SvxBorderTabPage::~SvxBorderTabPage()
-sal_uInt16* SvxBorderTabPage::GetRanges()
+const sal_uInt16* SvxBorderTabPage::GetRanges()
{
return pRanges;
}
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 95fbfc6..8dbe14e 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -85,7 +85,7 @@ using namespace ::com::sun::star;
// static ----------------------------------------------------------------
-static sal_uInt16 pNameRanges[] =
+static const sal_uInt16 pNameRanges[] =
{
SID_ATTR_CHAR_FONT,
SID_ATTR_CHAR_WEIGHT,
@@ -102,7 +102,7 @@ static sal_uInt16 pNameRanges[] =
0
};
-static sal_uInt16 pEffectsRanges[] =
+static const sal_uInt16 pEffectsRanges[] =
{
SID_ATTR_CHAR_SHADOWED,
SID_ATTR_CHAR_UNDERLINE,
@@ -123,7 +123,7 @@ static sal_uInt16 pEffectsRanges[] =
0
};
-static sal_uInt16 pPositionRanges[] =
+static const sal_uInt16 pPositionRanges[] =
{
SID_ATTR_CHAR_KERNING,
SID_ATTR_CHAR_KERNING,
@@ -138,7 +138,7 @@ static sal_uInt16 pPositionRanges[] =
0
};
-static sal_uInt16 pTwoLinesRanges[] =
+static const sal_uInt16 pTwoLinesRanges[] =
{
SID_ATTR_CHAR_TWO_LINES,
SID_ATTR_CHAR_TWO_LINES,
@@ -1160,7 +1160,7 @@ SfxTabPage* SvxCharNamePage::Create( Window* pParent, const SfxItemSet& rSet )
-sal_uInt16* SvxCharNamePage::GetRanges()
+const sal_uInt16* SvxCharNamePage::GetRanges()
{
return pNameRanges;
}
@@ -1707,7 +1707,7 @@ SfxTabPage* SvxCharEffectsPage::Create( Window* pParent, const SfxItemSet& rSet
-sal_uInt16* SvxCharEffectsPage::GetRanges()
+const sal_uInt16* SvxCharEffectsPage::GetRanges()
{
return pEffectsRanges;
}
@@ -2881,7 +2881,7 @@ SfxTabPage* SvxCharPositionPage::Create( Window* pParent, const SfxItemSet& rSet
-sal_uInt16* SvxCharPositionPage::GetRanges()
+const sal_uInt16* SvxCharPositionPage::GetRanges()
{
return pPositionRanges;
}
@@ -3454,7 +3454,7 @@ SfxTabPage* SvxCharTwoLinesPage::Create( Window* pParent, const SfxItemSet& rSet
-sal_uInt16* SvxCharTwoLinesPage::GetRanges()
+const sal_uInt16* SvxCharTwoLinesPage::GetRanges()
{
return pTwoLinesRanges;
}
diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx
index 3fa0f2e..0728184 100644
--- a/cui/source/tabpages/connect.cxx
+++ b/cui/source/tabpages/connect.cxx
@@ -38,7 +38,7 @@
#include "connect.hxx"
#include "paragrph.hrc"
-static sal_uInt16 pRanges[] =
+static const sal_uInt16 pRanges[] =
{
SDRATTR_EDGE_FIRST,
SDRATTR_EDGE_LAST,
@@ -396,7 +396,7 @@ SfxTabPage* SvxConnectionPage::Create( Window* pWindow,
return( new SvxConnectionPage( pWindow, rAttrs ) );
}
-sal_uInt16* SvxConnectionPage::GetRanges()
+const sal_uInt16* SvxConnectionPage::GetRanges()
{
return( pRanges );
}
diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx
index a46fffd..7122851 100644
--- a/cui/source/tabpages/labdlg.cxx
+++ b/cui/source/tabpages/labdlg.cxx
@@ -56,7 +56,7 @@
// static ----------------------------------------------------------------
-static sal_uInt16 pCaptionRanges[] =
+static const sal_uInt16 pCaptionRanges[] =
{
SDRATTR_CAPTIONTYPE,
SDRATTR_CAPTIONFIXEDANGLE,
@@ -338,7 +338,7 @@ SfxTabPage* SvxCaptionTabPage::Create( Window* pWindow,
-sal_uInt16* SvxCaptionTabPage::GetRanges()
+const sal_uInt16* SvxCaptionTabPage::GetRanges()
{
return( pCaptionRanges );
}
diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx
index e9f71ee..4dc2937 100644
--- a/cui/source/tabpages/measure.cxx
+++ b/cui/source/tabpages/measure.cxx
@@ -48,7 +48,7 @@
#include "measure.hxx"
-static sal_uInt16 pRanges[] =
+static const sal_uInt16 pRanges[] =
{
SDRATTR_MEASURE_FIRST,
SDRATTR_MEASURE_LAST,
@@ -599,7 +599,7 @@ SfxTabPage* SvxMeasurePage::Create( Window* pWindow,
return( new SvxMeasurePage( pWindow, rAttrs ) );
}
-sal_uInt16* SvxMeasurePage::GetRanges()
+const sal_uInt16* SvxMeasurePage::GetRanges()
{
return( pRanges );
}
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index a8eeaae..bd2eb99 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -51,7 +51,7 @@ using ::com::sun::star::uno::UNO_QUERY;
// static ----------------------------------------------------------------
-static sal_uInt16 pRanges[] =
+static const sal_uInt16 pRanges[] =
{
SID_ATTR_NUMBERFORMAT_VALUE,
SID_ATTR_NUMBERFORMAT_INFO,
@@ -342,7 +342,7 @@ void SvxNumberFormatTabPage::Init_Impl()
#*
#************************************************************************/
-sal_uInt16* SvxNumberFormatTabPage::GetRanges()
+const sal_uInt16* SvxNumberFormatTabPage::GetRanges()
{
return pRanges;
}
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index 7484ea0..740a905 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -63,7 +63,7 @@ static const long MINBODY = 284; // 0,5 cm rounded up in twips
//static const long PRINT_OFFSET = 17; // 0,03 cm rounded down in twips
static const long PRINT_OFFSET = 0; // why was this ever set to 17 ? it led to wrong right and bottom margins.
-static sal_uInt16 pRanges[] =
+static const sal_uInt16 pRanges[] =
{
SID_ATTR_BORDER_OUTER,
SID_ATTR_BORDER_SHADOW,
@@ -75,7 +75,7 @@ static sal_uInt16 pRanges[] =
};
// ------- Mapping page layout ------------------------------------------
-sal_uInt16 aArr[] =
+const sal_uInt16 aArr[] =
{
SVX_PAGE_ALL,
SVX_PAGE_MIRROR,
@@ -158,7 +158,7 @@ struct SvxPage_Impl
// class SvxPageDescPage --------------------------------------------------
// returns the range of the Which values
-sal_uInt16* SvxPageDescPage::GetRanges()
+const sal_uInt16* SvxPageDescPage::GetRanges()
{
return pRanges;
}
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index 5439acf..50e257b 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -52,7 +52,7 @@
#include <sfx2/request.hxx>
#include <svl/intitem.hxx>
-static sal_uInt16 pStdRanges[] =
+static const sal_uInt16 pStdRanges[] =
{
SID_ATTR_PARA_LINESPACE, // 10033
SID_ATTR_PARA_LINESPACE,
@@ -63,14 +63,14 @@ static sal_uInt16 pStdRanges[] =
0
};
-static sal_uInt16 pAlignRanges[] =
+static const sal_uInt16 pAlignRanges[] =
{
SID_ATTR_PARA_ADJUST, // 10027
SID_ATTR_PARA_ADJUST,
0
};
-static sal_uInt16 pExtRanges[] =
+static const sal_uInt16 pExtRanges[] =
{
SID_ATTR_PARA_PAGEBREAK, // 10037 -
SID_ATTR_PARA_WIDOWS, // 10041
@@ -675,7 +675,7 @@ void SvxStdParagraphTabPage::EnableNegativeMode()
bNegativeIndents = true;
}
-sal_uInt16* SvxStdParagraphTabPage::GetRanges()
+const sal_uInt16* SvxStdParagraphTabPage::GetRanges()
{
return pStdRanges;
}
@@ -1049,7 +1049,7 @@ SfxTabPage* SvxParaAlignTabPage::Create( Window* pParent, const SfxItemSet& rSet
return new SvxParaAlignTabPage(pParent, rSet);
}
-sal_uInt16* SvxParaAlignTabPage::GetRanges()
+const sal_uInt16* SvxParaAlignTabPage::GetRanges()
{
return pAlignRanges;
}
@@ -1921,7 +1921,7 @@ SvxExtParagraphTabPage::~SvxExtParagraphTabPage()
{
}
-sal_uInt16* SvxExtParagraphTabPage::GetRanges()
+const sal_uInt16* SvxExtParagraphTabPage::GetRanges()
{
return pExtRanges;
}
@@ -2137,9 +2137,9 @@ SfxTabPage* SvxAsianTabPage::Create( Window* pParent, const SfxItemSet& rSet
return new SvxAsianTabPage(pParent, rSet);
}
-sal_uInt16* SvxAsianTabPage::GetRanges()
+const sal_uInt16* SvxAsianTabPage::GetRanges()
{
- static sal_uInt16 pRanges[] =
+ static const sal_uInt16 pRanges[] =
{
SID_ATTR_PARA_SCRIPTSPACE, SID_ATTR_PARA_FORBIDDEN_RULES,
0
diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx
index 13dfcb1..dadfe43 100644
--- a/cui/source/tabpages/swpossizetabpage.cxx
+++ b/cui/source/tabpages/swpossizetabpage.cxx
@@ -697,9 +697,9 @@ SfxTabPage* SvxSwPosSizeTabPage::Create( Window* pParent, const SfxItemSet& rSet
return new SvxSwPosSizeTabPage(pParent, rSet);
}
-sal_uInt16* SvxSwPosSizeTabPage::GetRanges()
+const sal_uInt16* SvxSwPosSizeTabPage::GetRanges()
{
- static sal_uInt16 pSwPosRanges[] =
+ static const sal_uInt16 pSwPosRanges[] =
{
SID_ATTR_TRANSFORM_POS_X,
SID_ATTR_TRANSFORM_POS_Y,
diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx
index fbe4bf7..0e99063 100644
--- a/cui/source/tabpages/tabstpge.cxx
+++ b/cui/source/tabpages/tabstpge.cxx
@@ -64,7 +64,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeTabWin_Impl(Window *pParent
}
// static ----------------------------------------------------------------
-static sal_uInt16 pRanges[] =
+static const sal_uInt16 pRanges[] =
{
SID_ATTR_TABSTOP,
SID_ATTR_TABSTOP_OFFSET,
@@ -194,7 +194,7 @@ SvxTabulatorTabPage::~SvxTabulatorTabPage()
-sal_uInt16* SvxTabulatorTabPage::GetRanges()
+const sal_uInt16* SvxTabulatorTabPage::GetRanges()
{
return pRanges;
}
diff --git a/cui/source/tabpages/textanim.cxx b/cui/source/tabpages/textanim.cxx
index 588cd74..4ec13e8 100644
--- a/cui/source/tabpages/textanim.cxx
+++ b/cui/source/tabpages/textanim.cxx
@@ -29,7 +29,7 @@
#include <dialmgr.hxx>
#include "svx/dlgutil.hxx"
-static sal_uInt16 pRanges[] =
+static const sal_uInt16 pRanges[] =
{
SDRATTR_TEXT_ANIKIND,
SDRATTR_TEXT_ANIAMOUNT,
@@ -440,7 +440,7 @@ bool SvxTextAnimationPage::FillItemSet( SfxItemSet& rAttrs)
return( bModified );
}
-sal_uInt16* SvxTextAnimationPage::GetRanges()
+const sal_uInt16* SvxTextAnimationPage::GetRanges()
{
return( pRanges );
}
diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx
index 29a4833..17da774 100644
--- a/cui/source/tabpages/textattr.cxx
+++ b/cui/source/tabpages/textattr.cxx
@@ -40,7 +40,7 @@
#include <svx/ofaitem.hxx>
#include <editeng/writingmodeitem.hxx>
-static sal_uInt16 pRanges[] =
+static const sal_uInt16 pRanges[] =
{
SDRATTR_MISC_FIRST
, SDRATTR_TEXT_HORZADJUST
@@ -525,7 +525,7 @@ SfxTabPage* SvxTextAttrPage::Create( Window* pWindow,
return( new SvxTextAttrPage( pWindow, rAttrs ) );
}
-sal_uInt16* SvxTextAttrPage::GetRanges()
+const sal_uInt16* SvxTextAttrPage::GetRanges()
{
return( pRanges );
}
diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index 06e781a..4dcd79b 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -47,7 +47,7 @@
// static ----------------------------------------------------------------
-static sal_uInt16 pAreaRanges[] =
+static const sal_uInt16 pAreaRanges[] =
{
XATTR_GRADIENTSTEPCOUNT,
XATTR_GRADIENTSTEPCOUNT,
@@ -56,7 +56,7 @@ static sal_uInt16 pAreaRanges[] =
0
};
-static sal_uInt16 pTransparenceRanges[] =
+static const sal_uInt16 pTransparenceRanges[] =
{
XATTR_FILLTRANSPARENCE,
XATTR_FILLTRANSPARENCE,
@@ -292,7 +292,7 @@ SfxTabPage* SvxTransparenceTabPage::Create(Window* pWindow, const SfxItemSet& rA
return(new SvxTransparenceTabPage(pWindow, rAttrs));
}
-sal_uInt16* SvxTransparenceTabPage::GetRanges()
+const sal_uInt16* SvxTransparenceTabPage::GetRanges()
{
return(pTransparenceRanges);
}
@@ -1762,7 +1762,7 @@ SfxTabPage* SvxAreaTabPage::Create( Window* pWindow,
-sal_uInt16* SvxAreaTabPage::GetRanges()
+const sal_uInt16* SvxAreaTabPage::GetRanges()
{
return( pAreaRanges );
}
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index 317f6c0..b695605 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -65,7 +65,7 @@
// static ----------------------------------------------------------------
-static sal_uInt16 pLineRanges[] =
+static const sal_uInt16 pLineRanges[] =
{
XATTR_LINETRANSPARENCE,
XATTR_LINETRANSPARENCE,
@@ -1498,7 +1498,7 @@ SfxTabPage* SvxLineTabPage::Create( Window* pWindow,
-sal_uInt16* SvxLineTabPage::GetRanges()
+const sal_uInt16* SvxLineTabPage::GetRanges()
{
return pLineRanges;
}
diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx
index da9bd88..6e7ff1d 100644
--- a/cui/source/tabpages/tpshadow.cxx
+++ b/cui/source/tabpages/tpshadow.cxx
@@ -35,7 +35,7 @@
#include <svx/xlineit0.hxx>
#include <sfx2/request.hxx>
-static sal_uInt16 pShadowRanges[] =
+static const sal_uInt16 pShadowRanges[] =
{
SDRATTR_SHADOWCOLOR,
SDRATTR_SHADOWTRANSPARENCE,
@@ -464,7 +464,7 @@ SfxTabPage* SvxShadowTabPage::Create( Window* pWindow,
-sal_uInt16* SvxShadowTabPage::GetRanges()
+const sal_uInt16* SvxShadowTabPage::GetRanges()
{
return( pShadowRanges );
}
diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx
index c7ade67..e3e6fde 100644
--- a/cui/source/tabpages/transfrm.cxx
+++ b/cui/source/tabpages/transfrm.cxx
@@ -40,7 +40,7 @@
// static ----------------------------------------------------------------
-static sal_uInt16 pPosSizeRanges[] =
+static const sal_uInt16 pPosSizeRanges[] =
{
SID_ATTR_TRANSFORM_POS_X,
SID_ATTR_TRANSFORM_POS_Y,
@@ -59,7 +59,7 @@ static sal_uInt16 pPosSizeRanges[] =
0
};
-static sal_uInt16 pAngleRanges[] =
+static const sal_uInt16 pAngleRanges[] =
{
SID_ATTR_TRANSFORM_ROT_X,
SID_ATTR_TRANSFORM_ANGLE,
@@ -68,7 +68,7 @@ static sal_uInt16 pAngleRanges[] =
0
};
-static sal_uInt16 pSlantRanges[] =
+static const sal_uInt16 pSlantRanges[] =
{
SDRATTR_ECKENRADIUS,
SDRATTR_ECKENRADIUS,
@@ -342,7 +342,7 @@ SfxTabPage* SvxAngleTabPage::Create( Window* pWindow, const SfxItemSet& rSet)
-sal_uInt16* SvxAngleTabPage::GetRanges()
+const sal_uInt16* SvxAngleTabPage::GetRanges()
{
return(pAngleRanges);
}
@@ -579,7 +579,7 @@ SfxTabPage* SvxSlantTabPage::Create( Window* pWindow, const SfxItemSet& rOutAttr
-sal_uInt16* SvxSlantTabPage::GetRanges()
+const sal_uInt16* SvxSlantTabPage::GetRanges()
{
return( pSlantRanges );
}
@@ -1020,7 +1020,7 @@ SfxTabPage* SvxPositionSizeTabPage::Create( Window* pWindow, const SfxItemSet& r
-sal_uInt16* SvxPositionSizeTabPage::GetRanges()
+const sal_uInt16* SvxPositionSizeTabPage::GetRanges()
{
return( pPosSizeRanges );
}
diff --git a/include/sfx2/basedlgs.hxx b/include/sfx2/basedlgs.hxx
index 64e60d2..1432d26 100644
--- a/include/sfx2/basedlgs.hxx
+++ b/include/sfx2/basedlgs.hxx
@@ -175,7 +175,7 @@ struct SingleTabDlgImpl
}
};
-typedef sal_uInt16* (*GetTabPageRanges)(); // liefert internationale Which-Werte
+typedef const sal_uInt16* (*GetTabPageRanges)(); // liefert internationale Which-Werte
class SFX2_DLLPUBLIC SfxSingleTabDialog : public SfxModalDialog
{
diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx
index 80af1c4..0711fb6 100644
--- a/include/sfx2/tabdlg.hxx
+++ b/include/sfx2/tabdlg.hxx
@@ -38,7 +38,7 @@ class SfxTabPage;
class SfxBindings;
typedef SfxTabPage* (*CreateTabPage)(Window *pParent, const SfxItemSet &rAttrSet);
-typedef sal_uInt16* (*GetTabPageRanges)(); // provides international Which-value
+typedef const sal_uInt16* (*GetTabPageRanges)(); // provides international Which-value
struct TabPageImpl;
struct TabDlg_Impl;
diff --git a/include/svx/hdft.hxx b/include/svx/hdft.hxx
index b6827e1..c6cd5ca 100644
--- a/include/svx/hdft.hxx
+++ b/include/svx/hdft.hxx
@@ -102,7 +102,7 @@ class SVX_DLLPUBLIC SvxHeaderPage : public SvxHFPage
{
public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
- static sal_uInt16* GetRanges();
+ static const sal_uInt16* GetRanges();
private:
SvxHeaderPage( Window* pParent, const SfxItemSet& rSet );
@@ -114,7 +114,7 @@ class SVX_DLLPUBLIC SvxFooterPage : public SvxHFPage
{
public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
- static sal_uInt16* GetRanges();
+ static const sal_uInt16* GetRanges();
private:
SVX_DLLPRIVATE SvxFooterPage( Window* pParent, const SfxItemSet& rSet );
diff --git a/include/svx/svxdlg.hxx b/include/svx/svxdlg.hxx
index 579912a..d7328dd 100644
--- a/include/svx/svxdlg.hxx
+++ b/include/svx/svxdlg.hxx
@@ -43,7 +43,7 @@ namespace linguistic2{
class SvxSpellWrapper;
typedef SfxTabPage* (*CreateSvxDistributePage)(Window *pParent, const SfxItemSet &rAttrSet, SvxDistributeHorizontal eHor, SvxDistributeVertical eVer);
-typedef sal_uInt16* (*DialogGetRanges)();
+typedef const sal_uInt16* (*DialogGetRanges)();
struct ExchangeData;
class INetURLObject;
diff --git a/sc/source/ui/attrdlg/tabpages.cxx b/sc/source/ui/attrdlg/tabpages.cxx
index 07a137b..71a30d4 100644
--- a/sc/source/ui/attrdlg/tabpages.cxx
+++ b/sc/source/ui/attrdlg/tabpages.cxx
@@ -31,7 +31,7 @@
// STATIC DATA -----------------------------------------------------------
-static sal_uInt16 pProtectionRanges[] =
+static const sal_uInt16 pProtectionRanges[] =
{
SID_SCATTR_PROTECTION,
SID_SCATTR_PROTECTION,
@@ -63,7 +63,7 @@ ScTabPageProtection::ScTabPageProtection(Window* pParent, const SfxItemSet& rCor
m_pBtnHidePrint->SetClickHdl( LINK( this, ScTabPageProtection, ButtonClickHdl ) );
}
-sal_uInt16* ScTabPageProtection::GetRanges()
+const sal_uInt16* ScTabPageProtection::GetRanges()
{
return pProtectionRanges;
}
diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx
index 6efd5a53..a89fa81 100644
--- a/sc/source/ui/dbgui/validate.cxx
+++ b/sc/source/ui/dbgui/validate.cxx
@@ -73,7 +73,7 @@
#define SC_VALIDDLG_DATA_INVALIDRANGE 7
-static sal_uInt16 pValueRanges[] =
+static const sal_uInt16 pValueRanges[] =
{
FID_VALID_MODE, FID_VALID_ERRTEXT,
FID_VALID_LISTTYPE, FID_VALID_LISTTYPE,
@@ -379,7 +379,7 @@ SfxTabPage* ScTPValidationValue::Create( Window* pParent, const SfxItemSet& rArg
return( new ScTPValidationValue( pParent, rArgSet ) );
}
-sal_uInt16* ScTPValidationValue::GetRanges()
+const sal_uInt16* ScTPValidationValue::GetRanges()
{
return pValueRanges;
}
diff --git a/sc/source/ui/inc/tabpages.hxx b/sc/source/ui/inc/tabpages.hxx
index 3939038..e5780f4 100644
--- a/sc/source/ui/inc/tabpages.hxx
+++ b/sc/source/ui/inc/tabpages.hxx
@@ -29,7 +29,7 @@ class ScTabPageProtection : public SfxTabPage
public:
static SfxTabPage* Create ( Window* pParent,
const SfxItemSet& rAttrSet );
- static sal_uInt16* GetRanges ();
+ static const sal_uInt16* GetRanges ();
virtual bool FillItemSet ( SfxItemSet& rCoreAttrs ) SAL_OVERRIDE;
virtual void Reset ( const SfxItemSet& ) SAL_OVERRIDE;
diff --git a/sc/source/ui/inc/tphf.hxx b/sc/source/ui/inc/tphf.hxx
index b7f95b4..733242d 100644
--- a/sc/source/ui/inc/tphf.hxx
+++ b/sc/source/ui/inc/tphf.hxx
@@ -64,7 +64,7 @@ class ScHeaderPage : public ScHFPage
{
public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
- static sal_uInt16* GetRanges();
+ static const sal_uInt16* GetRanges();
private:
ScHeaderPage( Window* pParent, const SfxItemSet& rSet );
@@ -74,7 +74,7 @@ class ScFooterPage : public ScHFPage
{
public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
- static sal_uInt16* GetRanges();
+ static const sal_uInt16* GetRanges();
private:
ScFooterPage( Window* pParent, const SfxItemSet& rSet );
diff --git a/sc/source/ui/inc/tptable.hxx b/sc/source/ui/inc/tptable.hxx
index 2025aab..c04c3be 100644
--- a/sc/source/ui/inc/tptable.hxx
+++ b/sc/source/ui/inc/tptable.hxx
@@ -30,7 +30,7 @@ class ScTablePage : public SfxTabPage
public:
static SfxTabPage* Create ( Window* pParent,
const SfxItemSet& rCoreSet );
- static sal_uInt16* GetRanges ();
+ static const sal_uInt16* GetRanges ();
virtual bool FillItemSet ( SfxItemSet& rCoreSet ) SAL_OVERRIDE;
virtual void Reset ( const SfxItemSet& rCoreSet ) SAL_OVERRIDE;
using SfxTabPage::DeactivatePage;
diff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxx
index 9e0e302..b7b6caf 100644
--- a/sc/source/ui/inc/validate.hxx
+++ b/sc/source/ui/inc/validate.hxx
@@ -180,7 +180,7 @@ public:
explicit ScTPValidationValue( Window* pParent, const SfxItemSet& rArgSet );
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rArgSet );
- static sal_uInt16* GetRanges();
+ static const sal_uInt16* GetRanges();
virtual bool FillItemSet( SfxItemSet& rArgSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rArgSet ) SAL_OVERRIDE;
diff --git a/sc/source/ui/pagedlg/tphf.cxx b/sc/source/ui/pagedlg/tphf.cxx
index ed0ca21..5134f38 100644
--- a/sc/source/ui/pagedlg/tphf.cxx
+++ b/sc/source/ui/pagedlg/tphf.cxx
@@ -260,7 +260,7 @@ SfxTabPage* ScHeaderPage::Create( Window* pParent, const SfxItemSet& rCoreSet )
return ( new ScHeaderPage( pParent, rCoreSet ) );
}
-sal_uInt16* ScHeaderPage::GetRanges()
+const sal_uInt16* ScHeaderPage::GetRanges()
{
return SvxHeaderPage::GetRanges();
}
@@ -279,7 +279,7 @@ SfxTabPage* ScFooterPage::Create( Window* pParent, const SfxItemSet& rCoreSet )
return ( new ScFooterPage( pParent, rCoreSet ) );
}
-sal_uInt16* ScFooterPage::GetRanges()
+const sal_uInt16* ScFooterPage::GetRanges()
{
return SvxHeaderPage::GetRanges();
}
diff --git a/sc/source/ui/pagedlg/tptable.cxx b/sc/source/ui/pagedlg/tptable.cxx
index c00dffb..7a9aa96 100644
--- a/sc/source/ui/pagedlg/tptable.cxx
+++ b/sc/source/ui/pagedlg/tptable.cxx
@@ -33,7 +33,7 @@
// Static Data
-static sal_uInt16 pPageTableRanges[] =
+static const sal_uInt16 pPageTableRanges[] =
{
ATTR_PAGE_NOTES, ATTR_PAGE_FIRSTPAGENO,
0
@@ -130,7 +130,7 @@ ScTablePage::~ScTablePage()
{
}
-sal_uInt16* ScTablePage::GetRanges()
+const sal_uInt16* ScTablePage::GetRanges()
{
return pPageTableRanges;
}
diff --git a/sd/source/ui/dlg/paragr.cxx b/sd/source/ui/dlg/paragr.cxx
index 91f4b30..4afad9b 100644
--- a/sd/source/ui/dlg/paragr.cxx
+++ b/sd/source/ui/dlg/paragr.cxx
@@ -41,7 +41,7 @@ public:
virtual ~SdParagraphNumTabPage();
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;
@@ -79,9 +79,9 @@ SfxTabPage* SdParagraphNumTabPage::Create(Window *pParent, const SfxItemSet & rA
return new SdParagraphNumTabPage( pParent, rAttrSet );
}
-sal_uInt16* SdParagraphNumTabPage::GetRanges()
+const sal_uInt16* SdParagraphNumTabPage::GetRanges()
{
- static sal_uInt16 aRange[] =
+ static const sal_uInt16 aRange[] =
{
ATTR_PARANUMBERING_START, ATTR_PARANUMBERING_END,
0
diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx
index 4c6953a..0b8831b 100644
--- a/svx/source/dialog/hdft.cxx
+++ b/svx/source/dialog/hdft.cxx
@@ -55,7 +55,7 @@ static const long MINBODY = 56; // 1mm in twips rounded
static const long DEF_DIST_WRITER = 500; // 5mm (Writer)
static const long DEF_DIST_CALC = 250; // 2.5mm (Calc)
-static sal_uInt16 pRanges[] =
+static const sal_uInt16 pRanges[] =
{
SID_ATTR_BRUSH, SID_ATTR_BRUSH,
SID_ATTR_BORDER_OUTER, SID_ATTR_BORDER_OUTER,
@@ -107,7 +107,7 @@ namespace svx {
// returns the Which values to the range
-sal_uInt16* SvxHeaderPage::GetRanges()
+const sal_uInt16* SvxHeaderPage::GetRanges()
{
return pRanges;
}
@@ -121,7 +121,7 @@ SfxTabPage* SvxHeaderPage::Create( Window* pParent, const SfxItemSet& rSet )
-sal_uInt16* SvxFooterPage::GetRanges()
+const sal_uInt16* SvxFooterPage::GetRanges()
{
return pRanges;
}
diff --git a/sw/source/core/uibase/inc/column.hxx b/sw/source/core/uibase/inc/column.hxx
index 42d2613..991450d 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 7b31527..1a41ce2 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 09d1d93..01d535d 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 37b2673..6b2d0da 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 cfcd6b1..4cb6365 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 9d98db0..3acb5ab 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 3f5fd1f..06f2004 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 fac955c..6a58d8b 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 e35a10b..8b9787a 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 0db7854..8807807 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 faca1bc..f60dcb3 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 adb744e..12abb8e 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 361668a..03c2b05 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 f18f687..f5079d7 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 711a0d4..ec6a4f0 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 c83e420..1060896 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;
More information about the Libreoffice-commits
mailing list