diff --git a/main/sfx2/inc/sfx2/sidebar/SidebarChildWindow.hxx b/main/sfx2/inc/sfx2/sidebar/SidebarChildWindow.hxx old mode 100644 new mode 100755 index 6b72c70..ca490b7 --- a/main/sfx2/inc/sfx2/sidebar/SidebarChildWindow.hxx +++ b/main/sfx2/inc/sfx2/sidebar/SidebarChildWindow.hxx @@ -42,6 +42,7 @@ public: sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo); + virtual ~SidebarChildWindow (void); SFX_DECL_CHILDWINDOW(SidebarChildWindow); diff --git a/main/sfx2/inc/sfx2/templdlg.hxx b/main/sfx2/inc/sfx2/templdlg.hxx old mode 100644 new mode 100755 index ec3f14e..8110f5f --- a/main/sfx2/inc/sfx2/templdlg.hxx +++ b/main/sfx2/inc/sfx2/templdlg.hxx @@ -100,7 +100,7 @@ class SFX2_DLLPUBLIC SfxTemplatePanelControl : public DockingWindow { public: SfxTemplatePanelControl (SfxBindings* pBindings, Window* pParentWindow); - ~SfxTemplatePanelControl (void); + virtual ~SfxTemplatePanelControl (void); virtual void Update(); virtual void DataChanged( const DataChangedEvent& _rDCEvt ); diff --git a/main/sfx2/source/inc/templdgi.hxx b/main/sfx2/source/inc/templdgi.hxx old mode 100644 new mode 100755 index b5b68f4..d2c0134 --- a/main/sfx2/source/inc/templdgi.hxx +++ b/main/sfx2/source/inc/templdgi.hxx @@ -243,7 +243,7 @@ public: SfxCommonTemplateDialog_Impl( SfxBindings* pB, Window*, bool ); SfxCommonTemplateDialog_Impl( SfxBindings* pB, Window* ); - ~SfxCommonTemplateDialog_Impl(); + virtual ~SfxCommonTemplateDialog_Impl(); DECL_LINK( MenuSelectHdl, Menu * ); diff --git a/main/sfx2/source/sidebar/SidebarChildWindow.cxx b/main/sfx2/source/sidebar/SidebarChildWindow.cxx old mode 100644 new mode 100755 index 1b904b1..070a507 --- a/main/sfx2/source/sidebar/SidebarChildWindow.cxx +++ b/main/sfx2/source/sidebar/SidebarChildWindow.cxx @@ -64,6 +64,13 @@ SidebarChildWindow::SidebarChildWindow ( +SidebarChildWindow::~SidebarChildWindow (void) +{ +} + + + + sal_Int32 SidebarChildWindow::GetDefaultWidth (Window* pWindow) { if (pWindow != NULL) diff --git a/main/sfx2/source/sidebar/SidebarDockingWindow.cxx b/main/sfx2/source/sidebar/SidebarDockingWindow.cxx old mode 100644 new mode 100755 index bac39f7..d97bf5b --- a/main/sfx2/source/sidebar/SidebarDockingWindow.cxx +++ b/main/sfx2/source/sidebar/SidebarDockingWindow.cxx @@ -71,6 +71,12 @@ SidebarDockingWindow::~SidebarDockingWindow (void) void SidebarDockingWindow::DoDispose (void) { + Reference xComponent (static_cast(mpSidebarController.get()), UNO_QUERY); + mpSidebarController.clear(); + if (xComponent.is()) + { + xComponent->dispose(); + } }