Clean this up.

Change-Id: If44715c7d88f7494cbb61a7c1b696c0494426c59

1 files changed, 4 insertions, 15 deletions

diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index 889f3ed19ae2..51c9a473be62 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -1990,22 +1990,11 @@ bool SdrOle2Obj::Unload( const uno::Reference< embed::XEmbeddedObject >& xObj, s
 
 bool SdrOle2Obj::Unload()
 {
-    bool bUnloaded = false;
-
-    if( xObjRef.is() )
-    {
-        //TODO/LATER: no refcounting tricks anymore!
-        //"customers" must register as state change listeners
-        // Not necessary in Doc DTor (MM)
-        //sal_uIntPtr nRefCount = (*ppObjRef)->GetRefCount();
-        // prevent Unload if there are external references
-        //if( nRefCount > 2 )
-        //    return false;
-        //DBG_ASSERT( nRefCount == 2, "Wrong RefCount for unload" );
-    }
-    else
-        bUnloaded = true;
+    if (!xObjRef.is())
+        // Already unloaded.
+        return true;
 
+    bool bUnloaded = false;
     if ( pModel && xObjRef.is() )
     {
         bUnloaded = Unload( xObjRef.GetObject(), GetAspect() );