diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-01-09 16:07:33 +0000 |
|---|---|---|
| committer | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2017-12-05 08:17:43 -0500 |
| commit | dc06bbc7220a45d773a84ca5c1e570f0b250aef0 (patch) | |
| tree | 49cd57b8ac6e524e6e7fa89ba039aec6e7632714 /svtools | |
| parent | 00b4a7267b1584717ca9b8cce49f1e43e652a37d (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>
(cherry picked from commit 11e5668f12565ad9b1acb5c0085653c7a22ca329)
(cherry picked from commit a12e49be7f91611d03b704b878b55dcd97681532)
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/graphic/grfmgr.cxx | 13 |
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; } } |