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 | 03e9a1d65086af06ca7d2d8538fc69cb66591470 (patch) | |
| tree | f2f92ef89e14322c1979ef3f245841c0adc5b507 | |
| parent | c39a68185bc4f8d26f72bba430252d30f6dd470d (diff) | |
fix a crash seen debugging dodgy dbaccess+mailmerge stuff
| -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 271d0da85f..b8a4a82aa5 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; |