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

Audit and correct misc. clears -> disposeAndClears.

Browse Source 
Anything that used to be 'delete'd should be disposeAndCleared()
in the new world.
This commit is contained in:
Michael Meeks 2015-04-10 10:44:13 +01:00
parent 1c4025babd
commit c0a802b59e
143 changed files with 332 additions and 322 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
avmedia/source/framework/mediacontrol.cxx
View File

@ -202,7 +202,7 @@ MediaControl::~MediaControl()
void MediaControl::dispose()
{
maZoomToolBox->SetItemWindow( AVMEDIA_TOOLBOXITEM_ZOOM, NULL );
mpZoomListBox.clear();
mpZoomListBox.disposeAndClear();
maTimeEdit.disposeAndClear();
maZoomToolBox.disposeAndClear();
maVolumeSlider.disposeAndClear();

4
basctl/source/basicide/baside3.cxx
View File

@ -1414,10 +1414,8 @@ DialogWindowLayout::~DialogWindowLayout()
void DialogWindowLayout::dispose()
{
if (pPropertyBrowser)
{
Remove(pPropertyBrowser);
}
pPropertyBrowser.clear();
pPropertyBrowser.disposeAndClear();
pChild.clear();
Layout::dispose();
}

2
chart2/source/controller/dialogs/dlg_ChartType.cxx
View File

@ -60,7 +60,7 @@ ChartTypeDialog::~ChartTypeDialog()
void ChartTypeDialog::dispose()
{
m_pChartTypeTabPage.clear();
m_pChartTypeTabPage.disposeAndClear();
ModalDialog::dispose();
}

4
chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
View File

@ -54,7 +54,7 @@ CreationWizardUnoDlg::CreationWizardUnoDlg( const uno::Reference< uno::XComponen
CreationWizardUnoDlg::~CreationWizardUnoDlg()
{
SolarMutexGuard aSolarGuard;
m_pDialog.clear();
m_pDialog.disposeAndClear();
}
// lang::XServiceInfo
OUString SAL_CALL CreationWizardUnoDlg::getImplementationName()
@ -268,7 +268,7 @@ void SAL_CALL CreationWizardUnoDlg::disposing()
m_xParentWindow.clear();
SolarMutexGuard aSolarGuard;
m_pDialog.clear();
m_pDialog.disposeAndClear();
try
{

8
chart2/source/controller/dialogs/dlg_DataSource.cxx
View File

@ -164,13 +164,11 @@ DataSourceDialog::~DataSourceDialog()
void DataSourceDialog::dispose()
{
m_pRangeChooserTabePage.disposeAndClear();
m_pDataSourceTabPage.disposeAndClear();
if (m_pTabControl)
{
m_nLastPageId = m_pTabControl->GetCurPageId();
}
m_pRangeChooserTabePage.clear();
m_pDataSourceTabPage.clear();
m_pTabControl.clear();
m_pTabControl.disposeAndClear();
m_pBtnOK.clear();
TabDialog::dispose();
}

6
chart2/source/controller/dialogs/dlg_View3D.cxx
View File

@ -71,11 +71,11 @@ View3DDialog::~View3DDialog()
void View3DDialog::dispose()
{
m_pGeometry.disposeAndClear();
m_pAppearance.disposeAndClear();
m_pIllumination.disposeAndClear();
if (m_pTabControl)
m_nLastPageId = m_pTabControl->GetCurPageId();
m_pGeometry.clear();
m_pAppearance.clear();
m_pIllumination.clear();
m_pTabControl.clear();
TabDialog::dispose();
}

2
chart2/source/controller/main/ChartWindow.cxx
View File

@ -83,7 +83,7 @@ void ChartWindow::dispose()
x3DWindowProvider->setWindow(0);
x3DWindowProvider->update();
}
m_pOpenGLWindow.clear();
m_pOpenGLWindow.disposeAndClear();
vcl::Window::dispose();
}

4
cui/source/dialogs/hltpbase.cxx
View File

@ -114,13 +114,15 @@ void SvxHyperlinkTabPageBase::dispose()
{
maTimer.Stop();
mpMarkWnd.disposeAndClear();
mpCbbFrame.clear();
mpLbForm.clear();
mpEdIndication.clear();
mpEdText.clear();
mpBtScript.clear();
mpDialog.clear();
mpMarkWnd.clear();
IconChoicePage::dispose();
}

2
cui/source/dialogs/multipat.cxx
View File

@ -239,7 +239,7 @@ void SvxMultiPathDialog::dispose()
}
}
m_pRadioLB.clear();
m_pRadioLB.disposeAndClear();
m_pAddBtn.clear();
m_pDelBtn.clear();
ModalDialog::dispose();

2
cui/source/options/certpath.cxx
View File

@ -156,8 +156,8 @@ void CertPathDialog::dispose()
delete pCertPath;
pEntry = m_pCertPathList->Next( pEntry );
}
m_pCertPathList.disposeAndClear();
m_pCertPathListContainer.clear();
m_pCertPathList.clear();
m_pAddBtn.clear();
m_pOKBtn.clear();
ModalDialog::dispose();

2
cui/source/options/dbregister.cxx
View File

