diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-02-28 19:59:01 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-09 22:26:42 +0100 |
| commit | e8284454f517d29a29f95a347a38730ded047f41 (patch) | |
| tree | 08391f6f0f659d45deda5652bc6e2f12e7b0fc97 | |
| parent | cffa7dd2f2eab7f3430519e91f0ccb00fdc3b5f5 (diff) | |
Double dispose protection.
Change-Id: Iadc0a4fcb711e4f846e0e047880e512c9d42d0f8
| -rw-r--r-- | chart2/source/controller/main/ChartWindow.cxx | 1 | ||||
| -rw-r--r-- | svx/source/fmcomp/fmgridcl.cxx | 1 | ||||
| -rw-r--r-- | sw/source/core/view/viewsh.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/control/ctrl.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/control/lstbox.cxx | 4 |
5 files changed, 8 insertions, 2 deletions
diff --git a/chart2/source/controller/main/ChartWindow.cxx b/chart2/source/controller/main/ChartWindow.cxx index cec82ca81592..4a37ec38e583 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 0ad429b2bcee..860c6ac49f84 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 14dfb4354174..0d2893c16057 100644 --- a/sw/source/core/view/viewsh.cxx +++ b/sw/source/core/view/viewsh.cxx @@ -2262,7 +2262,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 137ca042f13f..4cec1d0004d6 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 23da0e84b70d..31fcb3aecac5 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(); } |