summaryrefslogtreecommitdiff
path: root/forms
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@collabora.com>2015-04-10 10:44:13 +0100
committerMichael Meeks <michael.meeks@collabora.com>2015-04-10 10:46:01 +0100
commitc0a802b59e1edddeb0b621e15137f5058299efd7 (patch)
tree48203cffcd51d1d2747bb2384608907d73b69670 /forms
parent1c4025babd7037a3292aa530c7d45ab8d6ef6dcb (diff)
Audit and correct misc. clears -> disposeAndClears.
Anything that used to be 'delete'd should be disposeAndCleared() in the new world.
Diffstat (limited to 'forms')
-rw-r--r--forms/source/richtext/richtextimplcontrol.cxx16
1 files changed, 8 insertions, 8 deletions
diff --git a/forms/source/richtext/richtextimplcontrol.cxx b/forms/source/richtext/richtextimplcontrol.cxx
index ef2ccb5f38e1..b292f642dfe0 100644
--- a/forms/source/richtext/richtextimplcontrol.cxx
+++ b/forms/source/richtext/richtextimplcontrol.cxx
@@ -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();