diff options
| -rw-r--r-- | basctl/source/basicide/baside2b.cxx | 2 | ||||
| -rw-r--r-- | include/dbaccess/dataview.hxx | 3 | ||||
| -rw-r--r-- | svx/source/tbxctrls/tbcontrl.cxx | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index 0d1878a1945e..605c1f4d6752 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -271,6 +271,7 @@ void EditorWindow::dispose() EndListening( *pEditEngine ); pEditEngine->RemoveView(pEditView.get()); } + vcl::Window::dispose(); } OUString EditorWindow::GetWordAtCursor() @@ -1683,6 +1684,7 @@ void WatchWindow::dispose() aHeaderBar.disposeAndClear(); aTreeListBox.disposeAndClear(); GetSystemWindow()->GetTaskPaneList()->RemoveWindow( this ); + DockingWindow::dispose(); } diff --git a/include/dbaccess/dataview.hxx b/include/dbaccess/dataview.hxx index 8189cc93a4f0..d62509761c63 100644 --- a/include/dbaccess/dataview.hxx +++ b/include/dbaccess/dataview.hxx @@ -38,7 +38,7 @@ namespace dbaui protected: IController& m_rController; // the controller in where we resides in - FixedLine m_aSeparator; + VclPtr<FixedLine> m_aSeparator; ::std::unique_ptr< ::svt::AcceleratorExecute> m_pAccel; public: @@ -47,6 +47,7 @@ namespace dbaui const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& , WinBits nStyle = 0 ); virtual ~ODataView(); + virtual void dispose() SAL_OVERRIDE; /// late construction virtual void Construct(); diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 51cb5e191f49..55746fc59607 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -279,7 +279,7 @@ protected: public: SvxLineWindow_Impl( sal_uInt16 nId, const Reference< XFrame >& rFrame, vcl::Window* pParentWindow ); virtual ~SvxLineWindow_Impl() { dispose(); } - virtual void dispose() SAL_OVERRIDE { m_aLineStyleLb.disposeAndClear(); } + virtual void dispose() SAL_OVERRIDE { m_aLineStyleLb.disposeAndClear(); SfxPopupWindow::dispose(); } virtual SfxPopupWindow* Clone() const SAL_OVERRIDE; }; |