[Libreoffice-commits] .: vcl/source

[Caolán McNamara]

 vcl/source/window/splitwin.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 03e9a1d65086af06ca7d2d8538fc69cb66591470
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Aug 5 15:45:21 2011 +0100

    fix a crash seen debugging dodgy dbaccess+mailmerge stuff

diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx
index 271d0da..b8a4a82 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;