diff options
Diffstat (limited to 'cui')
45 files changed, 95 insertions, 95 deletions
diff --git a/cui/source/dialogs/postdlg.cxx b/cui/source/dialogs/postdlg.cxx index 0b14ca606a92..c420eee6a8cd 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 273b0a89d198..c9f61c6665a4 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 b8c77fd37ac6..011c56cf4141 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 4820c3e96c5c..762c316d6ec1 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 c582d98302d5..8d21e27b90a7 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 f15f409c98a8..85d0e45f0bf3 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 5f58c56aaad9..b39c01375b83 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 9de7879b9df2..a1a28627a855 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 755232f436a0..3e42795c8052 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 689938c3bf05..b7561a000a7c 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 9c85d7ba00bf..9970c1471f91 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 e8848a59acdf..24ee56458dea 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 8ce7f1bf0727..f8ce64198639 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 5ff2baee62be..419ea6c98964 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 efb49dc7661a..1efd15c0b38d 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 47c1a5acc7de..57ac9f3319bf 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 5e1556cffc2a..0df98284d99e 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 a5881b996557..ff4a3c315592 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 7b74fcf632b1..afa569ae448c 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 8a25529541f8..1f0f200cdfe2 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 176ad2222300..48907f16c8d4 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 b4fd273fe4fd..31b3e3db664f 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 8ff4d3a63bab..0e986a1cb4c4 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 fe40f007123a..18c3b4aeaada 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 d97856e1dfe1..161a675ce304 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 5316e0a61a3e..7269d6892231 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 6a279b8e64d2..a46c2eeec545 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 3f56ffafc6ad..3a8b84611309 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 c4b5fd669f95..ea34a8aeb6a5 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 76b3e33a8619..73a472f288eb 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 95fbfc6e2929..8dbe14e1fffd 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 3fa0f2e395a2..07281840cfe1 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 a46fffdfc44f..7122851b4603 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 e9f71eed3a0e..4dc2937abd42 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 a8eeaae98ff7..bd2eb9906f72 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 7484ea02c8e3..740a905eb441 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 5439acf59113..50e257b8f645 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 13dfcb196a6c..dadfe4346db2 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 fbe4bf733124..0e990637db30 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 588cd74713b0..4ec13e89788e 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 29a483337fc1..17da774afd97 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 06e781adea08..4dcd79b4e993 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 317f6c0cebc8..b69560550ba6 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 da9bd8850f5d..6e7ff1d73bb9 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 c7ade67de393..e3e6fded5a12 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 ); } |