diff options
| -rw-r--r-- | include/sfx2/tbxctrl.hxx | 3 | ||||
| -rw-r--r-- | include/svx/layctrl.hxx | 2 | ||||
| -rw-r--r-- | sfx2/source/toolbox/tbxitem.cxx | 9 | ||||
| -rw-r--r-- | svx/source/tbxctrls/layctrl.cxx | 23 |
4 files changed, 1 insertions, 36 deletions
diff --git a/include/sfx2/tbxctrl.hxx b/include/sfx2/tbxctrl.hxx index d39337ce6680..11da16c4e0ff 100644 --- a/include/sfx2/tbxctrl.hxx +++ b/include/sfx2/tbxctrl.hxx @@ -198,8 +198,7 @@ protected: virtual void DoubleClick(); virtual void Click(); virtual SfxPopupWindowType GetPopupWindowType() const; - virtual VclPtr<SfxPopupWindow> CreatePopupWindow(); - virtual SfxPopupWindow* CreatePopupWindowCascading(); + virtual VclPtr<SfxPopupWindow> CreatePopupWindow(); virtual VclPtr<vcl::Window> CreateItemWindow( vcl::Window *pParent ); // Must be called by subclass to set a new popup window instance diff --git a/include/svx/layctrl.hxx b/include/svx/layctrl.hxx index 05eaf5dec50d..ec626559b549 100644 --- a/include/svx/layctrl.hxx +++ b/include/svx/layctrl.hxx @@ -32,7 +32,6 @@ private: public: virtual SfxPopupWindowType GetPopupWindowType() const SAL_OVERRIDE; virtual VclPtr<SfxPopupWindow> CreatePopupWindow() SAL_OVERRIDE; - virtual SfxPopupWindow* CreatePopupWindowCascading() SAL_OVERRIDE; virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; @@ -51,7 +50,6 @@ class SVX_DLLPUBLIC SvxColumnsToolBoxControl : public SfxToolBoxControl public: virtual SfxPopupWindowType GetPopupWindowType() const SAL_OVERRIDE; virtual VclPtr<SfxPopupWindow> CreatePopupWindow() SAL_OVERRIDE; - virtual SfxPopupWindow* CreatePopupWindowCascading() SAL_OVERRIDE; SFX_DECL_TOOLBOX_CONTROL(); diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx index 956651c553d5..d30b026265f8 100644 --- a/sfx2/source/toolbox/tbxitem.cxx +++ b/sfx2/source/toolbox/tbxitem.cxx @@ -982,20 +982,11 @@ VclPtr<SfxPopupWindow> SfxToolBoxControl::CreatePopupWindow() return 0; } -SfxPopupWindow* SfxToolBoxControl::CreatePopupWindowCascading() -{ - return 0; -} - - - VclPtr<vcl::Window> SfxToolBoxControl::CreateItemWindow( vcl::Window * ) { return VclPtr<vcl::Window>(); } - - SfxFrameStatusListener::SfxFrameStatusListener( const Reference< XComponentContext >& rxContext, const Reference< XFrame >& xFrame, diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx index c45f89c03db2..36368ca6387e 100644 --- a/svx/source/tbxctrls/layctrl.cxx +++ b/svx/source/tbxctrls/layctrl.cxx @@ -741,17 +741,6 @@ VclPtr<SfxPopupWindow> SvxTableToolBoxControl::CreatePopupWindow() return 0; } - - -SfxPopupWindow* SvxTableToolBoxControl::CreatePopupWindowCascading() -{ - if ( bEnabled ) - return VclPtr<TableWindow>::Create( GetSlotId(), m_aCommandURL, GetToolBox().GetItemText( GetId() ), GetToolBox(), m_xFrame ); - return 0; -} - - - void SvxTableToolBoxControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState ) { if ( pState && pState->ISA(SfxUInt16Item) ) @@ -806,18 +795,6 @@ VclPtr<SfxPopupWindow> SvxColumnsToolBoxControl::CreatePopupWindow() return pWin; } - - -SfxPopupWindow* SvxColumnsToolBoxControl::CreatePopupWindowCascading() -{ - ColumnsWindow* pWin = 0; - if(bEnabled) - { - pWin = VclPtr<ColumnsWindow>::Create( GetSlotId(), m_aCommandURL, GetToolBox().GetItemText( GetId() ), GetToolBox(), m_xFrame ); - } - return pWin; -} - void SvxColumnsToolBoxControl::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) |