summaryrefslogtreecommitdiff
path: root/svtools/source
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-01-09 16:07:33 +0000
committerCaolán McNamara <caolanm@redhat.com>2017-01-10 12:54:36 +0000
commit11e5668f12565ad9b1acb5c0085653c7a22ca329 (patch)
tree6cfa0eadecd6ce0e635e89c6b175630c7dbaf224 /svtools/source
parentbd5ec81c78df81fb85a036d07cc4d60d01575fd0 (diff)
mpGlobalMgr has to exist at GraphicObject dtor time
Change-Id: I75d82c041aa5a01bab3dceecaaa132ce9172862b Reviewed-on: https://gerrit.libreoffice.org/32899 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'svtools/source')
-rw-r--r--svtools/source/graphic/grfmgr.cxx13
1 files changed, 5 insertions, 8 deletions
diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx
index 3ca4c73c950e..1826e5f8880a 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;
}
}