SfxToolBoxControl::GetPopupWindowType seems unused, kill it

together with SfxPopupWindowType enum.

Change-Id: Ia0b2388b34c96bb044f1bfcc7e89b33ac37d5f95
Reviewed-on: https://gerrit.libreoffice.org/16766
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>

38 files changed, 0 insertions, 185 deletions

diff --git a/basctl/source/basicide/tbxctl.cxx b/basctl/source/basicide/tbxctl.cxx
index 328ea08e3f27..8e193add4a82 100644
--- a/basctl/source/basicide/tbxctl.cxx
+++ b/basctl/source/basicide/tbxctl.cxx
@@ -55,18 +55,6 @@ TbxControls::TbxControls( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
     rTbx.Invalidate();
 }
 
-/*************************************************************************
-|*
-|* If you want to create a pop-up window
-|*
-\************************************************************************/
-SfxPopupWindowType TbxControls::GetPopupWindowType() const
-{
-    if( nLastSlot == USHRT_MAX )
-        return SfxPopupWindowType::ONCLICK;
-    return SfxPopupWindowType::ONTIMEOUT;
-}
-
 void TbxControls::StateChanged( sal_uInt16 nSID, SfxItemState eState,
   const SfxPoolItem* pState )
 {
diff --git a/basctl/source/basicide/tbxctl.hxx b/basctl/source/basicide/tbxctl.hxx
index d9152a07211b..2eabe8cc6101 100644
--- a/basctl/source/basicide/tbxctl.hxx
+++ b/basctl/source/basicide/tbxctl.hxx
@@ -45,7 +45,6 @@ public:
     TbxControls(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
     virtual ~TbxControls() {}
 
-    virtual SfxPopupWindowType  GetPopupWindowType() const SAL_OVERRIDE;
     virtual VclPtr<SfxPopupWindow> CreatePopupWindow() SAL_OVERRIDE;
 
     using                       SfxToolBoxControl::Select;
diff --git a/include/sfx2/tbxctrl.hxx b/include/sfx2/tbxctrl.hxx
index 11da16c4e0ff..4574fd1195f8 100644
--- a/include/sfx2/tbxctrl.hxx
+++ b/include/sfx2/tbxctrl.hxx
@@ -62,18 +62,6 @@ struct SfxTbxCtrlFactory
 
 
 
-enum class SfxPopupWindowType
-{
-    NONE,
-    ONCLICK,
-    ONTIMEOUT,
-    ONCLICKANDMOVE,
-    ONTIMEOUTANDMOVE,
-    CONTEXTMENU
-};
-
-
-
 class SfxFrameStatusListener : public svt::FrameStatusListener
 {
     public:
@@ -197,7 +185,6 @@ protected:
 
     virtual void               DoubleClick();
     virtual void               Click();
-    virtual SfxPopupWindowType GetPopupWindowType() const;
     virtual VclPtr<SfxPopupWindow> CreatePopupWindow();
     virtual VclPtr<vcl::Window> CreateItemWindow( vcl::Window *pParent );
 
diff --git a/include/svx/ParaLineSpacingPopup.hxx b/include/svx/ParaLineSpacingPopup.hxx
index 8b336a4334f6..d541dd850ff1 100644
--- a/include/svx/ParaLineSpacingPopup.hxx
+++ b/include/svx/ParaLineSpacingPopup.hxx
@@ -38,7 +38,6 @@ public:
     ParaLineSpacingPopup(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx);
     virtual ~ParaLineSpacingPopup();
 
-    virtual SfxPopupWindowType GetPopupWindowType() const SAL_OVERRIDE;
     virtual VclPtr<SfxPopupWindow> CreatePopupWindow() SAL_OVERRIDE;
 };
 
diff --git a/include/svx/clipboardctl.hxx b/include/svx/clipboardctl.hxx
index 6b00c35b14fd..eab92ee41f7a 100644
--- a/include/svx/clipboardctl.hxx
+++ b/include/svx/clipboardctl.hxx
@@ -44,7 +44,6 @@ public:
     SvxClipBoardControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
     virtual ~SvxClipBoardControl();
 
-    virtual SfxPopupWindowType  GetPopupWindowType() const SAL_OVERRIDE;
     virtual VclPtr<SfxPopupWindow> CreatePopupWindow() SAL_OVERRIDE;
     virtual void                StateChanged( sal_uInt16 nSID,
                                               SfxItemState eState,
diff --git a/include/svx/fontworkgallery.hxx b/include/svx/fontworkgallery.hxx
index dfae49d09336..4f4b16d78965 100644
--- a/include/svx/fontworkgallery.hxx
+++ b/include/svx/fontworkgallery.hxx
@@ -56,7 +56,6 @@ public:
     virtual ~FontWorkShapeTypeControl();
 
     virtual void                Select(sal_uInt16 nSelectModifier) SAL_OVERRIDE;
-    virtual SfxPopupWindowType  GetPopupWindowType() const SAL_OVERRIDE;
     virtual VclPtr<SfxPopupWindow> CreatePopupWindow() SAL_OVERRIDE;
 };
 
diff --git a/include/svx/grafctrl.hxx b/include/svx/grafctrl.hxx
index ba4124de41e1..c91ff3a0de65 100644
--- a/include/svx/grafctrl.hxx
+++ b/include/svx/grafctrl.hxx
@@ -53,7 +53,6 @@ public:
                                 virtual ~SvxGrafFilterToolBoxControl();
 
     virtual void                StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE;
-    virtual SfxPopupWindowType  GetPopupWindowType() const SAL_OVERRIDE;
     virtual VclPtr<SfxPopupWindow> CreatePopupWindow() SAL_OVERRIDE;
 };
 
diff --git a/include/svx/layctrl.hxx b/include/svx/layctrl.hxx
index ec626559b549..1854419da259 100644
--- a/include/svx/layctrl.hxx
+++ b/include/svx/layctrl.hxx
@@ -30,7 +30,6 @@ private:
     bool    bEnabled;
 
 public:
-    virtual SfxPopupWindowType  GetPopupWindowType() const SAL_OVERRIDE;
     virtual VclPtr<SfxPopupWindow> CreatePopupWindow() SAL_OVERRIDE;
     virtual void                StateChanged( sal_uInt16 nSID,
                                               SfxItemState eState,
@@ -48,7 +47,6 @@ class SVX_DLLPUBLIC SvxColumnsToolBoxControl : public SfxToolBoxControl
 {
     bool    bEnabled;
 public:
-    virtual SfxPopupWindowType  GetPopupWindowType() const SAL_OVERRIDE;
     virtual VclPtr<SfxPopupWindow> CreatePopupWindow() SAL_OVERRIDE;
 
     SFX_DECL_TOOLBOX_CONTROL();
diff --git a/include/svx/lboxctrl.hxx b/include/svx/lboxctrl.hxx
index fe3062d18a40..a782530c7a84 100644
--- a/include/svx/lboxctrl.hxx
+++ b/include/svx/lboxctrl.hxx
@@ -45,7 +45,6 @@ public:
     SvxListBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
     virtual ~SvxListBoxControl();
 
-    virtual SfxPopupWindowType  GetPopupWindowType() const SAL_OVERRIDE;
     virtual VclPtr<SfxPopupWindow> CreatePopupWindow() SAL_OVERRIDE;
     virtual void                StateChanged( sal_uInt16 nSID,
                                               SfxItemState eState,
diff --git a/include/svx/linectrl.hxx b/include/svx/linectrl.hxx
index a6576387bef5..f2d0da51e824 100644
--- a/include/svx/linectrl.hxx
+++ b/include/svx/linectrl.hxx
@@ -140,7 +140,6 @@ public:
 
     virtual void                StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                               const SfxPoolItem* pState ) SAL_OVERRIDE;
-    virtual SfxPopupWindowType  GetPopupWindowType() const SAL_OVERRIDE;
     virtual VclPtr<SfxPopupWindow> CreatePopupWindow() SAL_OVERRIDE;
 };
 
diff --git a/include/svx/subtoolboxcontrol.hxx b/include/svx/subtoolboxcontrol.hxx
index 7921a270f405..17555e1f72fb 100644
--- a/include/svx/subtoolboxcontrol.hxx
+++ b/include/svx/subtoolboxcontrol.hxx
@@ -35,7 +35,6 @@ public:
     SvxSubToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
     virtual ~SvxSubToolBoxControl();
 
-    virtual SfxPopupWindowType  GetPopupWindowType() const SAL_OVERRIDE;
     virtual VclPtr<SfxPopupWindow> CreatePopupWindow() SAL_OVERRIDE;
 };
 
diff --git a/include/svx/tbcontrl.hxx b/include/svx/tbcontrl.hxx
index 42c79454ee20..1759f568a290 100644
--- a/include/svx/tbcontrl.hxx
+++ b/include/svx/tbcontrl.hxx
@@ -241,7 +241,6 @@ public:
 
     virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState,
                               const SfxPoolItem* pState) SAL_OVERRIDE;