@ -170,7 +170,7 @@ void DbRegistrationOptionsPage::dispose()
{
for ( sal_uInt16 i = 0; i < pPathBox->GetEntryCount(); ++i )
delete static_cast< DatabaseRegistration* >( pPathBox->GetEntry(i)->GetUserData() );
pPathBox.clear();
pPathBox.disposeAndClear();
m_pPathCtrl.clear();
m_pNew.clear();
m_pEdit.clear();

2
cui/source/options/fontsubs.cxx
View File

@ -147,7 +147,7 @@ void SvxFontSubstTabPage::dispose()
pCheckButtonData = NULL;
delete pConfig;
pConfig = NULL;
m_pCheckLB.clear();
m_pCheckLB.disposeAndClear();
m_pUseTableCB.clear();
m_pReplacements.clear();
m_pFont1CB.clear();

22
cui/source/options/optcolor.cxx
View File

@ -302,6 +302,8 @@ ColorConfigWindow_Impl::Chapter::Chapter(vcl::Window *pGrid,
ColorConfigWindow_Impl::Chapter::~Chapter()
{
// FIXME: we had an horrible m_bOwnsWidget const
m_pText.disposeAndClear();
}
void ColorConfigWindow_Impl::Chapter::Show(Wallpaper const& rBackWall)
@ -368,9 +370,9 @@ ColorConfigWindow_Impl::Entry::~Entry()
{
if (m_bOwnsWidgets)
{
m_pText.clear();
m_pColorList.clear();
m_pPreview.clear();
m_pText.disposeAndClear();
m_pColorList.disposeAndClear();
m_pPreview.disposeAndClear();
}
}
@ -508,9 +510,9 @@ ColorConfigWindow_Impl::ColorConfigWindow_Impl(vcl::Window* pParent)
void ColorConfigWindow_Impl::dispose()
{
disposeBuilder();
m_pGrid.clear();
m_pVScroll.clear();
m_pHeaderHB.clear();
m_pGrid.clear();
m_pVScroll.clear();
m_pHeaderHB.clear();
VclContainer::dispose();
}
@ -918,10 +920,10 @@ ColorConfigCtrl_Impl::~ColorConfigCtrl_Impl()
void ColorConfigCtrl_Impl::dispose()
{
m_pVScroll.clear();
m_pScrollWindow.clear();
m_pBody.clear();
m_pHeaderHB.clear();
m_pVScroll.disposeAndClear();
m_pScrollWindow.disposeAndClear();
m_pBody.disposeAndClear();
m_pHeaderHB.disposeAndClear();
VclVBox::dispose();
}

1
cui/source/options/optinet2.cxx
View File

@ -222,6 +222,7 @@ SvxProxyTabPage::~SvxProxyTabPage()
void SvxProxyTabPage::dispose()
{
mpCertPathDlg.disposeAndClear();
m_pProxyModeLB.clear();
m_pHttpProxyFT.clear();
m_pHttpProxyED.clear();

6
cui/source/options/optjava.cxx
View File

@ -207,7 +207,9 @@ SvxJavaOptionsPage::~SvxJavaOptionsPage()
void SvxJavaOptionsPage::dispose()
{
m_pJavaList.clear();
m_pJavaList.disposeAndClear();
m_pParamDlg.disposeAndClear();
m_pPathDlg.disposeAndClear();
ClearJavaInfo();
#if HAVE_FEATURE_JAVA
std::vector< JavaInfo* >::iterator pIter;
@ -229,8 +231,6 @@ void SvxJavaOptionsPage::dispose()
m_pExpertConfigBtn.clear();
m_pExperimentalCB.clear();
m_pMacroCB.clear();
m_pParamDlg.clear();
m_pPathDlg.clear();
SfxTabPage::dispose();
}

2
cui/source/options/optpath.cxx
View File

@ -256,7 +256,7 @@ void SvxPathTabPage::dispose()
{
for ( sal_uInt16 i = 0; i < pPathBox->GetEntryCount(); ++i )
delete static_cast<PathUserData_Impl*>(pPathBox->GetEntry(i)->GetUserData());
pPathBox.clear();
pPathBox.disposeAndClear();
}
delete pImpl;
pImpl = NULL;

5
cui/source/options/treeopt.cxx
View File

@ -575,6 +575,7 @@ void OfaTreeOptionsDialog::dispose()
SvtViewOptions aTabPageOpt( E_TABPAGE, OUString::number( pPageInfo->m_nPageId) );
SetViewOptUserItem( aTabPageOpt, aPageData );
}
pPageInfo->m_pPage.disposeAndClear();
}
if (pPageInfo->m_nPageId == RID_SFXPAGE_LINGU)
@ -587,6 +588,8 @@ void OfaTreeOptionsDialog::dispose()
}
}
pPageInfo->m_pExtPage.disposeAndClear();
delete pPageInfo;
}
pEntry = pTreeLB->Next(pEntry);
@ -600,7 +603,7 @@ void OfaTreeOptionsDialog::dispose()
{
OptionsGroupInfo* pGroupInfo = static_cast<OptionsGroupInfo*>(pEntry->GetUserData());
if ( pGroupInfo )
pGroupInfo->m_pExtPage.clear();
pGroupInfo->m_pExtPage.disposeAndClear();
delete pGroupInfo;
}
pEntry = pTreeLB->Next(pEntry);

2
cui/source/options/webconninfo.cxx
View File

@ -147,7 +147,7 @@ WebConnectionInfoDialog::~WebConnectionInfoDialog()
void WebConnectionInfoDialog::dispose()
{
m_pPasswordsLB.clear();
m_pPasswordsLB.disposeAndClear();
m_pRemoveBtn.clear();
m_pRemoveAllBtn.clear();
m_pChangeBtn.clear();

4
dbaccess/source/ui/browser/brwview.cxx
View File

@ -122,10 +122,10 @@ UnoDataBrowserView::~UnoDataBrowserView()
void UnoDataBrowserView::dispose()
{
m_pSplitter.clear();
m_pSplitter.disposeAndClear();
setTreeView(NULL);
m_pStatus.clear();
m_pStatus.disposeAndClear();
try
{

6
dbaccess/source/ui/control/FieldDescControl.cxx
View File

@ -83,8 +83,8 @@ namespace
--_nPos;
_pControl->Hide();
_pControlText->Hide();
_pControl.clear();
_pControlText.clear();
_pControl.disposeAndClear();
_pControlText.disposeAndClear();
}
}
@ -1049,7 +1049,7 @@ void OFieldDescControl::DeactivateAggregate( EControlType eType )
if ( pFormatSample )
{
pFormatSample->Hide();
pFormatSample.clear();
pFormatSample.disposeAndClear();
}
break;
case tpBoolDefault:

4
dbaccess/source/ui/control/TableGrantCtrl.cxx
View File

@ -82,8 +82,8 @@ void OTableGrantControl::dispose()
m_nDeactivateEvent = 0;
}
m_pCheckCell.clear();
m_pEdit.clear();
m_pCheckCell.disposeAndClear();
m_pEdit.disposeAndClear();
m_xTables = NULL;
::svt::EditBrowseBox::dispose();

2
dbaccess/source/ui/control/curledit.cxx
View File

@ -46,7 +46,7 @@ OConnectionURLEdit::~OConnectionURLEdit()
void OConnectionURLEdit::dispose()
{
SetSubEdit(nullptr);
m_pForcedPrefix.clear();
m_pForcedPrefix.disposeAndClear();
Edit::dispose();
}

9
dbaccess/source/ui/dlg/ConnectionHelper.cxx
View File

@ -114,10 +114,11 @@ namespace dbaui
void OConnectionHelper::dispose()
{
m_pFT_Connection.clear();
m_pConnectionURL.clear();
m_pPB_Connection.clear();
m_pPB_CreateDB.clear();
// FIXME: used to have an if (m_bDelete) ...
m_pFT_Connection.disposeAndClear();
m_pConnectionURL.disposeAndClear();
m_pPB_Connection.disposeAndClear();
m_pPB_CreateDB.disposeAndClear();
OGenericAdministrationPage::dispose();
}

4
dbaccess/source/ui/dlg/indexfieldscontrol.cxx
View File

@ -115,8 +115,8 @@ namespace dbaui
void IndexFieldsControl::dispose()
{
m_pSortingCell.clear();
m_pFieldNameCell.clear();
m_pSortingCell.disposeAndClear();
m_pFieldNameCell.disposeAndClear();
::svt::EditBrowseBox::dispose();
}

10
dbaccess/source/ui/misc/WCopyTable.cxx
View File

@ -710,11 +710,11 @@ void OCopyTableWizard::dispose()
m_aTypeInfo.clear();
m_aDestTypeInfoIndex.clear();
m_pbHelp.clear();
m_pbCancel.clear();
m_pbPrev.clear();
m_pbNext.clear();
m_pbFinish.clear();
m_pbHelp.disposeAndClear();
m_pbCancel.disposeAndClear();
m_pbPrev.disposeAndClear();
m_pbNext.disposeAndClear();
m_pbFinish.disposeAndClear();
WizardDialog::dispose();
}

