unwrap ifdefs with unused members

3 files changed, 6 insertions, 5 deletions

diff --git a/svx/inc/svx/grafctrl.hxx b/svx/inc/svx/grafctrl.hxx
index ee5ffa0c2b54..27816f282d7e 100644
--- a/svx/inc/svx/grafctrl.hxx
+++ b/svx/inc/svx/grafctrl.hxx
@@ -73,10 +73,10 @@ public:
 class SvxGrafToolBoxControl : public SfxToolBoxControl
 {
 public:
+    static SfxToolBoxControl* CreateImpl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox &rTbx );
 
-                        SFX_DECL_TOOLBOX_CONTROL();
-                        SvxGrafToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
-                        ~SvxGrafToolBoxControl();
+    SvxGrafToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
+    ~SvxGrafToolBoxControl();
 
     virtual void        StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
     virtual Window*     CreateItemWindow( Window *pParent );
diff --git a/svx/inc/svx/lboxctrl.hxx b/svx/inc/svx/lboxctrl.hxx
index 1e5058854bd0..ce6aa8c0fc22 100644
--- a/svx/inc/svx/lboxctrl.hxx
+++ b/svx/inc/svx/lboxctrl.hxx
@@ -51,7 +51,7 @@ protected:
     DECL_LINK( SelectHdl, void * );
 
 public:
-    SFX_DECL_TOOLBOX_CONTROL();
+    static SfxToolBoxControl* CreateImpl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox &rTbx );
 
     SvxListBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
     virtual ~SvxListBoxControl();
diff --git a/svx/inc/svx/tbcontrl.hxx b/svx/inc/svx/tbcontrl.hxx
index 32f218d15f17..e0f0bdd1a5a6 100644
--- a/svx/inc/svx/tbcontrl.hxx
+++ b/svx/inc/svx/tbcontrl.hxx
@@ -430,7 +430,8 @@ private:
     SvxReloadControllerItem_Impl* pImpl;
 
 public:
-    SFX_DECL_TOOLBOX_CONTROL();
+    static SfxToolBoxControl* CreateImpl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox &rTbx );
+
     SvxReloadControllerItem( sal_uInt16 nSlotId,
                              sal_uInt16 nId,
                              ToolBox& rTbx );