-    virtual SfxPopupWindowType GetPopupWindowType() const SAL_OVERRIDE;
     virtual VclPtr<SfxPopupWindow> CreatePopupWindow() SAL_OVERRIDE;
     virtual void Select(sal_uInt16 nSelectModifier) SAL_OVERRIDE;
 };
@@ -252,7 +251,6 @@ public:
     SFX_DECL_TOOLBOX_CONTROL();
     SvxFrameToolBoxControl(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rToolBox);
 
-    virtual SfxPopupWindowType GetPopupWindowType() const SAL_OVERRIDE;
     virtual VclPtr<SfxPopupWindow> CreatePopupWindow() SAL_OVERRIDE;
     virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState,
                               const SfxPoolItem* pState) SAL_OVERRIDE;
@@ -264,7 +262,6 @@ public:
     SFX_DECL_TOOLBOX_CONTROL();
     SvxFrameLineStyleToolBoxControl(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rToolBox);
 
-    virtual SfxPopupWindowType GetPopupWindowType() const SAL_OVERRIDE;
     virtual VclPtr<SfxPopupWindow> CreatePopupWindow() SAL_OVERRIDE;
     virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState,
                               const SfxPoolItem* pState) SAL_OVERRIDE;
diff --git a/include/svx/tbxalign.hxx b/include/svx/tbxalign.hxx
index 71322ee67bcf..8c8c0e421a93 100644
--- a/include/svx/tbxalign.hxx
+++ b/include/svx/tbxalign.hxx
@@ -31,7 +31,6 @@ public:
     virtual void SAL_CALL functionSelected( const OUString& aCommand ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
     virtual void SAL_CALL updateImage() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
-    virtual SfxPopupWindowType  GetPopupWindowType() const SAL_OVERRIDE;
     virtual VclPtr<SfxPopupWindow> CreatePopupWindow() SAL_OVERRIDE;
 
             SFX_DECL_TOOLBOX_CONTROL();
diff --git a/include/svx/tbxctl.hxx b/include/svx/tbxctl.hxx
index d15a53e59c73..d518df606eed 100644
--- a/include/svx/tbxctl.hxx
+++ b/include/svx/tbxctl.hxx
@@ -46,7 +46,6 @@ public:
     virtual void                Select(sal_uInt16 nSelectModifier) SAL_OVERRIDE;
     virtual void                StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                               const SfxPoolItem* pState ) SAL_OVERRIDE;
