diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-08-05 15:45:21 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-08-05 15:45:21 +0100 |
| commit | b71f754feb335a824d3d2f5e3c38bb1853fe49af (patch) | |
| tree | e4ee3621a3a04150b791249d9e703ebe08416f32 /vcl | |
| parent | 89f794878471c5c756cce3e9f56ed01f8336f66f (diff) | |
fix a crash seen debugging dodgy dbaccess+mailmerge stuff
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/window/splitwin.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx index 1e6ea11ee51b..8ea0246507d7 100644 --- a/vcl/source/window/splitwin.cxx +++ b/vcl/source/window/splitwin.cxx @@ -1434,6 +1434,7 @@ SplitWindow::~SplitWindow() { // Sets loeschen ImplDeleteSet( mpMainSet ); + mpMainSet = NULL; //NULL for base-class callbacks during dtoring } // ----------------------------------------------------------------------- @@ -3375,7 +3376,7 @@ sal_uInt16 SplitWindow::GetSet( sal_uInt16 nId ) const sal_Bool SplitWindow::IsItemValid( sal_uInt16 nId ) const { sal_uInt16 nPos; - ImplSplitSet* pSet = ImplFindItem( mpBaseSet, nId, nPos ); + ImplSplitSet* pSet = mpBaseSet ? ImplFindItem(mpBaseSet, nId, nPos) : NULL; if ( pSet ) return sal_True; |