diff options
| author | Noel Grandin <noel@peralex.com> | 2015-10-09 11:37:01 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-10-12 09:13:33 +0200 |
| commit | 529f15859b4699b01f32e4ac438b35afe05f9143 (patch) | |
| tree | 137fd6897380ff17b2f5e863c0617d5b6958c017 /sfx2 | |
| parent | 0f8873612829f7946ea6c3114b050320520eb75a (diff) | |
loplugin:mergeclasses
Change-Id: I660b102e0e053e632ea6f1880e92652bc1ed5e5e
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/toolbox/tbxitem.cxx | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx index b1aad075ba8a..f27542430d55 100644 --- a/sfx2/source/toolbox/tbxitem.cxx +++ b/sfx2/source/toolbox/tbxitem.cxx @@ -745,10 +745,25 @@ VclPtr<vcl::Window> SfxToolBoxControl::CreateItemWindow( vcl::Window * ) return VclPtr<vcl::Window>(); } +class SfxFrameStatusListener : public svt::FrameStatusListener +{ + public: + SfxFrameStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, + const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame, + SfxPopupWindow* pCallee ); + virtual ~SfxFrameStatusListener(); + + // XStatusListener + virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) + throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + + private: + VclPtr<SfxPopupWindow> m_pCallee; +}; SfxFrameStatusListener::SfxFrameStatusListener( const Reference< XComponentContext >& rxContext, const Reference< XFrame >& xFrame, - SfxStatusListenerInterface* pCallee ) : + SfxPopupWindow* pCallee ) : svt::FrameStatusListener( rxContext, xFrame ), m_pCallee( pCallee ) { @@ -958,6 +973,7 @@ void SfxPopupWindow::dispose() { m_xStatusListener->dispose(); m_xStatusListener.clear(); + m_pStatusListener = nullptr; } vcl::Window* pWindow = GetTopMostParentSystemWindow( this ); |