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

tdf#91127 - get SfxTabPage creation function ref-counting right.

Browse Source 
Change-Id: I7c730cf311900fe14a09081dd986f17d9b89e77f
This commit is contained in:
Michael Meeks
2015-05-07 14:35:42 +01:00
parent 28a2f0d6d8
commit fc8c282e99
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sfx2/source/appl/childwin.cxx
View File

@@ -198,8 +198,10 @@ void SfxChildWindow::Destroy()
SfxChildWindow::~SfxChildWindow() SfxChildWindow::~SfxChildWindow()
{ {
delete pContext; delete pContext;
pContext = NULL;
pWindow.disposeAndClear(); pWindow.disposeAndClear();
delete pImp; delete pImp;
pImp = NULL;
} }

10
sfx2/source/dialog/tabdlg.cxx
View File

@@ -178,6 +178,7 @@ SfxTabPage::~SfxTabPage()
void SfxTabPage::dispose() void SfxTabPage::dispose()
{ {
delete pImpl; delete pImpl;
pImpl = NULL;
TabPage::dispose(); TabPage::dispose();
} }
@@ -401,13 +402,19 @@ void SfxTabDialog::dispose()
pDataObject->pTabPage.disposeAndClear(); pDataObject->pTabPage.disposeAndClear();
} }
delete pDataObject; delete pDataObject;
pDataObject = NULL;
} }
delete pImpl; delete pImpl;
pImpl = NULL;
delete pSet; delete pSet;
pSet = NULL;
delete pOutSet; delete pOutSet;
pOutSet = NULL;
delete pExampleSet; delete pExampleSet;
pExampleSet = NULL;
delete [] pRanges; delete [] pRanges;
pRanges = NULL;
if (m_bOwnsBaseFmtBtn) if (m_bOwnsBaseFmtBtn)
m_pBaseFmtBtn.disposeAndClear(); m_pBaseFmtBtn.disposeAndClear();
@@ -429,6 +436,7 @@ void SfxTabDialog::dispose()
m_pResetBtn.clear(); m_pResetBtn.clear();
m_pBaseFmtBtn.clear(); m_pBaseFmtBtn.clear();
m_pActionArea.clear(); m_pActionArea.clear();
TabDialog::dispose(); TabDialog::dispose();
} }
@@ -1109,7 +1117,7 @@ IMPL_LINK( SfxTabDialog, ActivatePageHdl, TabControl *, pTabCtrl )
SfxGetpApp(); SfxGetpApp();
// Tab Page schon da? // Tab Page schon da?
SfxTabPage* pTabPage = dynamic_cast<SfxTabPage*> (pTabCtrl->GetTabPage( nId )); VclPtr<SfxTabPage> pTabPage = dynamic_cast<SfxTabPage*> (pTabCtrl->GetTabPage( nId ));
Data_Impl* pDataObject = Find( pImpl->aData, nId ); Data_Impl* pDataObject = Find( pImpl->aData, nId );
//UUUU fallback to 1st page when requested one does not exist //UUUU fallback to 1st page when requested one does not exist