[Libreoffice-commits] core.git: svtools/source

[Caolán McNamara]

 svtools/source/graphic/grfmgr.cxx |   13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

New commits:
commit 11e5668f12565ad9b1acb5c0085653c7a22ca329
Author: Caolán McNamara <caol...@redhat.com>
Date:   Mon Jan 9 16:07:33 2017 +0000

    mpGlobalMgr has to exist at GraphicObject dtor time
    
    Change-Id: I75d82c041aa5a01bab3dceecaaa132ce9172862b
    Reviewed-on: https://gerrit.libreoffice.org/32899
    Tested-by: Jenkins <c...@libreoffice.org>
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/svtools/source/graphic/grfmgr.cxx 
b/svtools/source/graphic/grfmgr.cxx
index 3ca4c73..1826e5f 100644
--- a/svtools/source/graphic/grfmgr.cxx
+++ b/svtools/source/graphic/grfmgr.cxx
@@ -124,15 +124,12 @@ GraphicObject::GraphicObject( const OString& rUniqueID ) :
 
 GraphicObject::~GraphicObject()
 {
-    if( mpMgr )
-    {
-        mpMgr->ImplUnregisterObj( *this );
+    mpMgr->ImplUnregisterObj( *this );
 
-        if (!mpGlobalMgr->ImplHasObjects())
-        {
-            delete mpGlobalMgr;
-            mpGlobalMgr = nullptr;
-        }
+    if (!mpGlobalMgr->ImplHasObjects())
+    {
+        delete mpGlobalMgr;
+        mpGlobalMgr = nullptr;
     }
 }
 

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits