mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Related: #i124392# fill in SidebarDockingWindow::DoDispose

Browse Source 
(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
This commit is contained in:
Andre Fischer
2014-03-12 14:21:27 +00:00
committed by Caolán McNamara
parent eee4c914ae
commit 8ad74d8866
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/sfx2/templdlg.hxx
View File

@@ -85,7 +85,7 @@ class SFX2_DLLPUBLIC SfxTemplatePanelControl : public DockingWindow
{ {
public: public:
SfxTemplatePanelControl (SfxBindings* pBindings, Window* pParentWindow); SfxTemplatePanelControl (SfxBindings* pBindings, Window* pParentWindow);
~SfxTemplatePanelControl (void); virtual ~SfxTemplatePanelControl();
virtual void Update(); virtual void Update();
virtual void DataChanged( const DataChangedEvent& _rDCEvt ); virtual void DataChanged( const DataChangedEvent& _rDCEvt );

2
sfx2/source/inc/templdgi.hxx
View File

@@ -276,7 +276,7 @@ public:
TYPEINFO(); TYPEINFO();
SfxCommonTemplateDialog_Impl( SfxBindings* pB, Window*, bool ); SfxCommonTemplateDialog_Impl( SfxBindings* pB, Window*, bool );
~SfxCommonTemplateDialog_Impl(); virtual ~SfxCommonTemplateDialog_Impl();
DECL_LINK( MenuSelectHdl, Menu * ); DECL_LINK( MenuSelectHdl, Menu * );

6
sfx2/source/sidebar/SidebarDockingWindow.cxx
View File

@@ -66,6 +66,12 @@ SidebarDockingWindow::~SidebarDockingWindow (void)
void SidebarDockingWindow::DoDispose (void) void SidebarDockingWindow::DoDispose (void)
{ {
Reference<lang::XComponent> xComponent (static_cast<XWeak*>(mpSidebarController.get()), UNO_QUERY);
mpSidebarController.clear();
if (xComponent.is())
{
xComponent->dispose();
}
} }