[Libreoffice-commits] core.git: Branch 'feature/vclref' - avmedia/source sc/source sd/source vcl/source

[Michael Meeks]

 avmedia/source/viewer/mediawindow.cxx |    1 +
 sc/source/ui/view/tabview5.cxx        |   10 +++++++++-
 sd/source/ui/view/ViewTabBar.cxx      |    4 ++--
 vcl/source/control/edit.cxx           |    1 +
 vcl/source/window/split.cxx           |    2 +-
 5 files changed, 14 insertions(+), 4 deletions(-)

New commits:
commit fc94a8052f9cb56c106415c9936c20ae6646cea5
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Wed Mar 18 16:40:54 2015 +0000

    nail more lifecycle oddness.
    
    Change-Id: Ibc29b488cf5077f1d5eb996a8d88dfd057de8266

diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx
index 6956b8c..0d90d8e 100644
--- a/avmedia/source/viewer/mediawindow.cxx
+++ b/avmedia/source/viewer/mediawindow.cxx
@@ -330,6 +330,7 @@ void MediaWindow::executeFormatErrorBox( vcl::Window* pParent )
     VclPtr<MessageDialog> aErrBox(new MessageDialog( pParent, AVMEDIA_RESID( AVMEDIA_STR_ERR_URL ) ) );
 
     aErrBox->Execute();
+    aErrBox.disposeAndClear();
 }
 
 
diff --git a/sc/source/ui/view/tabview5.cxx b/sc/source/ui/view/tabview5.cxx
index 4b03d89..fae0c8b 100644
--- a/sc/source/ui/view/tabview5.cxx
+++ b/sc/source/ui/view/tabview5.cxx
@@ -170,7 +170,7 @@ ScTabView::~ScTabView()
     delete pSelEngine;
 
     // Delete this before the grid windows, since it's a child window of one of them.
-    mpInputHintWindow.reset();
+    mpInputHintWindow.disposeAndClear();
     for (i=0; i<4; i++)
         pGridWin[i].disposeAndClear();
 
@@ -184,6 +184,14 @@ ScTabView::~ScTabView()
         pRowOutline[i].disposeAndClear();
     }
 
+    aScrollBarBox.disposeAndClear();
+    aCornerButton.disposeAndClear();
+    aTopButton.disposeAndClear();
+    aHScrollLeft.disposeAndClear();
+    aHScrollRight.disposeAndClear();
+    aVScrollTop.disposeAndClear();
+    aVScrollBottom.disposeAndClear();
+
     pHSplitter.disposeAndClear();
     pVSplitter.disposeAndClear();
     pTabControl.disposeAndClear();
diff --git a/sd/source/ui/view/ViewTabBar.cxx b/sd/source/ui/view/ViewTabBar.cxx
index 1cc8aba..05deb3e 100644
--- a/sd/source/ui/view/ViewTabBar.cxx
+++ b/sd/source/ui/view/ViewTabBar.cxx
@@ -167,8 +167,8 @@ void ViewTabBar::disposing (void)
         // Set all references to the one tab page to NULL and delete the page.
         for (sal_uInt16 nIndex=0; nIndex<mpTabControl->GetPageCount(); ++nIndex)
             mpTabControl->SetTabPage(nIndex, NULL);
-        mpTabPage.reset();
-        mpTabControl.reset();
+        mpTabPage.disposeAndClear();
+        mpTabControl.disposeAndClear();
     }
 
     mxController = NULL;
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 9093f80..b27df90 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -2786,6 +2786,7 @@ Size Edit::GetMinimumEditSize()
     vcl::Window* pDefWin = ImplGetDefaultWindow();
     VclPtr<Edit> aEdit(new Edit( pDefWin, WB_BORDER ) );
     Size aSize( aEdit->CalcMinimumSize() );
+    aEdit.disposeAndClear();
     return aSize;
 }
 
diff --git a/vcl/source/window/split.cxx b/vcl/source/window/split.cxx
index 8698925..824784f 100644
--- a/vcl/source/window/split.cxx
+++ b/vcl/source/window/split.cxx
@@ -162,7 +162,7 @@ void Splitter::dispose()
         TaskPaneList *pTList = pSysWin->GetTaskPaneList();
         pTList->RemoveWindow(this);
     }
-    mpRefWin.disposeAndClear();
+    mpRefWin.clear();
     Window::dispose();
 }