loplugin:constantfunction: cui

Change-Id: I4bbfbd526f78c4806d6fc85a4011cbc4ef3a25fa

41 files changed, 88 insertions, 294 deletions

diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index 6cb2357d1ed0..54be990c1d3b 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -361,14 +361,6 @@ OUString SfxConfigFunctionListBox::GetCurLabel()
     return pData->sCommand;
 }
 
-void SfxConfigFunctionListBox::FunctionSelected()
-/*  Description
-    Resets the balloon-help because it shall
-    always show the help-text of the selected entry.
-*/
-{
-}
-
 void SfxConfigFunctionListBox::SetStylesInfo(SfxStylesInfo_Impl* pStyles)
 {
     pStylesInfo = pStyles;
@@ -496,16 +488,6 @@ void SfxConfigGroupListBox::InitModule()
 }
 
 
-void SfxConfigGroupListBox::InitBasic()
-{
-}
-
-
-void SfxConfigGroupListBox::InitStyles()
-{
-}
-
-
 namespace
 {
 
@@ -578,8 +560,6 @@ void SfxConfigGroupListBox::Init(const css::uno::Reference< css::uno::XComponent
         m_xUICmdDescription   = css::frame::theUICommandDescription::get( m_xContext );
 
         InitModule();
-        InitBasic();
-        InitStyles();
     }
 
     SAL_INFO("cui.customize", "** ** About to initialise SF Scripts");
diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx
index 982ed6c1ca2a..9832ce92d329 100644
--- a/cui/source/dialogs/iconcdlg.cxx
+++ b/cui/source/dialogs/iconcdlg.cxx
@@ -74,25 +74,6 @@ int IconChoicePage::DeactivatePage( SfxItemSet* )
     return LEAVE_PAGE;
 }
 
-/**********************************************************************
-|
-| ...
-|
-\**********************************************************************/
-
-void IconChoicePage::FillUserData()
-{
-}
-
-
-
-bool IconChoicePage::IsReadOnly() const
-{
-    return false;
-}
-
-
-
 bool IconChoicePage::QueryClose()
 {
     return true;
@@ -240,7 +221,6 @@ IconChoiceDialog ::~IconChoiceDialog ()
 
         if ( pData->pPage )
         {
-            pData->pPage->FillUserData();
             OUString aPageData(pData->pPage->GetUserData());
             if ( !aPageData.isEmpty() )
             {
@@ -489,7 +469,7 @@ void IconChoiceDialog::ActivatePageImpl ()
         if ( pExampleSet )
             pData->pPage->ActivatePage( *pExampleSet );
         SetHelpId( pData->pPage->GetHelpId() );
-        bReadOnly = pData->pPage->IsReadOnly();
+        bReadOnly = false;
     }
 
 
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index f740a896a7a2..801f94980cf1 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -339,10 +339,6 @@ bool SFTreeListBox::ExpandingHdl()
     return true;
 }
 
-void SFTreeListBox::ExpandAllTrees()
-{
-}
-
 SvTreeListEntry * SFTreeListBox::insertEntry(
     OUString const & rText, sal_uInt16 nBitmap, SvTreeListEntry * pParent,
     bool bChildrenOnDemand, std::unique_ptr< SFEntry > && aUserData, const OUString& factoryURL )
@@ -514,7 +510,6 @@ short SvxScriptOrgDialog::Execute()
 
         pDoc = SfxObjectShell::GetNext(*pDoc);
     }
-    m_pScriptsBox->ExpandAllTrees();
 
     vcl::Window* pPrevDlgParent = Application::GetDefDialogParent();
     Application::SetDefDialogParent( this );
diff --git a/cui/source/inc/align.hxx b/cui/source/inc/align.hxx
index fb5e07ee9338..f3e0cfda0e2f 100644
--- a/cui/source/inc/align.hxx
+++ b/cui/source/inc/align.hxx
@@ -54,12 +54,13 @@ namespace svx {
 class AlignmentTabPage : public SfxTabPage
 {
     using TabPage::DeactivatePage;
+    static const sal_uInt16 s_pRanges[];
 
 public:
     virtual             ~AlignmentTabPage();
 
     static SfxTabPage*  Create( vcl::Window* pParent, const SfxItemSet* rAttrSet );
-    static const sal_uInt16*  GetRanges();
+    static const sal_uInt16*  GetRanges() { return s_pRanges; }
 
     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 9e34d66218ee..6c3298ef3633 100644
--- a/cui/source/inc/backgrnd.hxx
+++ b/cui/source/inc/backgrnd.hxx
@@ -45,9 +45,11 @@ class SvxBrushItem;
 class SvxBackgroundTabPage : public SvxTabPage
 {
     using TabPage::DeactivatePage;
+    static const sal_uInt16 pPageRanges[];
 public:
     static SfxTabPage*  Create( vcl::Window* pParent, const SfxItemSet* rAttrSet );
-    static const sal_uInt16*      GetRanges();
+    // returns the area of the which-values
+    static const sal_uInt16* GetRanges() { return pPageRanges; }
 
     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 0a5aea5504b6..244faa20fe6b 100644
--- a/cui/source/inc/border.hxx
+++ b/cui/source/inc/border.hxx
@@ -42,10 +42,12 @@ class SvxBorderTabPage : public SfxTabPage
 {
     using TabPage::DeactivatePage;
 
+    static const sal_uInt16 pRanges[];
+
 public:
     static SfxTabPage*  Create( vcl::Window* pParent,
                                 const SfxItemSet* rAttrSet);
-    static const sal_uInt16*      GetRanges();
+    static const sal_uInt16*      GetRanges() { return pRanges; }
 
     virtual bool        FillItemSet( SfxItemSet* rCoreAttrs ) SAL_OVERRIDE;
     virtual void        Reset( const SfxItemSet* ) SAL_OVERRIDE;
diff --git a/cui/source/inc/cfgutil.hxx b/cui/source/inc/cfgutil.hxx
index c2c124298101..3e445ce0e853 100644
--- a/cui/source/inc/cfgutil.hxx
+++ b/cui/source/inc/cfgutil.hxx
@@ -120,7 +120,6 @@ public:
     OUString      GetCurCommand();
     OUString      GetCurLabel();
     OUString      GetSelectedScriptURI();
-    void          FunctionSelected();
     void          SetStylesInfo(SfxStylesInfo_Impl* pStyles);
 };
 
@@ -151,8 +150,6 @@ class SfxConfigGroupListBox : public SvTreeListBox
 
 
     void InitModule();
-    void InitBasic();
-    void InitStyles();
 
     OUString MapCommand2UIName(const OUString& sCommand);
 
diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx
index 424a976b4df0..43d7d61e0b10 100644
--- a/cui/source/inc/chardlg.hxx
+++ b/cui/source/inc/chardlg.hxx
@@ -78,6 +78,7 @@ class SvxCharNamePage : public SvxCharBasePage
 {
 
 private:
+    static const sal_uInt16 pNameRanges[];
     VclContainer*       m_pWestFrame;
     FixedText*          m_pWestFontNameFT;
     FontNameBox*        m_pWestFontNameLB;
@@ -153,7 +154,7 @@ public:
                         virtual ~SvxCharNamePage();
 
     static SfxTabPage*  Create( vcl::Window* pParent, const SfxItemSet* rSet );
-    static const sal_uInt16*      GetRanges();
+    static const sal_uInt16* GetRanges() { return pNameRanges; }
 
     virtual void        Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
     virtual bool        FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
@@ -174,6 +175,7 @@ class SvxCharEffectsPage : public SvxCharBasePage
 {
 
 private:
+    static const sal_uInt16 pEffectsRanges[];
     FixedText*          m_pFontColorFT;
     ColorListBox*       m_pFontColorLB;
 
@@ -232,7 +234,7 @@ public:
 
 public:
     static SfxTabPage*  Create( vcl::Window* pParent, const SfxItemSet* rSet );
-    static const sal_uInt16*      GetRanges();
+    static const sal_uInt16* GetRanges() { return pEffectsRanges; }
 
     virtual void        Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
     virtual bool        FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
@@ -246,8 +248,10 @@ public:
 
 // class SvxCharPositionPage ---------------------------------------------
 
+
 class SvxCharPositionPage : public SvxCharBasePage
 {
+    static const sal_uInt16 pPositionRanges[];
 
 private:
     RadioButton*        m_pHighPosBtn;
@@ -311,7 +315,7 @@ public:
 
 public:
     static SfxTabPage*  Create( vcl::Window* pParent, const SfxItemSet* rSet );
-    static const sal_uInt16*      GetRanges();
+    static const sal_uInt16*      GetRanges() { return pPositionRanges; }
 
     virtual void        Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
     virtual bool        FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
@@ -326,6 +330,7 @@ public:
 class SvxCharTwoLinesPage : public SvxCharBasePage
 {
 private:
+    static const sal_uInt16 pTwoLinesRanges[];
     CheckBox*           m_pTwoLinesBtn;
     VclContainer*       m_pEnclosingFrame;
     ListBox*            m_pStartBracketLB;
@@ -354,7 +359,7 @@ public:
 
 public:
     static SfxTabPage*  Create( vcl::Window* pParent, const SfxItemSet* rSet );
-    static const sal_uInt16*      GetRanges();
+    static const sal_uInt16*  GetRanges() { return pTwoLinesRanges; }
 
     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 e66fcd65f9f2..a85dabdb8a5f 100644
--- a/cui/source/inc/connect.hxx
+++ b/cui/source/inc/connect.hxx
@@ -33,6 +33,7 @@ class SdrView;
 class SvxConnectionPage : public SfxTabPage
 {
 private:
+    static const sal_uInt16 pRanges[];
     ListBox*             m_pLbType;
 
     FixedText*           m_pFtLine1;
@@ -64,7 +65,7 @@ public:
     virtual ~SvxConnectionPage();
 
     static SfxTabPage*  Create( vcl::Window*, const SfxItemSet* );
-    static  const sal_uInt16*     GetRanges();
+    static const sal_uInt16* GetRanges() { return pRanges; }
 
     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 8c9bfc0d6457..5d8c23db8332 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -107,6 +107,7 @@ class SvxTransparenceTabPage : public SvxTabPage
 {
     using TabPage::ActivatePage;
     using TabPage::DeactivatePage;
+    static const sal_uInt16 pTransparenceRanges[];
 
     const SfxItemSet&   rOutAttrs;
     RECT_POINT          eRP;
@@ -160,10 +161,9 @@ class SvxTransparenceTabPage : public SvxTabPage
 
 public:
     SvxTransparenceTabPage(vcl::Window* pParent, const SfxItemSet& rInAttrs);
-    void Construct();
 
     static SfxTabPage* Create(vcl::Window*, const SfxItemSet*);
-    static const sal_uInt16* GetRanges();
+    static const sal_uInt16* GetRanges() { return pTransparenceRanges; }
 
     virtual bool FillItemSet(SfxItemSet*) SAL_OVERRIDE;
     virtual void Reset(const SfxItemSet*) SAL_OVERRIDE;
@@ -182,7 +182,7 @@ class SvxAreaTabPage : public SvxTabPage
 {
     using TabPage::ActivatePage;
     using TabPage::DeactivatePage;
-
+    static const sal_uInt16 pAreaRanges[];
 private:
     ListBox*            m_pTypeLB;
 
@@ -293,7 +293,7 @@ public:
     void    Construct();
 
     static  SfxTabPage* Create( vcl::Window*, const SfxItemSet* );
-    static  const sal_uInt16*     GetRanges();
+    static const sal_uInt16* GetRanges() { return pAreaRanges; }
 
     virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
     virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE;
@@ -324,6 +324,7 @@ class SvxShadowTabPage : public SvxTabPage
 {
     using TabPage::ActivatePage;
     using TabPage::DeactivatePage;
+    static const sal_uInt16 pShadowRanges[];
 
 private:
     TriStateBox*        m_pTsbShowShadow;
@@ -358,7 +359,7 @@ public:
 
     void    Construct();
     static  SfxTabPage* Create( vcl::Window*, const SfxItemSet* );
-    static  const sal_uInt16*     GetRanges();
+    static const sal_uInt16* GetRanges() { return pShadowRanges; }
 
     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 bc4fffcd48bf..5db33305c9c8 100644
--- a/cui/source/inc/cuitabline.hxx
+++ b/cui/source/inc/cuitabline.hxx
@@ -90,6 +90,7 @@ class SvxLineTabPage : public SvxTabPage
 {
     using TabPage::ActivatePage;
     using TabPage::DeactivatePage;
+    static const sal_uInt16 pLineRanges[];
 private:
     VclBox*             m_pBoxColor;
     LineLB*             m_pLbLineStyle;
@@ -208,7 +209,7 @@ public:
     void    Construct();
 
     static  SfxTabPage* Create( vcl::Window*, const SfxItemSet* );
-    static  const sal_uInt16*    GetRanges();
+    static const sal_uInt16* GetRanges() { return pLineRanges; }
 
     virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
     virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE;
diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx
index 0c89da130c03..06d42ce6c2f0 100644
--- a/cui/source/inc/iconcdlg.hxx
+++ b/cui/source/inc/iconcdlg.hxx
@@ -112,8 +112,6 @@ public :
     virtual int         DeactivatePage( SfxItemSet* pSet = 0 );
     void                SetUserData(const OUString& rString)  { aUserString = rString; }
     OUString            GetUserData() { return aUserString; }
-    void                FillUserData();
-    bool                IsReadOnly() const;
     virtual bool        QueryClose();
 
     void                StateChanged( StateChangedType nType ) SAL_OVERRIDE;
diff --git a/cui/source/inc/labdlg.hxx b/cui/source/inc/labdlg.hxx
index 743ba930f0eb..446499f28887 100644
--- a/cui/source/inc/labdlg.hxx
+++ b/cui/source/inc/labdlg.hxx
@@ -33,6 +33,7 @@ const sal_uInt16 CAPTYPE_BITMAPS_COUNT = 3;
 class SvxCaptionTabPage : public SfxTabPage
 {
 private:
+    static const sal_uInt16 pCaptionRanges[];
     ValueSet*       m_pCT_CAPTTYPE;
     MetricField*    m_pMF_ABSTAND;
     ListBox*        m_pLB_ANSATZ;
@@ -76,7 +77,7 @@ public:
     SvxCaptionTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs  );
 
     static SfxTabPage*  Create( vcl::Window*, const SfxItemSet* );
-    static const sal_uInt16*      GetRanges();
+    static const sal_uInt16*  GetRanges() { return pCaptionRanges; }
 
     virtual bool        FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
     virtual void        Reset( const SfxItemSet * ) SAL_OVERRIDE;
diff --git a/cui/source/inc/measure.hxx b/cui/source/inc/measure.hxx
index a42ea5e7c4e4..aadc276d3641 100644
--- a/cui/source/inc/measure.hxx
+++ b/cui/source/inc/measure.hxx
@@ -31,6 +31,7 @@ class SdrView;
 class SvxMeasurePage : public SvxTabPage
 {
 private:
+    static const sal_uInt16 pRanges[];
 
     MetricField*         m_pMtrFldLineDist;
     MetricField*         m_pMtrFldHelplineOverhang;
@@ -68,7 +69,7 @@ public:
     virtual ~SvxMeasurePage();
 
     static SfxTabPage*  Create( vcl::Window*, const SfxItemSet* );
-    static  const sal_uInt16*     GetRanges();
+    static const sal_uInt16* GetRanges() { return pRanges; }
 
     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 0bbec43c9fe4..e86667080114 100644
--- a/cui/source/inc/numfmt.hxx
+++ b/cui/source/inc/numfmt.hxx
@@ -66,13 +66,15 @@ public:
 class SvxNumberFormatTabPage : public SfxTabPage
 {
     using SfxTabPage::DeactivatePage;
+    static const sal_uInt16 pRanges[];
 
 public:
     virtual ~SvxNumberFormatTabPage();
 
     static SfxTabPage*      Create( vcl::Window* pParent,
                                     const SfxItemSet* rAttrSet );
-    static const sal_uInt16*      GetRanges();
+    // Returns area information.
+    static const sal_uInt16* GetRanges() { return pRanges; }
 
     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 2009188c0ea3..fac3304b3794 100644
--- a/cui/source/inc/page.hxx
+++ b/cui/source/inc/page.hxx
@@ -72,6 +72,7 @@ class SvxPageDescPage : public SfxTabPage
     using TabPage::ActivatePage;
     using TabPage::DeactivatePage;
 
+    static const sal_uInt16 pRanges[];
 private:
     // paper format
     ListBox*             m_pPaperSizeBox;
@@ -188,7 +189,8 @@ protected:
 
 public:
     static SfxTabPage*  Create( vcl::Window* pParent, const SfxItemSet* rSet );
-    static const sal_uInt16*      GetRanges();
+    // returns the range of the Which values
+    static const sal_uInt16* GetRanges() { return pRanges; }
 
     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 4209e04339a6..461f56a0a49c 100644
--- a/cui/source/inc/paragrph.hxx
+++ b/cui/source/inc/paragrph.hxx
@@ -46,6 +46,7 @@ class SvxLineSpacingItem;
 class SvxStdParagraphTabPage: public SfxTabPage
 {
     using TabPage::DeactivatePage;
+    static const sal_uInt16 pStdRanges[];
 
 private:
     SvxStdParagraphTabPage( vcl::Window* pParent, const SfxItemSet& rSet );
@@ -100,7 +101,7 @@ public:
     DECL_LINK(ELRLoseFocusHdl, void *);
 
     static SfxTabPage*      Create( vcl::Window* pParent, const SfxItemSet* rSet );
-    static const sal_uInt16*      GetRanges();
+    static const sal_uInt16* GetRanges() { return pStdRanges; }
 
     virtual bool            FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
     virtual void            Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
@@ -123,6 +124,7 @@ public:
 class SvxParaAlignTabPage : public SfxTabPage
 {
     using TabPage::DeactivatePage;
+    static const sal_uInt16 pAlignRanges[];
 
     // alignment
     RadioButton*             m_pLeft;
@@ -161,7 +163,7 @@ protected:
 
 public:
     static SfxTabPage*      Create( vcl::Window* pParent, const SfxItemSet* rSet );
-    static const sal_uInt16*      GetRanges();
+    static const sal_uInt16* GetRanges() { return pAlignRanges; }
 
     virtual bool            FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
     virtual void            Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
@@ -187,13 +189,14 @@ public:
 class SvxExtParagraphTabPage: public SfxTabPage
 {
     using TabPage::DeactivatePage;
+    static const sal_uInt16 pExtRanges[];
 
 public:
     virtual             ~SvxExtParagraphTabPage();
 
     static SfxTabPage*  Create( vcl::Window* pParent,
                                 const SfxItemSet* rSet );
-    static const sal_uInt16*      GetRanges();
+    static const sal_uInt16* GetRanges() { return pExtRanges; }
 
     virtual bool        FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
     virtual void        Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx
index ef0cea679595..8778123ed582 100644
--- a/cui/source/inc/scriptdlg.hxx
+++ b/cui/source/inc/scriptdlg.hxx
@@ -72,21 +72,18 @@ protected:
     virtual bool            ExpandingHdl() SAL_OVERRIDE;
 public:
     void                    Init( const OUString& language );
-    void  RequestSubEntries(  SvTreeListEntry* pRootEntry, ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >& node,
-                              ::com::sun::star::uno::Reference< com::sun::star::frame::XModel>& model  );
-                    SFTreeListBox(vcl::Window* pParent);
+    void                    RequestSubEntries(  SvTreeListEntry* pRootEntry,
+                                ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >& node,
+                                ::com::sun::star::uno::Reference< com::sun::star::frame::XModel>& model  );
+                            SFTreeListBox(vcl::Window* pParent);
                     virtual ~SFTreeListBox();
 
-    void            ExpandAllTrees();
-
-
-
-    SvTreeListEntry * insertEntry(OUString const & rText, sal_uInt16 nBitmap,
+    SvTreeListEntry *       insertEntry(OUString const & rText, sal_uInt16 nBitmap,
                               SvTreeListEntry * pParent,
                               bool bChildrenOnDemand,
                               std::unique_ptr< SFEntry > && aUserData,
                               const OUString& factoryURL );
-    SvTreeListEntry * insertEntry(OUString const & rText, sal_uInt16 nBitmap,
+    SvTreeListEntry *       insertEntry(OUString const & rText, sal_uInt16 nBitmap,
                               SvTreeListEntry * pParent,
                               bool bChildrenOnDemand,
                               std::unique_ptr< SFEntry > && aUserData );
diff --git a/cui/source/inc/tabstpge.hxx b/cui/source/inc/tabstpge.hxx
index c5bf5475bdf8..0bc84e35525c 100644
--- a/cui/source/inc/tabstpge.hxx
+++ b/cui/source/inc/tabstpge.hxx
@@ -46,12 +46,13 @@ class TabWin_Impl;
 class SvxTabulatorTabPage : public SfxTabPage
 {
     using TabPage::DeactivatePage;
+    static const sal_uInt16 pRanges[];
 
 public:
     virtual ~SvxTabulatorTabPage();
 
     static SfxTabPage*  Create( vcl::Window* pParent, const SfxItemSet* rSet );
-    static const sal_uInt16*      GetRanges();
+    static const sal_uInt16* GetRanges() { return pRanges; }
 
     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 2981c4ae8005..2f1031d3d572 100644
--- a/cui/source/inc/textanim.hxx
+++ b/cui/source/inc/textanim.hxx
@@ -37,6 +37,7 @@ class SdrView;
 class SvxTextAnimationPage : public SfxTabPage
 {
 private:
+    static const sal_uInt16 pRanges[];
     ListBox*             m_pLbEffect;
     VclBox*              m_pBoxDirection;
     PushButton*          m_pBtnUp;
@@ -77,7 +78,7 @@ public:
     virtual ~SvxTextAnimationPage();
 
     static SfxTabPage*  Create( vcl::Window*, const SfxItemSet* );
-    static  const sal_uInt16*     GetRanges();
+    static const sal_uInt16* GetRanges() { return pRanges; }
 
     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 4f67dbfb902f..234d14094f9c 100644
--- a/cui/source/inc/textattr.hxx
+++ b/cui/source/inc/textattr.hxx
@@ -37,6 +37,7 @@ class SdrView;
 class SvxTextAttrPage : public SvxTabPage
 {
 private:
+    static const sal_uInt16 pRanges[];
     TriStateBox*         m_pTsbAutoGrowWidth;
     TriStateBox*         m_pTsbAutoGrowHeight;
     TriStateBox*         m_pTsbFitToSize;
@@ -78,7 +79,7 @@ public:
     virtual ~SvxTextAttrPage();
 
     static SfxTabPage*  Create( vcl::Window*, const SfxItemSet* );
-    static  const sal_uInt16*     GetRanges();
+    static const sal_uInt16*  GetRanges() { return pRanges; }
 
     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 f4f692593fe1..5272a41bbb5a 100644
--- a/cui/source/inc/transfrm.hxx
+++ b/cui/source/inc/transfrm.hxx
@@ -78,6 +78,7 @@ class SvxPositionSizeTabPage : public SvxTabPage
 {
     using TabPage::ActivatePage;
     using TabPage::DeactivatePage;
+    static const sal_uInt16 pPosSizeRanges[];
 
 private:
     // position
@@ -148,7 +149,7 @@ public:
     SvxPositionSizeTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs  );
 
     static SfxTabPage* Create( vcl::Window*, const SfxItemSet* );
-    static const sal_uInt16*     GetRanges();
+    static const sal_uInt16* GetRanges() {  return pPosSizeRanges; }
 
     virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
     virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE;
@@ -178,6 +179,7 @@ class SvxAngleTabPage : public SvxTabPage
 {
     using TabPage::ActivatePage;
     using TabPage::DeactivatePage;
+    static const sal_uInt16 pAngleRanges[];
 
 private:
     VclFrame*            m_pFlPosition;
@@ -203,7 +205,7 @@ public:
          SvxAngleTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs  );
 
     static SfxTabPage* Create( vcl::Window*, const SfxItemSet* );
-    static const sal_uInt16*     GetRanges();
+    static const sal_uInt16*  GetRanges() { return pAngleRanges; }
 
     virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
     virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE;
@@ -226,6 +228,7 @@ class SvxSlantTabPage : public SvxTabPage
 {
     using TabPage::ActivatePage;
     using TabPage::DeactivatePage;
+    static const sal_uInt16 pSlantRanges[];
 
 private:
     VclFrame*            m_pFlRadius;
@@ -247,7 +250,7 @@ public:
          SvxSlantTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs  );
 
     static SfxTabPage* Create( vcl::Window*, const SfxItemSet* );
-    static const sal_uInt16*     GetRanges();
+    static const sal_uInt16* GetRanges() {  return pSlantRanges; }
 
     virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
     virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE;
diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx
index 56cdabbf2cb4..22b50889df06 100644
--- a/cui/source/tabpages/align.cxx
+++ b/cui/source/tabpages/align.cxx
@@ -92,7 +92,7 @@ static const RotateModeConnection::MapEntryType s_pRotateModeMap[] =
 
 
 
-static const sal_uInt16 s_pRanges[] =
+const sal_uInt16 AlignmentTabPage::s_pRanges[] =
 {
     SID_ATTR_ALIGN_HOR_JUSTIFY,SID_ATTR_ALIGN_VER_JUSTIFY,
     SID_ATTR_ALIGN_STACKED,SID_ATTR_ALIGN_LINEBREAK,
@@ -258,11 +258,6 @@ SfxTabPage* AlignmentTabPage::Create( vcl::Window* pParent, const SfxItemSet* rA
     return new AlignmentTabPage( pParent, *rAttrSet );
 }
 
-const sal_uInt16* AlignmentTabPage::GetRanges()
-{
-    return s_pRanges;
-}
-
 bool AlignmentTabPage::FillItemSet( SfxItemSet* rSet )
 {
     bool bChanged = SfxTabPage::FillItemSet(rSet);
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index bf58de0fc544..95a820f46f24 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -61,7 +61,7 @@
 using namespace ::com::sun::star;
 // static ----------------------------------------------------------------
 
-static const sal_uInt16 pRanges[] =
+const sal_uInt16 SvxBackgroundTabPage::pPageRanges[] =
 {
     SID_VIEW_FLD_PIC, SID_VIEW_FLD_PIC,
     SID_ATTR_BRUSH, SID_ATTR_BRUSH,
@@ -444,19 +444,6 @@ SvxBackgroundTabPage::~SvxBackgroundTabPage()
 
 
 
-const sal_uInt16* SvxBackgroundTabPage::GetRanges()
-
-/*  [Description]
-
-    returns the area of the which-values
-*/
-
-{
-    return pRanges;
-}
-
-
-
 SfxTabPage* SvxBackgroundTabPage::Create( vcl::Window* pParent,
                                           const SfxItemSet* rAttrSet )
 
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index ea67be5d6224..ded93e372540 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -66,7 +66,7 @@ using namespace ::editeng;
 
 // static ----------------------------------------------------------------
 
-static const sal_uInt16 pRanges[] =
+const sal_uInt16 SvxBorderTabPage::pRanges[] =
 {
     SID_ATTR_BORDER_INNER,      SID_ATTR_BORDER_SHADOW,
     SID_ATTR_ALIGN_MARGIN,      SID_ATTR_ALIGN_MARGIN,
@@ -342,13 +342,6 @@ SvxBorderTabPage::~SvxBorderTabPage()
 
 
 
-const sal_uInt16* SvxBorderTabPage::GetRanges()
-{
-    return pRanges;
-}
-
-
-
 SfxTabPage* SvxBorderTabPage::Create( vcl::Window* pParent,
                                       const SfxItemSet* rAttrSet )
 {
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index fa7e31f7ebf2..c9a0f7cfcbc5 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -87,7 +87,7 @@ using namespace ::com::sun::star;
 
 // static ----------------------------------------------------------------
 
-static const sal_uInt16 pNameRanges[] =
+const sal_uInt16 SvxCharNamePage::pNameRanges[] =
 {
     SID_ATTR_CHAR_FONT,
     SID_ATTR_CHAR_WEIGHT,
@@ -104,7 +104,7 @@ static const sal_uInt16 pNameRanges[] =
     0
 };
 
-static const sal_uInt16 pEffectsRanges[] =
+const sal_uInt16 SvxCharEffectsPage::pEffectsRanges[] =
 {
     SID_ATTR_CHAR_SHADOWED,
     SID_ATTR_CHAR_UNDERLINE,
@@ -125,7 +125,7 @@ static const sal_uInt16 pEffectsRanges[] =
     0
 };
 
-static const sal_uInt16 pPositionRanges[] =
+const sal_uInt16 SvxCharPositionPage::pPositionRanges[] =
 {
     SID_ATTR_CHAR_KERNING,
     SID_ATTR_CHAR_KERNING,
@@ -140,7 +140,7 @@ static const sal_uInt16 pPositionRanges[] =
     0
 };
 
-static const sal_uInt16 pTwoLinesRanges[] =
+const sal_uInt16 SvxCharTwoLinesPage::pTwoLinesRanges[] =
 {
     SID_ATTR_CHAR_TWO_LINES,
     SID_ATTR_CHAR_TWO_LINES,
@@ -1187,13 +1187,6 @@ SfxTabPage* SvxCharNamePage::Create( vcl::Window* pParent, const SfxItemSet* rSe
 
 
 
-const sal_uInt16* SvxCharNamePage::GetRanges()
-{
-    return pNameRanges;
-}
-
-
-
 void SvxCharNamePage::Reset( const SfxItemSet* rSet )
 {
     Reset_Impl( *rSet, Western );
@@ -1734,13 +1727,6 @@ SfxTabPage* SvxCharEffectsPage::Create( vcl::Window* pParent, const SfxItemSet*
 
 
 
-const sal_uInt16* SvxCharEffectsPage::GetRanges()
-{
-    return pEffectsRanges;
-}
-
-
-
 void SvxCharEffectsPage::Reset( const SfxItemSet* rSet )
 {
     SvxFont& rFont = GetPreviewFont();
@@ -2908,12 +2894,6 @@ SfxTabPage* SvxCharPositionPage::Create( vcl::Window* pParent, const SfxItemSet*
 
 
 
-const sal_uInt16* SvxCharPositionPage::GetRanges()
-{
-    return pPositionRanges;
-}
-
-
 void SvxCharPositionPage::Reset( const SfxItemSet* rSet )
 {
     OUString sUser = GetUserData();
@@ -3476,15 +3456,6 @@ SfxTabPage* SvxCharTwoLinesPage::Create( vcl::Window* pParent, const SfxItemSet*
     return new SvxCharTwoLinesPage( pParent, *rSet );
 }
 
-
-
-const sal_uInt16* SvxCharTwoLinesPage::GetRanges()
-{
-    return pTwoLinesRanges;
-}
-
-
-
 void SvxCharTwoLinesPage::Reset( const SfxItemSet* rSet )
 {
     m_pTwoLinesBtn->Check( false );
diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx
index 439737e2f295..6b49e2aa0e83 100644
--- a/cui/source/tabpages/connect.cxx
+++ b/cui/source/tabpages/connect.cxx
@@ -37,7 +37,7 @@
 #include "connect.hxx"
 #include "paragrph.hrc"
 
-static const sal_uInt16 pRanges[] =
+const sal_uInt16 SvxConnectionPage::pRanges[] =
 {
     SDRATTR_EDGE_FIRST,
     SDRATTR_EDGE_LAST,
@@ -394,11 +394,6 @@ SfxTabPage* SvxConnectionPage::Create( vcl::Window* pWindow,
     return new SvxConnectionPage( pWindow, *rAttrs );
 }
 
-const sal_uInt16* SvxConnectionPage::GetRanges()
-{
-    return pRanges;
-}
-
 IMPL_LINK( SvxConnectionPage, ChangeAttrHdl_Impl, void *, p )
 {
     if( p == m_pMtrFldHorz1 )
diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx
index b9b02ebc29e1..243d9dcf038d 100644
--- a/cui/source/tabpages/labdlg.cxx
+++ b/cui/source/tabpages/labdlg.cxx
@@ -55,7 +55,7 @@
 
 // static ----------------------------------------------------------------
 
-static const sal_uInt16 pCaptionRanges[] =
+const sal_uInt16 SvxCaptionTabPage::pCaptionRanges[] =
 {
     SDRATTR_CAPTIONTYPE,
     SDRATTR_CAPTIONFIXEDANGLE,
@@ -344,13 +344,6 @@ SfxTabPage* SvxCaptionTabPage::Create( vcl::Window* pWindow,
 
 
 
-const sal_uInt16* SvxCaptionTabPage::GetRanges()
-{
-    return pCaptionRanges;
-}
-
-
-
 void SvxCaptionTabPage::SetupAnsatz_Impl( sal_uInt16 nType )
 {
     switch( nType )
diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx
index 380d49c5c8d9..64d38b7e4ddf 100644
--- a/cui/source/tabpages/macroass.cxx
+++ b/cui/source/tabpages/macroass.cxx
@@ -289,8 +289,6 @@ IMPL_STATIC_LINK( _SfxMacroTabPage, SelectGroup_Impl, ListBox*, EMPTYARG )
 
 IMPL_STATIC_LINK( _SfxMacroTabPage, SelectMacro_Impl, ListBox*, EMPTYARG )
 {
-    _SfxMacroTabPage_Impl*  pImpl = pThis->mpImpl;
-    pImpl->pMacroLB->FunctionSelected();
     pThis->EnableButtons();
     return 0;
 }
diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx
index eace738617a1..ea086be40fb3 100644
--- a/cui/source/tabpages/measure.cxx
+++ b/cui/source/tabpages/measure.cxx
@@ -47,7 +47,7 @@
 
 #include "measure.hxx"
 
-static const sal_uInt16 pRanges[] =
+const sal_uInt16 SvxMeasurePage::pRanges[] =
 {
     SDRATTR_MEASURE_FIRST,
     SDRATTR_MEASURE_LAST,
@@ -599,11 +599,6 @@ SfxTabPage* SvxMeasurePage::Create( vcl::Window* pWindow,
     return new SvxMeasurePage( pWindow, *rAttrs );
 }
 
-const sal_uInt16* SvxMeasurePage::GetRanges()
-{
-    return pRanges;
-}
-
 void SvxMeasurePage::PointChanged( vcl::Window* pWindow, RECT_POINT /*eRP*/ )
 {
     ChangeAttrHdl_Impl( pWindow );
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index 97157ba57c8a..8fdcb7e33190 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -52,7 +52,7 @@ using ::com::sun::star::uno::UNO_QUERY;
 
 // static ----------------------------------------------------------------
 
-static const sal_uInt16 pRanges[] =
+const sal_uInt16 SvxNumberFormatTabPage::pRanges[] =
 {
     SID_ATTR_NUMBERFORMAT_VALUE,
     SID_ATTR_NUMBERFORMAT_INFO,
@@ -348,23 +348,6 @@ void SvxNumberFormatTabPage::Init_Impl()
 }
 
 /*************************************************************************
-#*  Method:        GetRanges
-#*------------------------------------------------------------------------
-#*
-#*  Class:      SvxNumberFormatTabPage
-#*  Function:   Returns area information.
-#*  Input:      ---
-#*  Output:     area
-#*
-#************************************************************************/
-
-const sal_uInt16* SvxNumberFormatTabPage::GetRanges()
-{
-    return pRanges;
-}
-
-
-/*************************************************************************
 #*  Method:        Create
 #*------------------------------------------------------------------------
 #*
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index d321103297d0..5d6c92c7236a 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -69,7 +69,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 const sal_uInt16 pRanges[] =
+const sal_uInt16 SvxPageDescPage::pRanges[] =
 {
     SID_ATTR_BORDER_OUTER,
     SID_ATTR_BORDER_SHADOW,
@@ -164,14 +164,6 @@ bool IsEqualSize_Impl( const SvxSizeItem* pSize, const Size& rSize )
 
 // class SvxPageDescPage --------------------------------------------------
 
-// returns the range of the Which values
-const sal_uInt16* SvxPageDescPage::GetRanges()
-{
-    return pRanges;
-}
-
-
-
 SfxTabPage* SvxPageDescPage::Create( vcl::Window* pParent, const SfxItemSet* rSet )
 {
     return new SvxPageDescPage( pParent, *rSet );
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index 09a389475aa0..7d1e2792d614 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -53,7 +53,7 @@
 #include <svl/intitem.hxx>
 #include <boost/scoped_ptr.hpp>
 
-static const sal_uInt16 pStdRanges[] =
+const sal_uInt16 SvxStdParagraphTabPage::pStdRanges[] =
 {
     SID_ATTR_PARA_LINESPACE,        // 10033
     SID_ATTR_PARA_LINESPACE,
@@ -64,14 +64,14 @@ static const sal_uInt16 pStdRanges[] =
     0
 };
 
-static const sal_uInt16 pAlignRanges[] =
+const sal_uInt16 SvxParaAlignTabPage::pAlignRanges[] =
 {
     SID_ATTR_PARA_ADJUST,           // 10027
     SID_ATTR_PARA_ADJUST,
     0
 };
 
-static const sal_uInt16 pExtRanges[] =
+const sal_uInt16 SvxExtParagraphTabPage::pExtRanges[] =
 {
     SID_ATTR_PARA_PAGEBREAK,        // 10037 -
     SID_ATTR_PARA_WIDOWS,           // 10041
@@ -667,11 +667,6 @@ void SvxStdParagraphTabPage::EnableNegativeMode()
     bNegativeIndents = true;
 }
 
-const sal_uInt16* SvxStdParagraphTabPage::GetRanges()
-{
-    return pStdRanges;
-}
-
 void SvxStdParagraphTabPage::SetLineSpacing_Impl
 (
     const SvxLineSpacingItem &rAttr
@@ -1037,11 +1032,6 @@ SfxTabPage* SvxParaAlignTabPage::Create( vcl::Window* pParent, const SfxItemSet*
     return new SvxParaAlignTabPage(pParent, *rSet);
 }
 
-const sal_uInt16* SvxParaAlignTabPage::GetRanges()
-{
-    return pAlignRanges;
-}
-
 bool SvxParaAlignTabPage::FillItemSet( SfxItemSet* rOutSet )
 {
     bool bModified = false;
@@ -1913,11 +1903,6 @@ SvxExtParagraphTabPage::~SvxExtParagraphTabPage()
 {
 }
 
-const sal_uInt16* SvxExtParagraphTabPage::GetRanges()
-{
-    return pExtRanges;
-}
-
 IMPL_LINK_NOARG(SvxExtParagraphTabPage, PageBreakHdl_Impl)
 {
     switch ( m_pPageBreakBox->GetState() )
diff --git a/cui/source/tabpages/tabarea.cxx b/cui/source/tabpages/tabarea.cxx
index cef9253bd9de..d856f6b91fc0 100644
--- a/cui/source/tabpages/tabarea.cxx
+++ b/cui/source/tabpages/tabarea.cxx
@@ -310,7 +310,6 @@ void SvxAreaTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
     {
             static_cast<SvxTransparenceTabPage&>(rPage).SetPageType( mnPageType );
             static_cast<SvxTransparenceTabPage&>(rPage).SetDlgType( 0 );
-            static_cast<SvxTransparenceTabPage&>(rPage).Construct();
     }
 }
 
diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx
index f5db32bb15b4..7772da14c25d 100644
--- a/cui/source/tabpages/tabstpge.cxx
+++ b/cui/source/tabpages/tabstpge.cxx
@@ -63,7 +63,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeTabWin_Impl(vcl::Windo
 }
 // static ----------------------------------------------------------------
 
-static const sal_uInt16 pRanges[] =
+const sal_uInt16 SvxTabulatorTabPage::pRanges[] =
 {
     SID_ATTR_TABSTOP,
     SID_ATTR_TABSTOP_OFFSET,
@@ -193,13 +193,6 @@ SvxTabulatorTabPage::~SvxTabulatorTabPage()
 
 
 
-const sal_uInt16* SvxTabulatorTabPage::GetRanges()
-{
-    return pRanges;
-}
-
-
-
 bool SvxTabulatorTabPage::FillItemSet( SfxItemSet* rSet )
 {
     bool bModified = false;
diff --git a/cui/source/tabpages/textanim.cxx b/cui/source/tabpages/textanim.cxx
index 1df37c42d6cc..72626e953100 100644
--- a/cui/source/tabpages/textanim.cxx
+++ b/cui/source/tabpages/textanim.cxx
@@ -28,7 +28,7 @@
 #include <dialmgr.hxx>
 #include "svx/dlgutil.hxx"
 
-static const sal_uInt16 pRanges[] =
+const sal_uInt16 SvxTextAnimationPage::pRanges[] =
 {
     SDRATTR_TEXT_ANIKIND,
     SDRATTR_TEXT_ANIAMOUNT,
@@ -439,11 +439,6 @@ bool SvxTextAnimationPage::FillItemSet( SfxItemSet* rAttrs)
     return bModified;
 }
 
-const sal_uInt16* SvxTextAnimationPage::GetRanges()
-{
-    return pRanges;
-}
-
 /*************************************************************************
 |*
 |* creates the page
diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx
index 3237928499eb..eae53cb16219 100644
--- a/cui/source/tabpages/textattr.cxx
+++ b/cui/source/tabpages/textattr.cxx
@@ -39,7 +39,7 @@
 #include <svx/ofaitem.hxx>
 #include <editeng/writingmodeitem.hxx>
 
-static const sal_uInt16 pRanges[] =
+const sal_uInt16 SvxTextAttrPage::pRanges[] =
 {
       SDRATTR_MISC_FIRST
     , SDRATTR_TEXT_HORZADJUST
@@ -526,11 +526,6 @@ SfxTabPage* SvxTextAttrPage::Create( vcl::Window* pWindow,
     return new SvxTextAttrPage( pWindow, *rAttrs );
 }
 
-const sal_uInt16* SvxTextAttrPage::GetRanges()
-{
-    return pRanges;
-}
-
 /** Check whether we have to uncheck the "Full width" check box.
 */
 void SvxTextAttrPage::PointChanged( vcl::Window*, RECT_POINT eRP )
diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index 1ff5a81bdca6..5d4abf6f58a0 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -49,7 +49,7 @@ using namespace com::sun::star;
 
 // static ----------------------------------------------------------------
 
-static const sal_uInt16 pAreaRanges[] =
+const sal_uInt16 SvxAreaTabPage::pAreaRanges[] =
 {
     XATTR_GRADIENTSTEPCOUNT,
     XATTR_GRADIENTSTEPCOUNT,
@@ -58,7 +58,7 @@ static const sal_uInt16 pAreaRanges[] =
     0
 };
 
-static const sal_uInt16 pTransparenceRanges[] =
+const sal_uInt16 SvxTransparenceTabPage::pTransparenceRanges[] =
 {
     XATTR_FILLTRANSPARENCE,
     XATTR_FILLTRANSPARENCE,
@@ -287,20 +287,11 @@ SvxTransparenceTabPage::SvxTransparenceTabPage(vcl::Window* pParent, const SfxIt
     SetExchangeSupport();
 }
 
-void SvxTransparenceTabPage::Construct()
-{
-}
-
 SfxTabPage* SvxTransparenceTabPage::Create(vcl::Window* pWindow, const SfxItemSet* rAttrs)
 {
     return new SvxTransparenceTabPage(pWindow, *rAttrs);
 }
 
-const sal_uInt16* SvxTransparenceTabPage::GetRanges()
-{
-    return pTransparenceRanges;
-}
-
 bool SvxTransparenceTabPage::FillItemSet(SfxItemSet* rAttrs)
 {
     const SfxPoolItem* pGradientItem = NULL;
@@ -573,8 +564,8 @@ void SvxTransparenceTabPage::PageCreated(const SfxAllItemSet& aSet)
         SetPageType(pPageTypeItem->GetValue());
     if (pDlgTypeItem)
         SetDlgType(pDlgTypeItem->GetValue());
-    Construct();
 }
+
 /*************************************************************************
 |*
 |*  Dialog to modify fill-attributes
@@ -1766,12 +1757,6 @@ SfxTabPage* SvxAreaTabPage::Create( vcl::Window* pWindow,
 
 
 
-const sal_uInt16* SvxAreaTabPage::GetRanges()
-{
-    return pAreaRanges;
-}
-
-
 IMPL_LINK_NOARG(SvxAreaTabPage, SelectDialogTypeHdl_Impl)
 {
     switch( (drawing::FillStyle)m_pTypeLB->GetSelectEntryPos() )
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index baf14b5188ba..85a7cbe85a8b 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -66,7 +66,7 @@ using namespace com::sun::star;
 
 // static ----------------------------------------------------------------
 
-static const sal_uInt16 pLineRanges[] =
+const sal_uInt16 SvxLineTabPage::pLineRanges[] =
 {
     XATTR_LINETRANSPARENCE,
     XATTR_LINETRANSPARENCE,
@@ -1496,13 +1496,6 @@ SfxTabPage* SvxLineTabPage::Create( vcl::Window* pWindow,
 
 
 
-const sal_uInt16* SvxLineTabPage::GetRanges()
-{
-    return pLineRanges;
-}
-
-
-
 IMPL_LINK( SvxLineTabPage, ChangePreviewHdl_Impl, void *, pCntrl )
 {
     if(pCntrl == m_pMtrLineWidth)
diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx
index 3f09743cd55a..d57db3f22d9b 100644
--- a/cui/source/tabpages/tpshadow.cxx
+++ b/cui/source/tabpages/tpshadow.cxx
@@ -36,7 +36,7 @@
 
 using namespace com::sun::star;
 
-static const sal_uInt16 pShadowRanges[] =
+const sal_uInt16 SvxShadowTabPage::pShadowRanges[] =
 {
     SDRATTR_SHADOWCOLOR,
     SDRATTR_SHADOWTRANSPARENCE,
@@ -463,13 +463,6 @@ SfxTabPage* SvxShadowTabPage::Create( vcl::Window* pWindow,
 
 
 
-const sal_uInt16* SvxShadowTabPage::GetRanges()
-{
-    return pShadowRanges;
-}
-
-
-
 IMPL_LINK_NOARG(SvxShadowTabPage, ClickShadowHdl_Impl)
 {
     if( m_pTsbShowShadow->GetState() == TRISTATE_FALSE )
diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx
index b6792aef93f7..5de0107e010a 100644
--- a/cui/source/tabpages/transfrm.cxx
+++ b/cui/source/tabpages/transfrm.cxx
@@ -40,7 +40,7 @@
 
 // static ----------------------------------------------------------------
 
-static const sal_uInt16 pPosSizeRanges[] =
+const sal_uInt16 SvxPositionSizeTabPage::pPosSizeRanges[] =
 {
     SID_ATTR_TRANSFORM_POS_X,
     SID_ATTR_TRANSFORM_POS_Y,
@@ -59,7 +59,7 @@ static const sal_uInt16 pPosSizeRanges[] =
     0
 };
 
-static const sal_uInt16 pAngleRanges[] =
+const sal_uInt16 SvxAngleTabPage::pAngleRanges[] =
 {
     SID_ATTR_TRANSFORM_ROT_X,
     SID_ATTR_TRANSFORM_ANGLE,
@@ -68,7 +68,7 @@ static const sal_uInt16 pAngleRanges[] =
     0
 };
 
-static const sal_uInt16 pSlantRanges[] =
+const sal_uInt16 SvxSlantTabPage::pSlantRanges[] =
 {
     SDRATTR_ECKENRADIUS,
     SDRATTR_ECKENRADIUS,
@@ -320,13 +320,6 @@ SfxTabPage* SvxAngleTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rSe
 
 
 
-const sal_uInt16* SvxAngleTabPage::GetRanges()
-{
-    return pAngleRanges;
-}
-
-
-
 void SvxAngleTabPage::ActivatePage(const SfxItemSet& /*rSet*/)
 {
 }
@@ -554,13 +547,6 @@ SfxTabPage* SvxSlantTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rOu
 
 
 
-const sal_uInt16* SvxSlantTabPage::GetRanges()
-{
-    return pSlantRanges;
-}
-
-
-
 void SvxSlantTabPage::ActivatePage( const SfxItemSet& rSet )
 {
     SfxRectangleItem const * pRectItem = NULL;
@@ -993,13 +979,6 @@ SfxTabPage* SvxPositionSizeTabPage::Create( vcl::Window* pWindow, const SfxItemS
 
 
 
-const sal_uInt16* SvxPositionSizeTabPage::GetRanges()
-{
-    return pPosSizeRanges;
-}
-
-
-
 void SvxPositionSizeTabPage::ActivatePage( const SfxItemSet& rSet )
 {
     SfxRectangleItem const * pRectItem = NULL;