1
dbaccess/source/ui/misc/WTypeSelect.cxx
View File

@ -45,7 +45,6 @@ using namespace ::com::sun::star::sdbc;
OWizTypeSelectControl::OWizTypeSelectControl(vcl::Window* pParent, vcl::Window* pParentTabPage, OTableDesignHelpBar* pHelpBar)
: OFieldDescControl(pParent, pHelpBar)
{
m_pParentTabPage = pParentTabPage;
}

4
dbaccess/source/ui/querydesign/JoinDesignView.cxx
View File

@ -66,8 +66,8 @@ OJoinDesignView::~OJoinDesignView()
void OJoinDesignView::dispose()
{
m_pScrollWindow.clear();
m_pTableView.clear();
m_pScrollWindow.disposeAndClear();
m_pTableView.disposeAndClear();
ODataView::dispose();
}

2
dbaccess/source/ui/querydesign/JoinTableView.cxx
View File

@ -96,7 +96,7 @@ void OScrollWindowHelper::dispose()
{
m_aHScrollBar.disposeAndClear();
m_aVScrollBar.disposeAndClear();
m_pCornerWindow.clear();
m_pCornerWindow.disposeAndClear();
m_pTableView.clear();
vcl::Window::dispose();
}

12
dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
View File

@ -158,12 +158,12 @@ OSelectionBrowseBox::~OSelectionBrowseBox()
void OSelectionBrowseBox::dispose()
{
m_pTextCell.clear();
m_pVisibleCell.clear();
m_pFieldCell.clear();
m_pTableCell.clear();
m_pOrderCell.clear();
m_pFunctionCell.clear();
m_pTextCell.disposeAndClear();
m_pVisibleCell.disposeAndClear();
m_pFieldCell.disposeAndClear();
m_pTableCell.disposeAndClear();
m_pOrderCell.disposeAndClear();
m_pFunctionCell.disposeAndClear();
::svt::EditBrowseBox::dispose();
}

2
dbaccess/source/ui/querydesign/limitboxcontroller.cxx
View File

@ -139,7 +139,7 @@ throw (uno::RuntimeException, std::exception)
svt::ToolboxController::dispose();
SolarMutexGuard aSolarMutexGuard;
m_pLimitBox.clear();
m_pLimitBox.disposeAndClear();
}
/// XStatusListener

8
dbaccess/source/ui/tabledesign/TEditControl.cxx
View File

@ -274,10 +274,10 @@ void OTableEditorCtrl::dispose()
Application::RemoveUserEvent( nInvalidateTypeEvent );
// Delete the control types
pNameCell.clear();
pTypeCell.clear();
pDescrCell.clear();
pHelpTextCell.clear();
pNameCell.disposeAndClear();
pTypeCell.disposeAndClear();
pDescrCell.disposeAndClear();
pHelpTextCell.disposeAndClear();
pDescrWin.clear();
OTableRowView::dispose();
}

6
desktop/source/deployment/gui/dp_gui_dialog2.cxx
View File

@ -208,9 +208,9 @@ ExtBoxWithBtns_Impl::~ExtBoxWithBtns_Impl()
void ExtBoxWithBtns_Impl::dispose()
{
m_pOptionsBtn.clear();
m_pEnableBtn.clear();
m_pRemoveBtn.clear();
m_pOptionsBtn.disposeAndClear();
m_pEnableBtn.disposeAndClear();
m_pRemoveBtn.disposeAndClear();
m_pParent.clear();
ExtensionBox_Impl::dispose();
}

6
desktop/source/deployment/gui/dp_gui_extlistbox.cxx
View File

@ -253,13 +253,13 @@ void ExtensionBox_Impl::dispose()
for ( ITER iIndex = m_vEntries.begin(); iIndex < m_vEntries.end(); ++iIndex )
{
(*iIndex)->m_pPublisher.clear();
(*iIndex)->m_pPublisher.disposeAndClear();
(*iIndex)->m_xPackage->removeEventListener( uno::Reference< lang::XEventListener > ( m_xRemoveListener, uno::UNO_QUERY ) );
}
m_vEntries.clear();
m_pScrollBar.clear();
m_pScrollBar.disposeAndClear();
m_xRemoveListener.clear();
@ -435,7 +435,7 @@ void ExtensionBox_Impl::DeleteRemoved()
for ( ITER iIndex = m_vRemovedEntries.begin(); iIndex < m_vRemovedEntries.end(); ++iIndex )
{
(*iIndex)->m_pPublisher.clear();
(*iIndex)->m_pPublisher.disposeAndClear();
}
m_vRemovedEntries.clear();

10
desktop/source/deployment/gui/dp_gui_theextmgr.cxx
View File

@ -169,7 +169,7 @@ sal_Int16 TheExtensionManager::execute()
if ( m_pUpdReqDialog )
{
nRet = m_pUpdReqDialog->Execute();
m_pUpdReqDialog.clear();
m_pUpdReqDialog.disposeAndClear();
}
return nRet;
@ -256,8 +256,8 @@ void TheExtensionManager::terminateDialog()
if ( ! dp_misc::office_is_running() )
{
const SolarMutexGuard guard;
m_pExtMgrDialog.clear();
m_pUpdReqDialog.clear();
m_pExtMgrDialog.disposeAndClear();
m_pUpdReqDialog.disposeAndClear();
Application::Quit();
}
}
@ -421,8 +421,8 @@ void TheExtensionManager::disposing( lang::EventObject const & rEvt )
if ( dp_misc::office_is_running() )
{
const SolarMutexGuard guard;
m_pExtMgrDialog.clear();
m_pUpdReqDialog.clear();
m_pExtMgrDialog.disposeAndClear();
m_pUpdReqDialog.disposeAndClear();
}
s_ExtMgr.clear();
}

2
desktop/source/deployment/gui/dp_gui_updatedialog.cxx
View File

@ -579,11 +579,11 @@ void UpdateDialog::dispose()
{
delete (*i);
}
m_pUpdates.disposeAndClear();
m_pchecking.clear();
m_pthrobber.clear();
m_pUpdate.clear();
m_pContainer.clear();
m_pUpdates.clear();
m_pAll.clear();
m_pDescription.clear();
m_pPublisherLabel.clear();

11
extensions/source/bibliography/bibbeam.cxx
View File

@ -217,17 +217,10 @@ namespace bib
if ( pToolBar )
{
pDatMan->SetToolbar(0);
pToolBar.disposeAndClear();
}
if( pGridWin )
{
BibGridwin* pDel = pGridWin;
pGridWin.clear();
pDel->disposeGridWin();
delete pDel;
}
pToolBar.clear();
pGridWin.clear();
pGridWin.disposeAndClear();
BibSplitWindow::dispose();
}

4
extensions/source/bibliography/bibcont.cxx
View File