-    virtual SfxPopupWindowType  GetPopupWindowType() const SAL_OVERRIDE;
 };
 
 #endif
diff --git a/include/svx/tbxcustomshapes.hxx b/include/svx/tbxcustomshapes.hxx
index 2be1ac8807c9..2d55c8a49ba2 100644
--- a/include/svx/tbxcustomshapes.hxx
+++ b/include/svx/tbxcustomshapes.hxx
@@ -34,7 +34,6 @@ public:
     virtual void                Select(sal_uInt16 nSelectModifier) SAL_OVERRIDE;
     virtual void                StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                               const SfxPoolItem* pState ) SAL_OVERRIDE;
-    virtual SfxPopupWindowType  GetPopupWindowType() const SAL_OVERRIDE;
     virtual VclPtr<SfxPopupWindow> CreatePopupWindow() SAL_OVERRIDE;
 
             SFX_DECL_TOOLBOX_CONTROL();
diff --git a/sc/source/ui/cctrl/tbinsert.cxx b/sc/source/ui/cctrl/tbinsert.cxx
index 8b3469a6f89e..2408618c4d3d 100644
--- a/sc/source/ui/cctrl/tbinsert.cxx
+++ b/sc/source/ui/cctrl/tbinsert.cxx
@@ -93,11 +93,6 @@ VclPtr<SfxPopupWindow> ScTbxInsertCtrl::CreatePopupWindow()
     return NULL;
 }
 
