[Libreoffice-commits] core.git: include/sfx2 sfx2/source

[Andre Fischer]

 include/sfx2/templdlg.hxx                    |    2 +-
 sfx2/source/inc/templdgi.hxx                 |    2 +-
 sfx2/source/sidebar/SidebarDockingWindow.cxx |    6 ++++++
 3 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 8ad74d8866c77ca52f8c2562b728fc876c23f1c0
Author: Andre Fischer <af at apache.org>
Date:   Wed Mar 12 14:21:27 2014 +0000

    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

diff --git a/include/sfx2/templdlg.hxx b/include/sfx2/templdlg.hxx
index 25b152a..96a03df 100644
--- a/include/sfx2/templdlg.hxx
+++ b/include/sfx2/templdlg.hxx
@@ -85,7 +85,7 @@ class SFX2_DLLPUBLIC SfxTemplatePanelControl : public DockingWindow
 {
 public:
     SfxTemplatePanelControl (SfxBindings* pBindings, Window* pParentWindow);
-    ~SfxTemplatePanelControl (void);
+    virtual ~SfxTemplatePanelControl();
 
     virtual void                Update();
     virtual void                DataChanged( const DataChangedEvent& _rDCEvt );
diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx
index 8a4dfdc..f064bba 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 259123d..1fb9f0a 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();
+    }
 }