@ -181,7 +181,7 @@ void BibBookContainer::createTopFrame( BibShortCutHandler* pWin )
if(pTopWin)
{
RemoveItem(TOP_WINDOW);
pTopWin.clear();
pTopWin.disposeAndClear();
}
pTopWin=new BibWindowContainer(this,pWin);
pTopWin->Show();
@ -198,7 +198,7 @@ void BibBookContainer::createBottomFrame( BibShortCutHandler* pWin )
if(pBottomWin)
{
RemoveItem(BOTTOM_WINDOW);
pBottomWin.clear();
pBottomWin.disposeAndClear();
}
pBottomWin=new BibWindowContainer(this,pWin);

2
extensions/source/propctrlr/browserline.cxx
View File

@ -448,7 +448,7 @@ namespace pcr
if ( rpButton )
{
rpButton->Hide();
rpButton.clear();
rpButton.disposeAndClear();
}
if ( _bReLayout )

2
filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
View File

@ -266,7 +266,7 @@ void SAL_CALL XMLFilterDialogComponent::disposing()
{
::SolarMutexGuard aGuard;
mpDialog.clear();
mpDialog.disposeAndClear();
if (pXSLTResMgr)
{

6
filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
View File

@ -1421,9 +1421,9 @@ SvxPathControl::~SvxPathControl()
void SvxPathControl::dispose()
{
m_pVBox.clear();
m_pFocusCtrl.clear();
m_pHeaderBar.clear();
m_pFocusCtrl.disposeAndClear();
m_pHeaderBar.disposeAndClear();
m_pVBox.disposeAndClear();
vcl::Window::dispose();
}

4
filter/source/xsltdialog/xmlfiltertabdialog.cxx
View File

@ -80,8 +80,8 @@ XMLFilterTabDialog::~XMLFilterTabDialog()
void XMLFilterTabDialog::dispose()
{
mpBasicPage.clear();
mpXSLTPage.clear();
mpBasicPage.disposeAndClear();
mpXSLTPage.disposeAndClear();
delete mpNewInfo;
m_pTabCtrl.clear();
m_pOKBtn.clear();

16
forms/source/richtext/richtextimplcontrol.cxx
View File

@ -91,10 +91,10 @@ namespace frm
m_pEngine->RemoveView( m_pView );
m_pEngine->revokeEngineStatusListener( this );
delete m_pView;
m_pViewport.clear();
m_pHScroll.clear();
m_pVScroll.clear();
m_pScrollCorner.clear();
m_pViewport.disposeAndClear();
m_pHScroll.disposeAndClear();
m_pVScroll.disposeAndClear();
m_pScrollCorner.disposeAndClear();
}
@ -344,7 +344,7 @@ namespace frm
// create or delete the scrollbars, as necessary
if ( !bNeedVScroll )
{
m_pVScroll.clear();
m_pVScroll.disposeAndClear();
}
else
{
@ -355,7 +355,7 @@ namespace frm
if ( !bNeedHScroll )
{
m_pHScroll.clear();
m_pHScroll.disposeAndClear();
}
else
{
@ -366,13 +366,13 @@ namespace frm
if ( m_pHScroll && m_pVScroll )
{
m_pScrollCorner.clear();
m_pScrollCorner.disposeAndClear();
m_pScrollCorner = new ScrollBarBox( m_pAntiImpl );
m_pScrollCorner->Show();
}
else
{
m_pScrollCorner.clear();
m_pScrollCorner.disposeAndClear();
}
layoutWindow();

6
formula/source/ui/dlg/formula.cxx
View File

@ -364,9 +364,9 @@ FormulaDlg_Impl::~FormulaDlg_Impl()
m_pTabCtrl->RemovePage(TP_FUNCTION);
m_pTabCtrl->RemovePage(TP_STRUCT);
pStructPage.clear();
pFuncPage.clear();
pParaWin.clear();
pStructPage.disposeAndClear();
pFuncPage.disposeAndClear();
pParaWin.disposeAndClear();
DeleteArgs();
}

8
fpicker/source/office/PlacesListBox.cxx
View File

@ -48,7 +48,7 @@ PlacesListBox_Impl::~PlacesListBox_Impl( )
void PlacesListBox_Impl::dispose()
{
mpHeaderBar.clear();
mpHeaderBar.disposeAndClear();
mpParent.clear();
SvHeaderTabListBox::dispose();
}
@ -93,9 +93,9 @@ PlacesListBox::~PlacesListBox( )
void PlacesListBox::dispose()
{
mpImpl.clear();
mpAddBtn.clear();
mpDelBtn.clear();
mpImpl.disposeAndClear();
mpAddBtn.disposeAndClear();
mpDelBtn.disposeAndClear();
mpDlg.clear();
Control::dispose();
}

2
fpicker/source/office/commonpicker.cxx
View File

@ -123,7 +123,7 @@ namespace svt
m_pDlg->EndDialog( RET_CANCEL );
}
m_pDlg.clear();
m_pDlg.disposeAndClear();
m_xWindow = NULL;
m_xDialogParent = NULL;
}

8
fpicker/source/office/iodlg.cxx
View File

@ -449,10 +449,10 @@ void SvtFileDialog::dispose()
}
delete _pImp;
_pFileView.clear();
_pSplitter.clear();
_pContainer.clear();
_pPrevBmp.clear();
_pFileView.disposeAndClear();
_pSplitter.disposeAndClear();
_pContainer.disposeAndClear();
_pPrevBmp.disposeAndClear();
_pCbReadOnly.clear();
_pCbLinkBox.clear();
_pCbPreviewBox.clear();

4
fpicker/source/office/iodlgimp.cxx
View File

@ -251,10 +251,10 @@ SvtExpFileDlg_Impl::SvtExpFileDlg_Impl( WinBits ) :
SvtExpFileDlg_Impl::~SvtExpFileDlg_Impl()
{
_pBtnUp.clear();
_pBtnUp.disposeAndClear();
delete _pUserFilter;
delete _pFilter;
_pPlaces.clear();
_pPlaces.disposeAndClear();
}

1
framework/inc/classes/fwktabwindow.hxx
View File

@ -87,6 +87,7 @@ struct TabEntry
TabEntry( sal_Int32 nIndex, const OUString& sURL, const css::uno::Reference< css::awt::XContainerWindowEventHandler > & rEventHdl ) :
m_nIndex( nIndex ), m_pPage( NULL ), m_sPageURL( sURL ), m_xEventHdl( rEventHdl ) {}
~TabEntry() { m_pPage.disposeAndClear(); }
};
typedef std::vector< TabEntry* > TabEntryList;

2
framework/source/helper/vclstatusindicator.cxx
View File

@ -91,7 +91,7 @@ void SAL_CALL VCLStatusIndicator::end()
m_pStatusBar->EndProgressMode();
m_pStatusBar->Show(false);
m_pStatusBar.clear();
m_pStatusBar.disposeAndClear();
}
}

2
framework/source/uielement/comboboxtoolbarcontroller.cxx
View File

@ -171,7 +171,7 @@ throw ( RuntimeException, std::exception )
SolarMutexGuard aSolarMutexGuard;
m_pToolbar->SetItemWindow( m_nID, 0 );
m_pComboBox.clear();
m_pComboBox.disposeAndClear();
ComplexToolbarController::dispose();
}

2
framework/source/uielement/dropdownboxtoolbarcontroller.cxx
View File

