commit 532dccdc02137540dcecc5b9dd48dfd72947bd48
author Michael Meeks <michael.meeks@collabora.com> Thu Feb 26 16:09:18 2015 +0000
committer Michael Meeks <michael.meeks@collabora.com> Thu Apr 09 22:23:07 2015 +0100
tree e3ba6925d4d1a6900eb6e12f83e26be24aa7f6e7
parent 7553deec1aee40abd663c3c4d63d9629f69d6c2f

vclref: protect vs. double disposes.

Change-Id: I86fe17ad9afba7ee1e87aaa732bebee1746c140f

svtools/source/control/ruler.cxx

diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx
index 96d1a66..482d3d3 100644
--- a/svtools/source/control/ruler.cxx
+++ b/svtools/source/control/ruler.cxx
@@ -334,9 +334,14 @@ void Ruler::dispose()
    if ( mnUpdateEvtId )
        Application::RemoveUserEvent( mnUpdateEvtId );
    delete mpSaveData;
    mpSaveData = NULL;
    delete mpDragData;
    mpDragData = NULL;
    if( pAccContext )
    {
        pAccContext->release();
        pAccContext = NULL;
    }
    Window::dispose();
}

svx/source/dialog/svxruler.cxx

diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index b02eb03..adf08f0 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -353,11 +353,16 @@ void SvxRuler::dispose()

    pBindings->EnterRegistrations();

    for(sal_uInt16 i = 0; i < CTRL_ITEM_COUNT  && pCtrlItem[i]; ++i)
        delete pCtrlItem[i];
    delete[] pCtrlItem;
    if (pCtrlItem)
    {
        for(sal_uInt16 i = 0; i < CTRL_ITEM_COUNT  && pCtrlItem[i]; ++i)
            delete pCtrlItem[i];
        delete[] pCtrlItem;
        pCtrlItem = NULL;
    }

    pBindings->LeaveRegistrations();

    Ruler::dispose();
}