-SfxPopupWindowType ScTbxInsertCtrl::GetPopupWindowType() const
-{
-    return nLastSlotId ? SfxPopupWindowType::ONTIMEOUT : SfxPopupWindowType::ONCLICK;
-}
-
 void ScTbxInsertCtrl::Select( bool /* bMod1 */ )
 {
     SfxViewShell*   pCurSh( SfxViewShell::Current() );
diff --git a/sc/source/ui/inc/tbinsert.hxx b/sc/source/ui/inc/tbinsert.hxx
index dda701868ab2..71bdbdce4a30 100644
--- a/sc/source/ui/inc/tbinsert.hxx
+++ b/sc/source/ui/inc/tbinsert.hxx
@@ -35,7 +35,6 @@ public:
     ScTbxInsertCtrl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rBox );
     virtual ~ScTbxInsertCtrl();
 
-    virtual SfxPopupWindowType  GetPopupWindowType() const SAL_OVERRIDE;
     virtual VclPtr<SfxPopupWindow> CreatePopupWindow() SAL_OVERRIDE;
     virtual void                StateChanged( sal_uInt16 nSID,
                                               SfxItemState eState,
diff --git a/sd/source/ui/app/tbxww.cxx b/sd/source/ui/app/tbxww.cxx
index 2aed6b89c96e..69a8e4e03fff 100644
--- a/sd/source/ui/app/tbxww.cxx
+++ b/sd/source/ui/app/tbxww.cxx
@@ -49,13 +49,6 @@ SdTbxControl::SdTbxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx )
     rTbx.Invalidate();
 }
 
