From a04735e037289585aa4c4fb68c6907b38a828f41 Mon Sep 17 00:00:00 2001
From: Radek Doulik <rodo@novell.com>
Date: Mon, 26 Nov 2012 17:50:14 +0100
Subject: fix crash on impress quit, when custom shapes were added during
 editing

 - reset connection to this unoshape in sdr object so that it doesn't
   try to delete uno shape later when it might be already deleted

Change-Id: I1195bfdaccceb9d7e3e0f0a48aaacb16f7a46ced
---
 svx/source/unodraw/unoshape.cxx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'svx')

diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 7855f82b488b..511b94167118 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -1101,8 +1101,11 @@ void SvxShape::Notify( SfxBroadcaster&, const SfxHint& rHint ) throw()
 
     if( bClearMe )
     {
-        if( !HasSdrObjectOwnership() )
+        if( !HasSdrObjectOwnership() ) {
+            if( mpObj.is() )
+                mpObj->setUnoShape( NULL );
             mpObj.reset( NULL );
+        }
         if ( !mpImpl->mbDisposing )
             dispose();
     }
-- 
cgit