diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2013-04-09 15:24:04 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2013-04-09 17:48:51 +0200 |
| commit | fcffc8694807fb2962d64fc0eae519d94473ce2a (patch) | |
| tree | 1192bdf37621fefe4dc3b8f942cfd590a50814a9 | |
| parent | 36afd52a76973aad60f7aaa934f8d978bc709681 (diff) | |
Kill m_xToolBarWindow here too.
Change-Id: I8e07b798776ac06eb5a91bf6479105a2c08a073b
| -rw-r--r-- | framework/inc/uielement/addonstoolbarwrapper.hxx | 1 | ||||
| -rw-r--r-- | framework/source/uielement/addonstoolbarwrapper.cxx | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/framework/inc/uielement/addonstoolbarwrapper.hxx b/framework/inc/uielement/addonstoolbarwrapper.hxx index 310eaf6a406a..d73c67b6c741 100644 --- a/framework/inc/uielement/addonstoolbarwrapper.hxx +++ b/framework/inc/uielement/addonstoolbarwrapper.hxx @@ -51,7 +51,6 @@ class AddonsToolBarWrapper : public UIElementWrapperBase private: com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > m_xServiceManager; com::sun::star::uno::Reference< com::sun::star::lang::XComponent > m_xToolBarManager; - com::sun::star::uno::Reference< com::sun::star::awt::XWindow > m_xToolBarWindow; com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > > m_aConfigData; }; diff --git a/framework/source/uielement/addonstoolbarwrapper.cxx b/framework/source/uielement/addonstoolbarwrapper.cxx index 3f2f3666dcff..a3617ee19a24 100644 --- a/framework/source/uielement/addonstoolbarwrapper.cxx +++ b/framework/source/uielement/addonstoolbarwrapper.cxx @@ -78,7 +78,6 @@ void SAL_CALL AddonsToolBarWrapper::dispose() throw ( RuntimeException ) if ( m_xToolBarManager.is() ) m_xToolBarManager->dispose(); m_xToolBarManager.clear(); - m_xToolBarWindow.clear(); m_bDisposed = sal_True; } @@ -119,7 +118,6 @@ void SAL_CALL AddonsToolBarWrapper::initialize( const Sequence< Any >& aArgument sal_uLong nStyles = WB_LINESPACING | WB_BORDER | WB_SCROLL | WB_MOVEABLE | WB_3DLOOK | WB_DOCKABLE | WB_SIZEABLE | WB_CLOSEABLE; pToolBar = new ToolBar( pWindow, nStyles ); - m_xToolBarWindow = VCLUnoHelper::GetInterface( pToolBar ); pToolBarManager = new AddonsToolBarManager( comphelper::getComponentContext(m_xServiceManager), xFrame, m_aResourceURL, pToolBar ); pToolBar->SetToolBarManager( pToolBarManager ); m_xToolBarManager = Reference< XComponent >( static_cast< OWeakObject *>( pToolBarManager ), UNO_QUERY ); |