[Libreoffice-commits] core.git: Branch 'feature/vclref' - chart2/source svx/source sw/source vcl/source

[Michael Meeks]

 chart2/source/controller/main/ChartWindow.cxx |    1 +
 svx/source/fmcomp/fmgridcl.cxx                |    1 +
 sw/source/core/view/viewsh.cxx                |    2 +-
 vcl/source/control/ctrl.cxx                   |    2 +-
 vcl/source/control/lstbox.cxx                 |    4 ++++
 5 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 7b3db5c939bab2b10f29a1899271021972677118
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Sat Feb 28 19:59:01 2015 +0000

    Double dispose protection.
    
    Change-Id: Iadc0a4fcb711e4f846e0e047880e512c9d42d0f8

diff --git a/chart2/source/controller/main/ChartWindow.cxx b/chart2/source/controller/main/ChartWindow.cxx
index 972cbaf..152b5a1 100644
--- a/chart2/source/controller/main/ChartWindow.cxx
+++ b/chart2/source/controller/main/ChartWindow.cxx
@@ -84,6 +84,7 @@ void ChartWindow::dispose()
         x3DWindowProvider->update();
     }
     delete m_pOpenGLWindow;
+    m_pOpenGLWindow = NULL;
     vcl::Window::dispose();
 }
 
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index 2a76af6..f89f1b5 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -140,6 +140,7 @@ FmGridHeader::~FmGridHeader()
 void FmGridHeader::dispose()
 {
     delete m_pImpl;
+    m_pImpl = NULL;
     FmGridHeader::dispose();
 }
 
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 14a4ade..e0b2674 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -2329,7 +2329,7 @@ SwViewShell::CreateAccessiblePreview()
 
 void SwViewShell::InvalidateAccessibleFocus()
 {
-    if( Imp()->IsAccessible() )
+    if( Imp() && Imp()->IsAccessible() )
         Imp()->GetAccessibleMap().InvalidateFocus();
 }
 
diff --git a/vcl/source/control/ctrl.cxx b/vcl/source/control/ctrl.cxx
index 01c6572..a4df85f 100644
--- a/vcl/source/control/ctrl.cxx
+++ b/vcl/source/control/ctrl.cxx
@@ -113,7 +113,7 @@ void Control::CreateLayoutData() const
 
 bool Control::HasLayoutData() const
 {
-    return mpControlData->mpLayoutData != NULL;
+    return mpControlData ? mpControlData->mpLayoutData != NULL : false;
 }
 
 ::vcl::ControlLayoutData* Control::GetLayoutData() const
diff --git a/vcl/source/control/lstbox.cxx b/vcl/source/control/lstbox.cxx
index 5e13f07..ae9999d 100644
--- a/vcl/source/control/lstbox.cxx
+++ b/vcl/source/control/lstbox.cxx
@@ -84,8 +84,12 @@ void ListBox::dispose()
     delete pImplLB;
 
     delete mpFloatWin;
+    mpFloatWin = NULL;
     delete mpImplWin;
+    mpImplWin = NULL;
     delete mpBtn;
+    mpBtn = NULL;
+
     Control::dispose();
 }