[Libreoffice-commits] core.git: Branch 'feature/vclptr' - dbaccess/source extensions/source sfx2/source svtools/source svx/source
Michael Meeks
michael.meeks at collabora.com
Sat Apr 11 09:52:50 PDT 2015
dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx | 2 +-
dbaccess/source/ui/dlg/detailpages.cxx | 21 ++++++++++-----------
dbaccess/source/ui/dlg/detailpages.hxx | 2 --
extensions/source/propctrlr/commoncontrol.cxx | 2 +-
sfx2/source/appl/newhelp.cxx | 8 ++++----
sfx2/source/view/frame.cxx | 2 +-
svtools/source/brwbox/brwbox1.cxx | 4 +---
svtools/source/brwbox/brwbox2.cxx | 2 +-
svtools/source/contnr/imivctl1.cxx | 4 ++--
svtools/source/table/tablecontrol_impl.cxx | 7 +++++--
svx/source/form/datanavi.cxx | 8 ++++----
11 files changed, 30 insertions(+), 32 deletions(-)
New commits:
commit c6fb78d5fd5f52384f4b959091f50da60ba4b37a
Author: Michael Meeks <michael.meeks at collabora.com>
Date: Sat Apr 11 17:41:38 2015 +0100
disposeAndClear in place of DELETEZ.
Audit of DELETEZ usage in:
"vclwidget: change all vcl::window fields to be wrapped in VclPtr"
Change-Id: Ib65096a9edb09ce9381ab4a8297d9391d2603651
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
index fef583f..6a8f356 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
@@ -81,7 +81,7 @@ using namespace ::com::sun::star;
void OTextConnectionPageSetup::dispose()
{
- m_pTextConnectionHelper.clear();
+ m_pTextConnectionHelper.disposeAndClear();
OConnectionTabPageSetup::dispose();
}
diff --git a/dbaccess/source/ui/dlg/detailpages.cxx b/dbaccess/source/ui/dlg/detailpages.cxx
index 47a0c2084..b138667 100644
--- a/dbaccess/source/ui/dlg/detailpages.cxx
+++ b/dbaccess/source/ui/dlg/detailpages.cxx
@@ -71,7 +71,6 @@ namespace dbaui
,m_pAutoRetrievingLabel(NULL)
,m_pAutoRetrieving(NULL)
,m_nControlFlags(nControlFlags)
- ,m_bDelete(false)
{
if ((m_nControlFlags & CBTP_USE_OPTIONS) == CBTP_USE_OPTIONS)
@@ -102,15 +101,15 @@ namespace dbaui
void OCommonBehaviourTabPage::dispose()
{
- m_pOptionsLabel.clear();
- m_pOptions.clear();
- m_pCharsetLabel.clear();
- m_pCharset.clear();
- m_pAutoIncrementLabel.clear();
- m_pAutoIncrement.clear();
- m_pAutoRetrievingEnabled.clear();
- m_pAutoRetrievingLabel.clear();
- m_pAutoRetrieving.clear();
+ m_pOptionsLabel.disposeAndClear();
+ m_pOptions.disposeAndClear();
+ m_pCharsetLabel.disposeAndClear();
+ m_pCharset.disposeAndClear();
+ m_pAutoIncrementLabel.disposeAndClear();
+ m_pAutoIncrement.disposeAndClear();
+ m_pAutoRetrievingEnabled.disposeAndClear();
+ m_pAutoRetrievingLabel.disposeAndClear();
+ m_pAutoRetrieving.disposeAndClear();
OGenericAdministrationPage::dispose();
}
@@ -762,7 +761,7 @@ namespace dbaui
void OTextDetailsPage::dispose()
{
- m_pTextConnectionHelper.clear();
+ m_pTextConnectionHelper.disposeAndClear();
OCommonBehaviourTabPage::dispose();
}
diff --git a/dbaccess/source/ui/dlg/detailpages.hxx b/dbaccess/source/ui/dlg/detailpages.hxx
index eab9114..407a986 100644
--- a/dbaccess/source/ui/dlg/detailpages.hxx
+++ b/dbaccess/source/ui/dlg/detailpages.hxx
@@ -64,8 +64,6 @@ namespace dbaui
sal_uInt32 m_nControlFlags;
- bool m_bDelete;
-
public:
virtual bool FillItemSet (SfxItemSet* _rCoreAttrs) SAL_OVERRIDE;
diff --git a/extensions/source/propctrlr/commoncontrol.cxx b/extensions/source/propctrlr/commoncontrol.cxx
index fa223ee..e337ccf 100644
--- a/extensions/source/propctrlr/commoncontrol.cxx
+++ b/extensions/source/propctrlr/commoncontrol.cxx
@@ -88,7 +88,7 @@ namespace pcr
void SAL_CALL ControlHelper::dispose()
{
- m_pControlWindow.clear();
+ m_pControlWindow.disposeAndClear();
}
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 28323c5..e65a8a5 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -1489,10 +1489,10 @@ void SfxHelpIndexWindow_Impl::dispose()
{
sfx2::RemoveFromTaskPaneList( this );
- pCPage.clear();
- pIPage.clear();
- pSPage.clear();
- pBPage.clear();
+ pCPage.disposeAndClear();
+ pIPage.disposeAndClear();
+ pSPage.disposeAndClear();
+ pBPage.disposeAndClear();
for ( sal_uInt16 i = 0; i < m_pActiveLB->GetEntryCount(); ++i )
delete static_cast<OUString*>(m_pActiveLB->GetEntryData(i));
diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx
index c65bc7b..e77b4fb 100644
--- a/sfx2/source/view/frame.cxx
+++ b/sfx2/source/view/frame.cxx
@@ -93,7 +93,7 @@ void SfxFrame::Construct_Impl()
SfxFrame::~SfxFrame()
{
RemoveTopFrame_Impl( this );
- pWindow.clear();
+ pWindow.disposeAndClear();
SfxFrameArr_Impl::iterator it = std::find( pFramesArr_Impl->begin(), pFramesArr_Impl->end(), this );
if ( it != pFramesArr_Impl->end() )
diff --git a/svtools/source/brwbox/brwbox1.cxx b/svtools/source/brwbox/brwbox1.cxx
index a78b114..b23d356 100644
--- a/svtools/source/brwbox/brwbox1.cxx
+++ b/svtools/source/brwbox/brwbox1.cxx
@@ -2305,11 +2305,9 @@ void BrowseBox::SetMode( BrowserMode nMode )
}
else
{
- getDataWindow()->pHeaderBar.clear();
+ getDataWindow()->pHeaderBar.disposeAndClear();
}
-
-
if ( bColumnCursor )
{
pColSel = pOldColSel ? pOldColSel : new MultiSelection;
diff --git a/svtools/source/brwbox/brwbox2.cxx b/svtools/source/brwbox/brwbox2.cxx
index 959191e..745308f 100644
--- a/svtools/source/brwbox/brwbox2.cxx
+++ b/svtools/source/brwbox/brwbox2.cxx
@@ -1258,7 +1258,7 @@ void BrowseBox::UpdateScrollbars()
getDataWindow()->pCornerWin->Show();
}
else
- getDataWindow()->pCornerWin.clear();
+ getDataWindow()->pCornerWin.disposeAndClear();
// scroll headerbar, if necessary
if ( getDataWindow()->pHeaderBar )
diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx
index 2ed5bf7..0361ab1 100644
--- a/svtools/source/contnr/imivctl1.cxx
+++ b/svtools/source/contnr/imivctl1.cxx
@@ -157,7 +157,7 @@ SvxIconChoiceCtrl_Impl::SvxIconChoiceCtrl_Impl(
SvxIconChoiceCtrl_Impl::~SvxIconChoiceCtrl_Impl()
{
pCurEditedEntry = 0;
- pEdit.clear();
+ pEdit.disposeAndClear();
Clear();
StopEditTimer();
CancelUserEvents();
@@ -3127,7 +3127,7 @@ void SvxIconChoiceCtrl_Impl::EditEntry( SvxIconChoiceCtrlEntry* pEntry )
return;
StopEntryEditing( true );
- pEdit.clear();
+ pEdit.disposeAndClear();
SetNoSelection();
pCurEditedEntry = pEntry;
diff --git a/svtools/source/table/tablecontrol_impl.cxx b/svtools/source/table/tablecontrol_impl.cxx
index 6e556b5..7fabd9f 100644
--- a/svtools/source/table/tablecontrol_impl.cxx
+++ b/svtools/source/table/tablecontrol_impl.cxx
@@ -261,6 +261,9 @@ namespace svt { namespace table
TableControl_Impl::~TableControl_Impl()
{
+ m_pVScroll.disposeAndClear();
+ m_pHScroll.disposeAndClear();
+ m_pScrollCorner.disposeAndClear();
DELETEZ( m_pTableFunctionSet );
DELETEZ( m_pSelEngine );
}
@@ -641,7 +644,7 @@ namespace svt { namespace table
{
if ( _rpBar->IsTracking() )
_rpBar->EndTracking();
- _rpBar.clear();
+ _rpBar.disposeAndClear();
}
else if ( !bHaveBar && i_needBar )
{
@@ -1162,7 +1165,7 @@ namespace svt { namespace table
bool bNeedScrollCorner = ( nullptr != m_pHScroll ) && ( nullptr != m_pVScroll );
if ( bHaveScrollCorner && !bNeedScrollCorner )
{
- m_pScrollCorner.clear();
+ m_pScrollCorner.disposeAndClear();
}
else if ( !bHaveScrollCorner && bNeedScrollCorner )
{
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index 7a7229f..ac5c3cd 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -1432,9 +1432,9 @@ namespace svxform
aAny <<= m_bShowDetails;
aViewOpt.SetUserItem(CFGNAME_SHOWDETAILS,aAny);
- m_pInstPage.clear();
- m_pSubmissionPage.clear();
- m_pBindingPage.clear();
+ m_pInstPage.disposeAndClear();
+ m_pSubmissionPage.disposeAndClear();
+ m_pBindingPage.disposeAndClear();
sal_Int32 i, nCount = m_aPageList.size();
for ( i = 0; i < nCount; ++i )
@@ -1727,7 +1727,7 @@ namespace svxform
}
else
{
- m_pInstPage.clear();
+ m_pInstPage.disposeAndClear();
bDoRemove = true;
}
More information about the Libreoffice-commits
mailing list