diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-03-20 18:58:34 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-10 13:01:49 +0100 |
| commit | ad8a2074c6143d3ce05c0a5d93a553c13b950520 (patch) | |
| tree | 2f47189a78e80d478a15a3360906131fc9c16428 /forms | |
| parent | 8fb4672aef888fc5a582ca9508799ecdbe777c42 (diff) | |
cure a lot of unfortunate ScopedVclPtrs.
Change-Id: I2149511f958ba75e81dc41b10b01eb9d19610037
Diffstat (limited to 'forms')
| -rw-r--r-- | forms/source/solar/control/navtoolbar.cxx | 2 | ||||
| -rw-r--r-- | forms/source/solar/inc/navtoolbar.hxx | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/forms/source/solar/control/navtoolbar.cxx b/forms/source/solar/control/navtoolbar.cxx index af7bf5dca883..07429f0640d3 100644 --- a/forms/source/solar/control/navtoolbar.cxx +++ b/forms/source/solar/control/navtoolbar.cxx @@ -152,6 +152,8 @@ namespace frm void NavigationToolBar::dispose() { + for (auto i = m_aChildWins.begin(); i != m_aChildWins.end(); ++i) + i->disposeAndClear(); m_aChildWins.clear(); m_pToolbar.clear(); vcl::Window::dispose(); diff --git a/forms/source/solar/inc/navtoolbar.hxx b/forms/source/solar/inc/navtoolbar.hxx index ec66f92f78a9..79d126655a03 100644 --- a/forms/source/solar/inc/navtoolbar.hxx +++ b/forms/source/solar/inc/navtoolbar.hxx @@ -61,7 +61,7 @@ namespace frm m_pDescriptionProvider; ImageSize m_eImageSize; VclPtr<ImplNavToolBar> m_pToolbar; - ::std::vector< ScopedVclPtr<vcl::Window> > m_aChildWins; + ::std::vector< VclPtr<vcl::Window> > m_aChildWins; public: NavigationToolBar( |