commit 8387e5bd93d1181d1da39b3075ab09b421e26ab4
author Michael Meeks <michael.meeks@collabora.com> Wed Apr 22 17:19:42 2015 +0100
committer Michael Meeks <michael.meeks@collabora.com> Wed Apr 22 17:19:42 2015 +0100
tree 4688c1f5097909aced5e2e6ae47ad1e999a2d883
parent 9f81582c7e998f26a0f499ba2ef9c845b9df2358

Fix lifecycle issues.

Change-Id: I7524ca3da7d134d94553be0e7a6db7e879984ae8

dbaccess/source/ui/browser/brwview.cxx

diff --git a/dbaccess/source/ui/browser/brwview.cxx b/dbaccess/source/ui/browser/brwview.cxx
index a9402381..fe0ad00 100644
--- a/dbaccess/source/ui/browser/brwview.cxx
+++ b/dbaccess/source/ui/browser/brwview.cxx
@@ -159,7 +159,7 @@ void UnoDataBrowserView::setTreeView(DBTreeView* _pTreeView)
{
    if (m_pTreeView.get() != _pTreeView)
    {
        m_pTreeView.clear();
        m_pTreeView.disposeAndClear();
        m_pTreeView = _pTreeView;
    }
}

vcl/source/window/openglwin.cxx

diff --git a/vcl/source/window/openglwin.cxx b/vcl/source/window/openglwin.cxx
index 1ef46da..21af6cc 100644
--- a/vcl/source/window/openglwin.cxx
+++ b/vcl/source/window/openglwin.cxx
@@ -16,6 +16,7 @@ class OpenGLWindowImpl
{
public:
    OpenGLWindowImpl(vcl::Window* pWindow);
    ~OpenGLWindowImpl() { mxChildWindow.disposeAndClear(); }
    OpenGLContext& getContext() { return maContext;}
private:
    OpenGLContext maContext;
@@ -31,7 +32,6 @@ OpenGLWindowImpl::OpenGLWindowImpl(vcl::Window* pWindow)
    pWindow->SetMouseTransparent(false);
}


OpenGLWindow::OpenGLWindow(vcl::Window* pParent):
    Window(pParent, 0),
    mxImpl(new OpenGLWindowImpl(this)),
@@ -49,7 +49,7 @@ void OpenGLWindow::dispose()
    if(mpRenderer)
        mpRenderer->contextDestroyed();
    mpRenderer = NULL;

    mxImpl.reset();
    Window::dispose();
}