@ -155,7 +155,7 @@ throw ( RuntimeException, std::exception )
SolarMutexGuard aSolarMutexGuard;
m_pToolbar->SetItemWindow( m_nID, 0 );
m_pListBoxControl.clear();
m_pListBoxControl.disposeAndClear();
ComplexToolbarController::dispose();
}

2
framework/source/uielement/edittoolbarcontroller.cxx
View File

@ -152,7 +152,7 @@ throw ( RuntimeException, std::exception )
SolarMutexGuard aSolarMutexGuard;
m_pToolbar->SetItemWindow( m_nID, 0 );
m_pEditControl.clear();
m_pEditControl.disposeAndClear();
ComplexToolbarController::dispose();
}

2
framework/source/uielement/spinfieldtoolbarcontroller.cxx
View File

@ -213,7 +213,7 @@ throw ( RuntimeException, std::exception )
SolarMutexGuard aSolarMutexGuard;
m_pToolbar->SetItemWindow( m_nID, 0 );
m_pSpinfieldControl.clear();
m_pSpinfieldControl.disposeAndClear();
ComplexToolbarController::dispose();
}

2
framework/source/uielement/statusbarmanager.cxx
View File

@ -214,7 +214,7 @@ void SAL_CALL StatusBarManager::dispose() throw( uno::RuntimeException, std::exc
delete pUserData;
}
m_pStatusBar.clear();
m_pStatusBar.disposeAndClear();
if ( m_bFrameActionRegistered && m_xFrame.is() )
{

4
include/vcl/layout.hxx
View File

@ -522,8 +522,8 @@ public:
m_pDisclosureButton->SetToggleHdl(LINK(this, VclExpander, ClickHdl));
m_pDisclosureButton->Show();
}
virtual ~VclExpander() { dispose(); }
void dispose() SAL_OVERRIDE { m_pDisclosureButton.clear(); VclBin::dispose(); }
virtual ~VclExpander() { disposeOnce(); }
virtual void dispose() SAL_OVERRIDE { m_pDisclosureButton.disposeAndClear(); VclBin::dispose(); }
virtual vcl::Window *get_child() SAL_OVERRIDE;
virtual const vcl::Window *get_child() const SAL_OVERRIDE;
virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE;

2
reportdesign/source/ui/dlg/Condition.cxx
View File

@ -330,7 +330,7 @@ void Condition::dispose()
m_pMoveDown.clear();
m_pAddCondition.clear();
m_pRemoveCondition.clear();
m_pColorFloat.clear();
m_pColorFloat.disposeAndClear();
VclHBox::dispose();
}

4
reportdesign/source/ui/dlg/GroupsSorting.cxx
View File

@ -230,7 +230,7 @@ void OFieldExpressionControl::dispose()
if( m_nDeleteEvent )
Application::RemoveUserEvent( m_nDeleteEvent );
m_pComboCell.clear();
m_pComboCell.disposeAndClear();
m_pParent.clear();
::svt::EditBrowseBox::dispose();
}
@ -1028,7 +1028,7 @@ void OGroupsSortingDialog::dispose()
m_pGroupIntervalEd.clear();
m_pKeepTogetherLst.clear();
m_pHelpWindow.clear();
m_pFieldExpression.clear();
m_pFieldExpression.disposeAndClear();
FloatingWindow::dispose();
}

2
sc/source/ui/attrdlg/scdlgfact.hxx
View File

@ -80,7 +80,7 @@ public: \
Class::~Class() \
{ \
} \
short Class::Execute() \
short Class::Execute() \
{ \
return pDlg->Execute(); \
}

2
sc/source/ui/condformat/condformatmgr.cxx
View File

@ -142,7 +142,7 @@ void ScCondFormatManagerDlg::dispose()
m_pBtnAdd.clear();
m_pBtnRemove.clear();
m_pBtnEdit.clear();
m_pCtrlManager.clear();
m_pCtrlManager.disposeAndClear();
ModalDialog::dispose();
}

2
sc/source/ui/dialogs/searchresults.cxx
View File

@ -46,7 +46,7 @@ SearchResultsDlg::~SearchResultsDlg()
void SearchResultsDlg::dispose()
{
mpList.clear();
mpList.disposeAndClear();
ModelessDialog::dispose();
}

2
sc/source/ui/miscdlgs/acredlin.cxx
View File

@ -168,7 +168,7 @@ void ScAcceptChgDlg::dispose()
pChanges->SetModifiedLink(aLink);
}
m_pAcceptChgCtr.clear();
m_pAcceptChgCtr.disposeAndClear();
pTPFilter.clear();
pTPView.clear();
pTheView.clear();

2
sc/source/ui/miscdlgs/highred.cxx
View File

