diff options
| author | Andre Fischer <af@apache.org> | 2014-03-12 14:21:27 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-03-13 11:35:13 +0000 |
| commit | 8ad74d8866c77ca52f8c2562b728fc876c23f1c0 (patch) | |
| tree | 71e6a1f842f3fe5647e97cdbe14ec662a696c715 /sfx2 | |
| parent | eee4c914aee9794125077d4ae7c6dd171b8fb223 (diff) | |
Related: #i124392# fill in SidebarDockingWindow::DoDispose
(cherry picked from commit 952f581cb77f52e9aaa974496dc8d86b335cb424)
Conflicts:
sfx2/inc/sfx2/sidebar/SidebarChildWindow.hxx
sfx2/source/dialog/templdlg.cxx
sfx2/source/inc/templdgi.hxx
Change-Id: Idf06437dfc45e02d9e2303df84d52ba0837de108
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/inc/templdgi.hxx | 2 | ||||
| -rw-r--r-- | sfx2/source/sidebar/SidebarDockingWindow.cxx | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx index 8a4dfdc09a0d..f064bba49301 100644 --- a/sfx2/source/inc/templdgi.hxx +++ b/sfx2/source/inc/templdgi.hxx @@ -276,7 +276,7 @@ public: TYPEINFO(); SfxCommonTemplateDialog_Impl( SfxBindings* pB, Window*, bool ); - ~SfxCommonTemplateDialog_Impl(); + virtual ~SfxCommonTemplateDialog_Impl(); DECL_LINK( MenuSelectHdl, Menu * ); diff --git a/sfx2/source/sidebar/SidebarDockingWindow.cxx b/sfx2/source/sidebar/SidebarDockingWindow.cxx index 259123dcca31..1fb9f0a1a029 100644 --- a/sfx2/source/sidebar/SidebarDockingWindow.cxx +++ b/sfx2/source/sidebar/SidebarDockingWindow.cxx @@ -66,6 +66,12 @@ SidebarDockingWindow::~SidebarDockingWindow (void) void SidebarDockingWindow::DoDispose (void) { + Reference<lang::XComponent> xComponent (static_cast<XWeak*>(mpSidebarController.get()), UNO_QUERY); + mpSidebarController.clear(); + if (xComponent.is()) + { + xComponent->dispose(); + } } |