From 80f8bf77e5420c550294048b31911fefffa12fc5 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Thu, 19 Jun 2014 09:24:35 +0200
Subject: Prevent null pointer dereference

Change-Id: Ia197152f6ece37dd2dd2ce1b41c1dfd1a985781c
---
 sfx2/source/doc/sfxbasemodel.cxx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'sfx2')

diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 35af9e255b2c..15a76db3d78d 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -778,7 +778,10 @@ void SAL_CALL SfxBaseModel::dispose() throw(RuntimeException, std::exception)
 
     m_pData->m_xDocumentMetadata.clear();
 
-    EndListening( *m_pData->m_pObjectShell );
+    if ( m_pData->m_pObjectShell.Is() )
+    {
+        EndListening( *m_pData->m_pObjectShell );
+    }
 
     m_pData->m_xCurrent = Reference< frame::XController > ();
     m_pData->m_seqControllers = Sequence< Reference< frame::XController > > () ;
-- 
cgit