[Libreoffice-commits] .: svx/source

[Libreoffice Gerrit user]

 svx/source/svdraw/svdobj.cxx |   32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

New commits:
commit 31b93b8600a3e219d33173aa68d9ab570e477e50
Author: David Tardon <dtardon at redhat.com>
Date:   Mon Dec 24 12:47:19 2012 +0100

    fdo#56980, fdo#58267 don't leave stale SdrObject refs around
    
    When a new SvxShape is set on this SdrObject, remove itself from the
    previously set SvxShape (if any). Otherwise it will try to reset the
    SdrObject's SvxShape in its destructor...
    
    Change-Id: I89d952a722b643a06f8eea87aad68f8bd230f811

diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index f74ec47..35b89c0 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -2926,8 +2926,40 @@ void SdrObject::MigrateItemPool(SfxItemPool* pSrcPool, SfxItemPool* pDestPool, S
 
 void SdrObject::impl_setUnoShape( const uno::Reference< uno::XInterface >& _rxUnoShape )
 {
+    const uno::Reference< uno::XInterface>& xOldUnoShape( maWeakUnoShape );
+    // the UNO shape would be gutted by the following code; return early
+    if ( _rxUnoShape == xOldUnoShape )
+    {
+        if ( !xOldUnoShape.is() )
+        {
+            SAL_WARN_IF( mpSvxShape, "svx.sdr", "SdrObject::impl_setUnoShape: still having impl. pointer to dead object!" );
+            // make sure there is no stale impl. pointer if the UNO
+            // shape was destroyed meanwhile (remember we only hold weak
+            // reference to it!)
+            mpSvxShape = 0;
+        }
+        return;
+    }
+
+    bool bTransferOwnership( false );
+    if ( xOldUnoShape.is() )
+    {
+        bTransferOwnership = mpSvxShape->HasSdrObjectOwnership();
+        // Remove yourself from the current UNO shape. Its destructor
+        // will reset our UNO shape otherwise.
+        mpSvxShape->InvalidateSdrObject();
+    }
+
     maWeakUnoShape = _rxUnoShape;
     mpSvxShape = SvxShape::getImplementation( _rxUnoShape );
+
+    // I think this may never happen... But I am not sure enough .-)
+    if ( bTransferOwnership )
+    {
+        if ( _rxUnoShape.is() )
+            mpSvxShape->TakeSdrObjectOwnership();
+        SAL_WARN( "svx.uno", "a UNO shape took over an SdrObject previously owned by another UNO shape!");
+    }
 }
 
 /** only for internal use! */