commit 4f72ab022425318b109e52a641e63f673fce653d
author Michael Meeks <michael.meeks@collabora.com> Wed Mar 18 16:40:54 2015 +0000
committer Michael Meeks <michael.meeks@collabora.com> Fri Apr 10 12:01:45 2015 +0100
tree ad177f8ca4e78eabc99df672a8fcb52c9ae9f711
parent 4f386d07474790648843665cac42879cb33eba48

nail more lifecycle oddness.

Change-Id: Ibc29b488cf5077f1d5eb996a8d88dfd057de8266

avmedia/source/viewer/mediawindow.cxx

diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx
index 6444303..fcaf4f3 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();
}

sc/source/ui/view/tabview5.cxx

diff --git a/sc/source/ui/view/tabview5.cxx b/sc/source/ui/view/tabview5.cxx
index 0b5638d..a01d9c4 100644
--- a/sc/source/ui/view/tabview5.cxx
+++ b/sc/source/ui/view/tabview5.cxx
@@ -176,7 +176,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();

@@ -190,6 +190,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();

sd/source/ui/view/ViewTabBar.cxx

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;

vcl/source/control/edit.cxx

diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 63511fd..4ab221f 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;
}