-/*-------------------------------------------------------------------------*/
-
-SfxPopupWindowType SdTbxControl::GetPopupWindowType() const
-{
-    return SfxPopupWindowType::ONTIMEOUT;
-}
-
 /**
  * We create the window here
  * You can get the position of the toolbox with GetToolBox()
diff --git a/sd/source/ui/inc/tbx_ww.hxx b/sd/source/ui/inc/tbx_ww.hxx
index 4f038c999df8..d65c0bc88d1a 100644
--- a/sd/source/ui/inc/tbx_ww.hxx
+++ b/sd/source/ui/inc/tbx_ww.hxx
@@ -34,7 +34,6 @@ public:
             SdTbxControl(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
             virtual ~SdTbxControl() {}
 
-    virtual SfxPopupWindowType  GetPopupWindowType() const SAL_OVERRIDE;
     virtual VclPtr<SfxPopupWindow> CreatePopupWindow() SAL_OVERRIDE;
     virtual void StateChanged( sal_uInt16 nSId, SfxItemState eState,
                                 const SfxPoolItem* pState ) SAL_OVERRIDE;
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx
index 02830201f7cf..749b809b0924 100644
--- a/sfx2/source/toolbox/tbxitem.cxx
+++ b/sfx2/source/toolbox/tbxitem.cxx
@@ -970,13 +970,6 @@ void SfxToolBoxControl::Click()
 
 
 
-SfxPopupWindowType SfxToolBoxControl::GetPopupWindowType() const
-{
-    return SfxPopupWindowType::NONE;
-}
-
-
-
 VclPtr<SfxPopupWindow> SfxToolBoxControl::CreatePopupWindow()
 {
     return 0;
diff --git a/svx/source/customshapes/tbxcustomshapes.cxx b/svx/source/customshapes/tbxcustomshapes.cxx
index f80af1e9a548..7042e7024be2 100644
--- a/svx/source/customshapes/tbxcustomshapes.cxx
+++ b/svx/source/customshapes/tbxcustomshapes.cxx
@@ -94,12 +94,6 @@ void SvxTbxCtlCustomShapes::StateChanged( sal_uInt16 nSID, SfxItemState eState,
     SfxToolBoxControl::StateChanged( nSID, eState, pState );
 }
 
-// when one wants to create a popup window
-SfxPopupWindowType SvxTbxCtlCustomShapes::GetPopupWindowType() const
-{
-    return( m_aCommand.isEmpty() ? SfxPopupWindowType::ONCLICK : SfxPopupWindowType::ONTIMEOUT);
-}
-
 // Here is the window created
 // The location of the Toolbox is queried through GetToolBox()
 // rItemRect are the screen coordinates
diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx
index 64baa4f85f89..a0835371219b 100644
--- a/svx/source/form/tbxform.cxx
+++ b/svx/source/form/tbxform.cxx
@@ -191,12 +191,6 @@ void SvxFmTbxCtlConfig::StateChanged(sal_uInt16 nSID, SfxItemState eState, const
 }
 
 
-SfxPopupWindowType SvxFmTbxCtlConfig::GetPopupWindowType() const
-{
-    return( nLastSlot == 0 ? SfxPopupWindowType::ONCLICK : SfxPopupWindowType::ONTIMEOUT );
-}
-
-
 VclPtr<SfxPopupWindow> SvxFmTbxCtlConfig::CreatePopupWindow()
 {
     if ( GetSlotId() == SID_FM_CONFIG )
diff --git a/svx/source/inc/tbxform.hxx b/svx/source/inc/tbxform.hxx
index cc2ad675712e..0b51c780c8ca 100644
--- a/svx/source/inc/tbxform.hxx
+++ b/svx/source/inc/tbxform.hxx
@@ -57,7 +57,6 @@ public:
     virtual void                Select( sal_uInt16 nSelectModifier ) SAL_OVERRIDE;
     virtual void                StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                               const SfxPoolItem* pState ) SAL_OVERRIDE;
-    virtual SfxPopupWindowType  GetPopupWindowType() const SAL_OVERRIDE;
     virtual VclPtr<SfxPopupWindow> CreatePopupWindow() SAL_OVERRIDE;
 };
 
diff --git a/svx/source/mnuctrls/clipboardctl.cxx b/svx/source/mnuctrls/clipboardctl.cxx
index a0eb16f61b3c..a76ece6816e3 100644
--- a/svx/source/mnuctrls/clipboardctl.cxx
+++ b/svx/source/mnuctrls/clipboardctl.cxx
@@ -108,12 +108,6 @@ VclPtr<SfxPopupWindow> SvxClipBoardControl::CreatePopupWindow()
 }
 
 
-SfxPopupWindowType SvxClipBoardControl::GetPopupWindowType() const
-{
-    return SfxPopupWindowType::ONTIMEOUT;
-}
-
-
 void SvxClipBoardControl::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState )
 {
     if ( SID_CLIPBOARD_FORMAT_ITEMS == nSID )
diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx b/svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx
index ae3eb8458f29..14684e919b29 100644
--- a/svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx
+++ b/svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx
@@ -37,11 +37,6 @@ ParaLineSpacingPopup::~ParaLineSpacingPopup()
 {
 }
 
-SfxPopupWindowType ParaLineSpacingPopup::GetPopupWindowType() const
-{
-    return SfxPopupWindowType::ONTIMEOUT;
-}
-
 VclPtr<SfxPopupWindow> ParaLineSpacingPopup::CreatePopupWindow()
 {
     VclPtr<ParaLineSpacingControl> pControl = VclPtr<ParaLineSpacingControl>::Create(GetSlotId());
diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx
index e7672fd69432..bae32a488397 100644
--- a/svx/source/tbxctrls/fontworkgallery.cxx
+++ b/svx/source/tbxctrls/fontworkgallery.cxx
@@ -276,13 +276,6 @@ FontWorkShapeTypeControl::~FontWorkShapeTypeControl()
 
 
 
-SfxPopupWindowType FontWorkShapeTypeControl::GetPopupWindowType() const
-{
-    return SfxPopupWindowType::ONCLICK; //( aLastAction.getLength() == 0 ? SfxPopupWindowType::ONCLICK : SfxPopupWindowType::ONTIMEOUT );
-}
-
-
-
 VclPtr<SfxPopupWindow> FontWorkShapeTypeControl::CreatePopupWindow()
 {
     OUString aSubTbxResName( "private:resource/toolbar/fontworkshapetype" );
diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx
index 5c1d763988be..1b6a4f2563a1 100644
--- a/svx/source/tbxctrls/grafctrl.cxx
+++ b/svx/source/tbxctrls/grafctrl.cxx
@@ -441,11 +441,6 @@ void SvxGrafFilterToolBoxControl::StateChanged( sal_uInt16, SfxItemState eState,
     GetToolBox().EnableItem( GetId(), ( eState != SfxItemState::DISABLED ) );
 }
 
-SfxPopupWindowType SvxGrafFilterToolBoxControl::GetPopupWindowType() const
-{
-    return SfxPopupWindowType::ONCLICK;
-}
-
 VclPtr<SfxPopupWindow> SvxGrafFilterToolBoxControl::CreatePopupWindow()
 {
     OUString aSubTbxResName( "private:resource/toolbar/graffilterbar" );
diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx
index acdfb294aaad..cbb84d2d5621 100644
--- a/svx/source/tbxctrls/layctrl.cxx
+++ b/svx/source/tbxctrls/layctrl.cxx
@@ -732,13 +732,6 @@ SvxTableToolBoxControl::~SvxTableToolBoxControl()
 
 
 
-SfxPopupWindowType SvxTableToolBoxControl::GetPopupWindowType() const
-{
-    return SfxPopupWindowType::ONTIMEOUTANDMOVE;
-}
-
-
-
 VclPtr<SfxPopupWindow> SvxTableToolBoxControl::CreatePopupWindow()
 {
     if ( bEnabled )
@@ -786,13 +779,6 @@ SvxColumnsToolBoxControl::~SvxColumnsToolBoxControl()
 
 
 
-SfxPopupWindowType SvxColumnsToolBoxControl::GetPopupWindowType() const
-{
-    return SfxPopupWindowType::ONTIMEOUTANDMOVE;
-}
-
-
-
 VclPtr<SfxPopupWindow> SvxColumnsToolBoxControl::CreatePopupWindow()
 {
     ColumnsWindow* pWin = 0;
diff --git a/svx/source/tbxctrls/lboxctrl.cxx b/svx/source/tbxctrls/lboxctrl.cxx
index 505077b8613c..4284a5ff06e9 100644
--- a/svx/source/tbxctrls/lboxctrl.cxx
+++ b/svx/source/tbxctrls/lboxctrl.cxx
@@ -162,12 +162,6 @@ VclPtr<SfxPopupWindow> SvxListBoxControl::CreatePopupWindow()
 }
 
 
-SfxPopupWindowType SvxListBoxControl::GetPopupWindowType() const
-{
-    return SfxPopupWindowType::ONTIMEOUT;
-}
-
-
 void SvxListBoxControl::StateChanged(
         sal_uInt16, SfxItemState, const SfxPoolItem* pState )
 {
diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx
index 101490079bda..903eca98967c 100644
--- a/svx/source/tbxctrls/linectrl.cxx
+++ b/svx/source/tbxctrls/linectrl.cxx
@@ -622,13 +622,6 @@ SvxLineEndToolBoxControl::~SvxLineEndToolBoxControl()
 
 
 
-SfxPopupWindowType SvxLineEndToolBoxControl::GetPopupWindowType() const
-{
-    return SfxPopupWindowType::ONCLICK;
-}
-
-
-
 VclPtr<SfxPopupWindow> SvxLineEndToolBoxControl::CreatePopupWindow()
 {
     SvxLineEndWindow* pLineEndWin =
diff --git a/svx/source/tbxctrls/subtoolboxcontrol.cxx b/svx/source/tbxctrls/subtoolboxcontrol.cxx
index 606debaaa292..95227cad8695 100644
--- a/svx/source/tbxctrls/subtoolboxcontrol.cxx
+++ b/svx/source/tbxctrls/subtoolboxcontrol.cxx
@@ -52,9 +52,4 @@ VclPtr<SfxPopupWindow> SvxSubToolBoxControl::CreatePopupWindow()
     return NULL;
 }
 
-SfxPopupWindowType  SvxSubToolBoxControl::GetPopupWindowType() const
-{
-    return SfxPopupWindowType::ONCLICK;
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index eb96a7640e64..e2268963124d 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -2618,11 +2618,6 @@ SvxColorToolBoxControl::~SvxColorToolBoxControl()
 {
 }
 
-SfxPopupWindowType SvxColorToolBoxControl::GetPopupWindowType() const
-{
-    return SfxPopupWindowType::ONTIMEOUT;
-}
-
 VclPtr<SfxPopupWindow> SvxColorToolBoxControl::CreatePopupWindow()
 {
     SvxColorWindow_Impl* pColorWin =
@@ -2808,11 +2803,6 @@ SvxFrameToolBoxControl::SvxFrameToolBoxControl(
     rTbx.SetItemBits( nId, ToolBoxItemBits::DROPDOWNONLY | rTbx.GetItemBits( nId ) );
 }
 
-SfxPopupWindowType SvxFrameToolBoxControl::GetPopupWindowType() const
-{
-    return SfxPopupWindowType::ONCLICK;
-}
-
 VclPtr<SfxPopupWindow> SvxFrameToolBoxControl::CreatePopupWindow()
 {
     VclPtr<SvxFrameWindow_Impl> pFrameWin = VclPtr<SvxFrameWindow_Impl>::Create(
@@ -2850,11 +2840,6 @@ SvxFrameLineStyleToolBoxControl::SvxFrameLineStyleToolBoxControl(
     rTbx.SetItemBits( nId, ToolBoxItemBits::DROPDOWNONLY | rTbx.GetItemBits( nId ) );
 }
 
-SfxPopupWindowType SvxFrameLineStyleToolBoxControl::GetPopupWindowType() const
-{
-    return SfxPopupWindowType::ONCLICK;
-}
-
 VclPtr<SfxPopupWindow> SvxFrameLineStyleToolBoxControl::CreatePopupWindow()
 {
     VclPtr<SvxLineWindow_Impl> pLineWin = VclPtr<SvxLineWindow_Impl>::Create( GetSlotId(), m_xFrame, &GetToolBox() );
diff --git a/svx/source/tbxctrls/tbxalign.cxx b/svx/source/tbxctrls/tbxalign.cxx
index a4fdb266a15f..def2b2e2b00f 100644
--- a/svx/source/tbxctrls/tbxalign.cxx
+++ b/svx/source/tbxctrls/tbxalign.cxx
@@ -47,15 +47,6 @@ SvxTbxCtlAlign::SvxTbxCtlAlign( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTb
 }
 
 /*
- * Wenn man ein PopupWindow erzeugen will
- */
-
-SfxPopupWindowType SvxTbxCtlAlign::GetPopupWindowType() const
-{
-    return SfxPopupWindowType::ONCLICK;
-}
-
-/*
  * Hier wird das Fenster erzeugt
  * Lage der Toolbox mit GetToolBox() abfragbar
  * rItemRect sind die Screen-Koordinaten
diff --git a/svx/source/tbxctrls/tbxdrctl.cxx b/svx/source/tbxctrls/tbxdrctl.cxx
index 6280e1fce9f8..37f18fd839d2 100644
--- a/svx/source/tbxctrls/tbxdrctl.cxx
+++ b/svx/source/tbxctrls/tbxdrctl.cxx
@@ -68,13 +68,6 @@ void SvxTbxCtlDraw::StateChanged( sal_uInt16 nSID, SfxItemState eState,
 
 
 
-SfxPopupWindowType SvxTbxCtlDraw::GetPopupWindowType() const
-{
-    return SfxPopupWindowType::ONCLICK;
-}
-
-
-
 void SvxTbxCtlDraw::toggleToolbox()
 {
     Reference< XLayoutManager > xLayoutMgr = getLayoutManager();
diff --git a/sw/source/uibase/inc/tblctrl.hxx b/sw/source/uibase/inc/tblctrl.hxx
index 659591b4575d..3528a343ed2b 100644
--- a/sw/source/uibase/inc/tblctrl.hxx
+++ b/sw/source/uibase/inc/tblctrl.hxx
@@ -30,7 +30,6 @@ public:
     SwTableOptimizeCtrl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
     virtual ~SwTableOptimizeCtrl();
 
-    virtual SfxPopupWindowType  GetPopupWindowType() const SAL_OVERRIDE;
     virtual VclPtr<SfxPopupWindow> CreatePopupWindow() SAL_OVERRIDE;
 
 };
diff --git a/sw/source/uibase/inc/workctrl.hxx b/sw/source/uibase/inc/workctrl.hxx
index 9f3287e75c3e..910dcb26f7e2 100644
--- a/sw/source/uibase/inc/workctrl.hxx
+++ b/sw/source/uibase/inc/workctrl.hxx
@@ -64,7 +64,6 @@ public:
     SwTbxInsertCtrl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
     virtual ~SwTbxInsertCtrl();
 
-    virtual SfxPopupWindowType  GetPopupWindowType() const SAL_OVERRIDE;
     virtual VclPtr<SfxPopupWindow> CreatePopupWindow() SAL_OVERRIDE;
     virtual void                StateChanged( sal_uInt16 nSID,
                                               SfxItemState eState,
@@ -84,7 +83,6 @@ public:
     SwTbxAutoTextCtrl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
     virtual ~SwTbxAutoTextCtrl();
 
-    virtual SfxPopupWindowType  GetPopupWindowType() const SAL_OVERRIDE;
     virtual VclPtr<SfxPopupWindow> CreatePopupWindow() SAL_OVERRIDE;
     virtual void                StateChanged( sal_uInt16 nSID,
                                               SfxItemState eState,
@@ -101,7 +99,6 @@ public:
     SwTbxFieldCtrl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
     virtual ~SwTbxFieldCtrl();
 
-    virtual SfxPopupWindowType  GetPopupWindowType() const SAL_OVERRIDE;
     virtual VclPtr<SfxPopupWindow> CreatePopupWindow() SAL_OVERRIDE;
     virtual void                StateChanged( sal_uInt16 nSID,
                                               SfxItemState eState,
diff --git a/sw/source/uibase/ribbar/tblctrl.cxx b/sw/source/uibase/ribbar/tblctrl.cxx
index bcdc852aa382..d5927051f237 100644
--- a/sw/source/uibase/ribbar/tblctrl.cxx
+++ b/sw/source/uibase/ribbar/tblctrl.cxx
@@ -47,9 +47,4 @@ VclPtr<SfxPopupWindow> SwTableOptimizeCtrl::CreatePopupWindow()
     return NULL;
 }
 
-SfxPopupWindowType  SwTableOptimizeCtrl::GetPopupWindowType() const
-{
-    return SfxPopupWindowType::ONCLICK;
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/ribbar/workctrl.cxx b/sw/source/uibase/ribbar/workctrl.cxx
index 96a073a94620..c56f9cbdf180 100644
--- a/sw/source/uibase/ribbar/workctrl.cxx
+++ b/sw/source/uibase/ribbar/workctrl.cxx
@@ -137,11 +137,6 @@ VclPtr<SfxPopupWindow> SwTbxInsertCtrl::CreatePopupWindow()
     return NULL;
 }
 
-SfxPopupWindowType  SwTbxInsertCtrl::GetPopupWindowType() const
-{
-    return nLastSlotId ? SfxPopupWindowType::ONTIMEOUT : SfxPopupWindowType::ONCLICK;
-}
-
 void SwTbxInsertCtrl::Select( sal_uInt16 /*nSelectModifier*/ )
 {
     if( nLastSlotId )
@@ -226,11 +221,6 @@ VclPtr<SfxPopupWindow> SwTbxAutoTextCtrl::CreatePopupWindow()
 
 }
 
-SfxPopupWindowType SwTbxAutoTextCtrl::GetPopupWindowType() const
-{
-    return SfxPopupWindowType::ONTIMEOUT;
-}
-
 void SwTbxAutoTextCtrl::StateChanged( sal_uInt16,
                                               SfxItemState,
                                               const SfxPoolItem* pState )
@@ -323,11 +313,6 @@ VclPtr<SfxPopupWindow> SwTbxFieldCtrl::CreatePopupWindow()
     return 0;
 }
 
-SfxPopupWindowType SwTbxFieldCtrl::GetPopupWindowType() const
-{
-    return SfxPopupWindowType::ONTIMEOUT;
-}
-
 void SwTbxFieldCtrl::StateChanged( sal_uInt16,
                                               SfxItemState eState,
                                               const SfxPoolItem* pState )