@ -75,7 +75,7 @@ ScHighlightChgDlg::~ScHighlightChgDlg()
void ScHighlightChgDlg::dispose()
{
SetDispatcherLock( false );
m_pFilterCtr.clear();
m_pFilterCtr.disposeAndClear();
m_pHighlightBox.clear();
m_pCbAccept.clear();
m_pCbReject.clear();

2
sc/source/ui/miscdlgs/sharedocdlg.cxx
View File

@ -113,7 +113,7 @@ ScShareDocumentDlg::~ScShareDocumentDlg()
void ScShareDocumentDlg::dispose()
{
m_pLbUsers.clear();
m_pLbUsers.disposeAndClear();
m_pCbShare.clear();
m_pFtWarning.clear();
ModalDialog::dispose();

2
sc/source/ui/namedlg/namedlg.cxx
View File

@ -107,7 +107,7 @@ ScNameDlg::~ScNameDlg()
void ScNameDlg::dispose()
{
m_pRangeManagerTable.clear();
m_pRangeManagerTable.disposeAndClear();
m_pEdName.clear();
m_pEdAssign.clear();
m_pRbAssign.clear();

2
sc/source/ui/namedlg/namepast.cxx
View File

@ -70,10 +70,10 @@ ScNamePasteDlg::~ScNamePasteDlg()
void ScNamePasteDlg::dispose()
{
mpTable.disposeAndClear();
m_pBtnPasteAll.clear();
m_pBtnPaste.clear();
m_pBtnClose.clear();
mpTable.clear();
ModalDialog::dispose();
}

8
sc/source/ui/view/prevwsh.cxx
View File

@ -196,10 +196,10 @@ ScPreviewShell::~ScPreviewShell()
EndListening(*pDocShell);
SetWindow(0);
pPreview.clear();
pHorScroll.clear();
pVerScroll.clear();
pCorner.clear();
pPreview.disposeAndClear();
pHorScroll.disposeAndClear();
pVerScroll.disposeAndClear();
pCorner.disposeAndClear();
// normal mode of operation is switching back to default view in the same frame,
// so there's no need to activate any other window here anymore

6
sc/source/ui/view/tabview5.cxx
View File

@ -190,9 +190,9 @@ ScTabView::~ScTabView()
delete pRowOutline[i];
}
pHSplitter.clear();
pVSplitter.clear();
pTabControl.clear();
pHSplitter.disposeAndClear();
pVSplitter.disposeAndClear();
pTabControl.disposeAndClear();
}
void ScTabView::MakeDrawView( sal_uInt8 nForceDesignMode )

24
sd/source/ui/animations/CustomAnimationDialog.cxx
View File

@ -159,7 +159,7 @@ void PresetPropertyBox::setValue( const Any& rValue, const OUString& rPresetId )
PresetPropertyBox::~PresetPropertyBox()
{
mpControl.clear();
mpControl.disposeAndClear();
}
Any PresetPropertyBox::getValue()
@ -219,7 +219,7 @@ ColorPropertyBox::ColorPropertyBox( sal_Int32 nControlType, vcl::Window* pParent
ColorPropertyBox::~ColorPropertyBox()
{
mpControl.clear();
mpControl.disposeAndClear();
}
void ColorPropertyBox::setValue( const Any& rValue, const OUString& )
@ -303,7 +303,7 @@ void FontPropertyBox::setValue( const Any& rValue, const OUString& )
FontPropertyBox::~FontPropertyBox()
{
mpControl.clear();
mpControl.disposeAndClear();
}
Any FontPropertyBox::getValue()
@ -357,7 +357,7 @@ DropdownMenuBox::~DropdownMenuBox()
void DropdownMenuBox::dispose()
{
SetSubEdit(nullptr);
mpDropdownButton.clear();
mpDropdownButton.disposeAndClear();
delete mpMenu;
mpSubControl.disposeAndClear();
Edit::dispose();
@ -437,7 +437,7 @@ CharHeightPropertyBox::CharHeightPropertyBox( sal_Int32 nControlType, vcl::Windo
CharHeightPropertyBox::~CharHeightPropertyBox()
{
mpControl.clear();
mpControl.disposeAndClear();
}
IMPL_LINK( CharHeightPropertyBox, implMenuSelectHdl, MenuButton*, pPb )
@ -528,7 +528,7 @@ TransparencyPropertyBox::TransparencyPropertyBox( sal_Int32 nControlType, vcl::W
TransparencyPropertyBox::~TransparencyPropertyBox()
{
mpControl.clear();
mpControl.disposeAndClear();
}
void TransparencyPropertyBox::updateMenu()
@ -626,7 +626,7 @@ RotationPropertyBox::RotationPropertyBox( sal_Int32 nControlType, vcl::Window* p
RotationPropertyBox::~RotationPropertyBox()
{
mpControl.clear();
mpControl.disposeAndClear();
}
void RotationPropertyBox::updateMenu()
@ -751,7 +751,7 @@ ScalePropertyBox::ScalePropertyBox( sal_Int32 nControlType, vcl::Window* pParent
ScalePropertyBox::~ScalePropertyBox()
{
mpControl.clear();
mpControl.disposeAndClear();
}
void ScalePropertyBox::updateMenu()
@ -911,7 +911,7 @@ FontStylePropertyBox::FontStylePropertyBox( sal_Int32 nControlType, vcl::Window*
FontStylePropertyBox::~FontStylePropertyBox()
{
mpControl.clear();
mpControl.disposeAndClear();
}
void FontStylePropertyBox::update()
@ -2212,9 +2212,9 @@ CustomAnimationDialog::~CustomAnimationDialog()
void CustomAnimationDialog::dispose()
{
mpEffectTabPage.clear();
mpDurationTabPage.clear();
mpTextAnimTabPage.clear();
mpEffectTabPage.disposeAndClear();
mpDurationTabPage.disposeAndClear();
mpTextAnimTabPage.disposeAndClear();
delete mpSet;
delete mpResultSet;

2
sd/source/ui/dlg/animobjs.cxx
View File

@ -224,7 +224,7 @@ void AnimationWindow::dispose()
// delete the clones
delete pMyDoc;
m_pCtlDisplay.clear();
m_pCtlDisplay.disposeAndClear();
m_pBtnFirst.clear();
m_pBtnReverse.clear();
m_pBtnStop.clear();

2
sd/source/ui/dlg/brkdlg.cxx
View File

@ -72,6 +72,8 @@ BreakDlg::~BreakDlg()
void BreakDlg::dispose()
{
mpProgress.disposeAndClear();
pProgrInfo.disposeAndClear();
m_pFiObjInfo.clear();
m_pFiActInfo.clear();
m_pFiInsInfo.clear();

4
sd/source/ui/dlg/headerfooterdlg.cxx
View File

@ -246,8 +246,8 @@ HeaderFooterDialog::~HeaderFooterDialog()
void HeaderFooterDialog::dispose()
{
mpSlideTabPage.clear();
mpNotesHandoutsTabPage.clear();
mpSlideTabPage.disposeAndClear();
mpNotesHandoutsTabPage.disposeAndClear();
mpTabCtrl.clear();
maPBApplyToAll.clear();
maPBApply.clear();

2
sd/source/ui/framework/factories/FullScreenPane.cxx
View File

@ -103,7 +103,7 @@ FullScreenPane::~FullScreenPane (void) throw()
void SAL_CALL FullScreenPane::disposing (void)
{
mpWindow.clear();
mpWindow.disposeAndClear();
if (mpWorkWindow.get() != NULL)
{

5
sd/source/ui/slideshow/slideshowimpl.cxx
View File

@ -705,13 +705,12 @@ void SAL_CALL SlideshowImpl::disposing()
}
if( mpTimeButton )
{
mpTimeButton->Hide();
mpTimeButton.clear();
}
mpTimeButton.disposeAndClear();
if( mpShowWindow )
mpShowWindow->Hide();
mpShowWindow.disposeAndClear();
if ( mpViewShell )
{

4
sfx2/source/appl/newhelp.cxx
View File

@ -1977,11 +1977,11 @@ void SfxHelpTextWindow_Impl::dispose()
bIsInClose = true;
SvtMiscOptions().RemoveListenerLink( LINK( this, SfxHelpTextWindow_Impl, NotifyHdl ) );
pSrchDlg.clear();
pSrchDlg.disposeAndClear();
aToolBox.disposeAndClear();
aOnStartupCB.disposeAndClear();
pHelpWin.clear();
pTextWin.clear();
pTextWin.disposeAndClear();
vcl::Window::dispose();
}

2
sfx2/source/control/thumbnailview.cxx
View File

@ -78,7 +78,7 @@ void ThumbnailView::dispose()
if (xComponent.is())
xComponent->dispose ();
mpScrBar.clear();
mpScrBar.disposeAndClear();
delete mpItemAttrs;
delete mpProcessor;

2
sfx2/source/dialog/basedlgs.cxx
View File

@ -730,7 +730,7 @@ void SfxSingleTabDialog::SetTabPage(SfxTabPage* pTabPage,
{
SetUniqId(nSettingsId);
pImpl->m_pSfxPage.clear();
pImpl->m_pSfxPage.disposeAndClear();
pImpl->m_pSfxPage = pTabPage;
fnGetRanges = pRangesFunc;

2
sfx2/source/dialog/dockwin.cxx
View File

@ -258,7 +258,7 @@ SfxTitleDockingWindow::~SfxTitleDockingWindow()
void SfxTitleDockingWindow::dispose()
{
m_pWrappedWindow.clear();
m_pWrappedWindow.disposeAndClear();
SfxDockingWindow::dispose();
}

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

@ -409,6 +409,16 @@ void SfxTabDialog::dispose()
delete pExampleSet;
delete [] pRanges;
if (m_bOwnsBaseFmtBtn)
m_pBaseFmtBtn.disposeAndClear()
if (m_bOwnsResetBtn)
m_pResetBtn.disposeAndClear()
if (m_bOwnsHelpBtn)
m_pHelpBtn.disposeAndClear()
if (m_bOwnsCancelBtn)
m_pCancelBtn.disposeAndClear()
if (m_bOwnsOKBtn)
m_pOKBtn.disposeAndClear()
m_pBox.clear();
m_pTabCtrl.clear();
m_pOKBtn.clear();

2
sfx2/source/dialog/templdlg.cxx
View File

@ -1531,7 +1531,7 @@ void SfxCommonTemplateDialog_Impl::EnableHierarchical(bool const bEnable)
}
else
{
pTreeBox.clear();
pTreeBox.disposeAndClear();
aFmtLb->Show();
// If bHierarchical, then the family can have changed
// minus one since hierarchical is inserted at the start

4
sfx2/source/dialog/versdlg.cxx
View File

@ -335,7 +335,7 @@ SfxVersionDialog::~SfxVersionDialog()
void SfxVersionDialog::dispose()
{
delete m_pTable;
m_pVersionBox.clear();
m_pVersionBox.disposeAndClear();
m_pSaveButton.clear();
m_pSaveCheckBox.clear();
m_pOpenButton.clear();
@ -592,7 +592,7 @@ SfxCmisVersionsDialog::~SfxCmisVersionsDialog()
void SfxCmisVersionsDialog::dispose()
{
delete m_pTable;
m_pVersionBox.clear();
m_pVersionBox.disposeAndClear();
m_pOpenButton.clear();
m_pViewButton.clear();
m_pDeleteButton.clear();

2
sfx2/source/sidebar/SidebarPanelBase.cxx
View File

@ -81,7 +81,7 @@ SidebarPanelBase::~SidebarPanelBase (void)
void SAL_CALL SidebarPanelBase::disposing (void)
throw (css::uno::RuntimeException)
{
mpControl.clear();
mpControl.disposeAndClear();
if (mxFrame.is())
{

8
sfx2/source/toolbox/tbxitem.cxx
View File

@ -209,7 +209,7 @@ IMPL_LINK( SfxToolBoxControl_Impl, WindowEventListener, VclSimpleEvent*, pEvent
if (( pWindow == mpFloatingWindow ) &&
( mpPopupWindow != nullptr ))
{
mpPopupWindow.clear();
mpPopupWindow.disposeAndClear();
}
}
@ -291,8 +291,8 @@ void SAL_CALL SfxToolBoxControl::dispose() throw (::com::sun::star::uno::Runtime
pImpl->mxUIElement = 0;
// Delete my popup windows
pImpl->mpFloatingWindow.clear();
pImpl->mpPopupWindow.clear();
pImpl->mpFloatingWindow.disposeAndClear();
pImpl->mpPopupWindow.disposeAndClear();
}
@ -862,7 +862,7 @@ IMPL_LINK_NOARG(SfxToolBoxControl, PopupModeEndHdl)
{
// Replace floating window with popup window and destroy
// floating window instance.
pImpl->mpFloatingWindow.clear();
pImpl->mpFloatingWindow.disposeAndClear();
pImpl->mpFloatingWindow = pImpl->mpPopupWindow;
pImpl->mpPopupWindow.clear();
// We also need to know when the user tries to use the

2
sfx2/source/view/printer.cxx
View File

@ -235,7 +235,7 @@ SfxPrintOptionsDialog::~SfxPrintOptionsDialog()
void SfxPrintOptionsDialog::dispose()
{
delete pDlgImpl;
pPage.clear();
pPage.disposeAndClear();
delete pOptions;
ModalDialog::dispose();
}

2
starmath/source/ElementsDockingWindow.cxx
View File

@ -676,7 +676,7 @@ SmElementsDockingWindow::~SmElementsDockingWindow ()
void SmElementsDockingWindow::dispose()
{
mpElementsControl.clear();
mpElementsControl.disposeAndClear();
mpElementListBox.clear();
SfxDockingWindow::dispose();
}

6
starmath/source/edit.cxx
View File

@ -156,9 +156,9 @@ void SmEditWindow::dispose()
pEditView = NULL;
}
pHScrollBar.clear();
pVScrollBar.clear();
pScrollBox.clear();
pHScrollBar.disposeAndClear();
pVScrollBar.disposeAndClear();
pScrollBox.disposeAndClear();
vcl::Window::dispose();
}

5
starmath/source/toolbox.cxx
View File

@ -146,9 +146,8 @@ void SmToolBoxWindow::dispose()
{
int i;
for (i = 0; i < NUM_TBX_CATEGORIES; ++i)
{
vToolBoxCategories[i].clear();
}
vToolBoxCategories[i].disposeAndClear();
pToolBoxCmd = 0;
for (i = 0; i < NUM_TBX_CATEGORIES + 1; ++i)
{

10
svtools/source/brwbox/brwbox1.cxx
View File

@ -153,10 +153,10 @@ void BrowseBox::dispose()
}
Hide();
getDataWindow()->pHeaderBar.clear();
getDataWindow()->pCornerWin.clear();
getDataWindow()->pHeaderBar.disposeAndClear();
getDataWindow()->pCornerWin.disposeAndClear();
pDataWin.clear();
pVScroll.clear();
pVScroll.disposeAndClear();
aHScroll.disposeAndClear();
// free columns-space
@ -2255,7 +2255,7 @@ void BrowseBox::SetMode( BrowserMode nMode )
MultiSelection *pOldRowSel = bMultiSelection ? uRow.pSel : 0;
MultiSelection *pOldColSel = pColSel;
pVScroll.clear();
pVScroll.disposeAndClear();
bThumbDragging = ( nMode & BROWSER_THUMBDRAGGING ) == BROWSER_THUMBDRAGGING;
bMultiSelection = ( nMode & BROWSER_MULTISELECTION ) == BROWSER_MULTISELECTION;
@ -2408,7 +2408,7 @@ BrowserHeader* BrowseBox::CreateHeaderBar( BrowseBox* pParent )
void BrowseBox::SetHeaderBar( BrowserHeader* pHeaderBar )
{
static_cast<BrowserDataWin*>( pDataWin.get() )->pHeaderBar.clear();
static_cast<BrowserDataWin*>( pDataWin.get() )->pHeaderBar.disposeAndClear();
static_cast<BrowserDataWin*>( pDataWin.get() )->pHeaderBar = pHeaderBar;
static_cast<BrowserDataWin*>( pDataWin.get() )->pHeaderBar->SetStartDragHdl( LINK( this, BrowseBox, StartDragHdl ) );
}

2
svtools/source/brwbox/ebbcontrols.cxx
View File

@ -254,7 +254,7 @@ namespace svt
void CheckBoxControl::dispose()
{
pBox.clear();
pBox.disposeAndClear();
Control::dispose();
}

2
svtools/source/brwbox/editbrowsebox.cxx
View File

@ -195,7 +195,7 @@ namespace svt
if (nCellModifiedEvent)
Application::RemoveUserEvent(nCellModifiedEvent);
pCheckBoxPaint.clear();
pCheckBoxPaint.disposeAndClear();
m_pFocusWhileRequest.clear();
pHeader.clear();
BrowseBox::dispose();

2
svtools/source/contnr/fileview.cxx
View File

@ -642,7 +642,7 @@ void ViewTabListBox_Impl::dispose()
{
maResetQuickSearch.Stop();
mpHeaderBar.clear();
mpHeaderBar.disposeAndClear();
SvHeaderTabListBox::dispose();
}

2
svtools/source/contnr/treelistbox.cxx
View File

@ -166,7 +166,7 @@ SvInplaceEdit2::~SvInplaceEdit2()
Application::RemoveAccel( &aAccReturn );
Application::RemoveAccel( &aAccEscape );
}
pEdit.clear();
pEdit.disposeAndClear();
}
OUString SvInplaceEdit2::GetSavedValue() const

16
svtools/source/control/calendar.cxx
View File

@ -2229,9 +2229,9 @@ ImplCFieldFloatWin::~ImplCFieldFloatWin()
void ImplCFieldFloatWin::dispose()
{
mpTodayBtn.clear();
mpNoneBtn.clear();
mpFixedLine.clear();
mpTodayBtn.disposeAndClear();
mpNoneBtn.disposeAndClear();
mpFixedLine.disposeAndClear();
mpCalendar.clear();
FloatingWindow::dispose();
}
@ -2258,7 +2258,7 @@ PushButton* ImplCFieldFloatWin::EnableTodayBtn( bool bEnable )
}
else
{
mpTodayBtn.clear();
mpTodayBtn.disposeAndClear();
}
return mpTodayBtn;
@ -2286,7 +2286,7 @@ PushButton* ImplCFieldFloatWin::EnableNoneBtn( bool bEnable )
}
else
{
mpNoneBtn.clear();
mpNoneBtn.disposeAndClear();
}
return mpNoneBtn;
@ -2350,7 +2350,7 @@ void ImplCFieldFloatWin::ArrangeButtons()
}
else
{
mpFixedLine.clear();
mpFixedLine.disposeAndClear();
}
}
@ -2388,8 +2388,8 @@ CalendarField::~CalendarField()
void CalendarField::dispose()
{
mpCalendar.clear();
mpFloatWin.clear();
mpCalendar.disposeAndClear();
mpFloatWin.disposeAndClear();
mpTodayBtn.clear();
mpNoneBtn.clear();
DateField::dispose();

2
svtools/source/control/toolbarmenu.cxx
View File

@ -129,7 +129,7 @@ ToolbarMenuEntry::~ToolbarMenuEntry()
xComponent->dispose();
mxAccContext.clear();
}
mpControl.clear();
mpControl.disposeAndClear();
}

10
svtools/source/dialogs/wizardmachine.cxx
View File

@ -207,11 +207,11 @@ namespace svt
void OWizardMachine::dispose()
{
m_pFinish.clear();
m_pCancel.clear();
m_pNextPage.clear();
m_pPrevPage.clear();
m_pHelp.clear();
m_pFinish.disposeAndClear();
m_pCancel.disposeAndClear();
m_pNextPage.disposeAndClear();
m_pPrevPage.disposeAndClear();
m_pHelp.disposeAndClear();
for (WizardState i=0; i<m_pImpl->nFirstUnknownPage; ++i)
delete GetPage(i);

2
svtools/source/uno/genericunodialog.cxx
View File

@ -313,7 +313,7 @@ void SAL_CALL OGenericUnoDialog::initialize( const Sequence< Any >& aArguments )
void OGenericUnoDialog::destroyDialog()
{
m_pDialog.clear();
m_pDialog.disposeAndClear();
}

10
svx/source/dialog/_bmpmask.cxx
View File

@ -491,11 +491,11 @@ SvxBmpMask::~SvxBmpMask()
void SvxBmpMask::dispose()
{
m_pQSet1.clear();
m_pQSet2.clear();
m_pQSet3.clear();
m_pQSet4.clear();
m_pCtlPipette.clear();
m_pQSet1.disposeAndClear();
m_pQSet2.disposeAndClear();
m_pQSet3.disposeAndClear();
m_pQSet4.disposeAndClear();
m_pCtlPipette.disposeAndClear();
delete pData;
m_pTbxPipette.clear();
m_pBtnExec.clear();

2
svx/source/dialog/_contdlg.cxx
View File

@ -301,7 +301,7 @@ void SvxSuperContourDlg::dispose()
{
SvtMiscOptions aMiscOptions;
aMiscOptions.RemoveListenerLink( LINK(this, SvxSuperContourDlg, MiscHdl) );
m_pContourWnd.clear();
m_pContourWnd.disposeAndClear();
m_pTbx1.clear();
m_pMtfTolerance.clear();
m_pStbStatus.clear();

6
svx/source/dialog/ctredlin.cxx
View File

@ -423,7 +423,7 @@ SvxTPView::~SvxTPView()
void SvxTPView::dispose()
{
m_pViewData.clear();
m_pViewData.disposeAndClear();
m_pAccept.clear();
m_pReject.clear();
m_pAcceptAll.clear();
@ -1119,8 +1119,8 @@ SvxAcceptChgCtr::~SvxAcceptChgCtr()
void SvxAcceptChgCtr::dispose()
{
disposeBuilder();
pTPFilter.clear();
pTPView.clear();
pTPView.disposeAndClear();
pTPFilter.disposeAndClear();
TabControl::dispose();
}

9
svx/source/dialog/fontwork.cxx
View File

@ -163,14 +163,7 @@ SvxFontWorkChildWindow::SvxFontWorkChildWindow
SfxChildWindow( _pParent, nId )
{
<<<<<<< HEAD
SvxFontWorkDialog* pDlg = new SvxFontWorkDialog(pBindings, this, _pParent);
pWindow = pDlg;
=======
pWindow = new SvxFontWorkDialog( pBindings, this, _pParent,
SVX_RES( RID_SVXDLG_FONTWORK ) );
SvxFontWorkDialog* pDlg = static_cast<SvxFontWorkDialog*>(pWindow.get());
>>>>>>> 765a16f... vclwidget: change all vcl::window fields to be wrapped in VclPtr
pWindow = VclPtrInstance<SvxFontWorkDialog>(pBindings, this, _pParent);
eChildAlignment = SfxChildAlignment::NOALIGNMENT;

2
svx/source/dialog/imapdlg.cxx
View File

@ -223,7 +223,7 @@ SvxIMapDlg::~SvxIMapDlg()
void SvxIMapDlg::dispose()
{
// Delete URL-List
pIMapWnd.clear();
pIMapWnd.disposeAndClear();
delete pOwnData;
m_pTbxIMapDlg1.clear();
m_pFtURL.clear();

Some files were not shown because too many files have changed in this diff Show More