diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-01-09 16:05:35 +0000 |
|---|---|---|
| committer | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2017-11-28 00:13:21 -0500 |
| commit | 4c13d773bf597fc31f97cdd6fdd6085d6aec44b6 (patch) | |
| tree | 3504e50853fd27d9cf441c8940ff7402ecc1f4a6 | |
| parent | ff182e7569f003e6bd1f9bcba3588b4590d88242 (diff) | |
move the ImplRegisterObj outside ImplSetGraphicManager and rename it
Change-Id: I1eded3ee41787b9a3339e01cf6e1157724bba1a6
(cherry picked from commit 8065e33626b8b9cf02caaa12b345b538535a8acf)
| -rw-r--r-- | include/svtools/grfmgr.hxx | 5 | ||||
| -rw-r--r-- | svtools/source/graphic/grfmgr.cxx | 15 |
2 files changed, 10 insertions, 10 deletions
diff --git a/include/svtools/grfmgr.hxx b/include/svtools/grfmgr.hxx index 9c3ddc9e6bcc..247b03612293 100644 --- a/include/svtools/grfmgr.hxx +++ b/include/svtools/grfmgr.hxx @@ -202,10 +202,7 @@ private: void SVT_DLLPRIVATE ImplConstruct(); void SVT_DLLPRIVATE ImplAssignGraphicData(); - void SVT_DLLPRIVATE ImplSetGraphicManager( - const OString* pID = nullptr, - const GraphicObject* pCopyObj = nullptr - ); + void SVT_DLLPRIVATE ImplEnsureGraphicManager(); void SVT_DLLPRIVATE ImplAutoSwapIn(); bool SVT_DLLPRIVATE ImplGetCropParams( OutputDevice* pOut, diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx index 9c5b89f15595..003063d7c0a6 100644 --- a/svtools/source/graphic/grfmgr.cxx +++ b/svtools/source/graphic/grfmgr.cxx @@ -77,7 +77,8 @@ GraphicObject::GraphicObject() : { ImplConstruct(); ImplAssignGraphicData(); - ImplSetGraphicManager(); + ImplEnsureGraphicManager(); + mpMgr->ImplRegisterObj(*this, maGraphic, nullptr, nullptr); } GraphicObject::GraphicObject( const Graphic& rGraphic ) : @@ -87,7 +88,8 @@ GraphicObject::GraphicObject( const Graphic& rGraphic ) : { ImplConstruct(); ImplAssignGraphicData(); - ImplSetGraphicManager(); + ImplEnsureGraphicManager(); + mpMgr->ImplRegisterObj(*this, maGraphic, nullptr, nullptr); } GraphicObject::GraphicObject( const GraphicObject& rGraphicObj ) : @@ -98,7 +100,8 @@ GraphicObject::GraphicObject( const GraphicObject& rGraphicObj ) : { ImplConstruct(); ImplAssignGraphicData(); - ImplSetGraphicManager(nullptr, &rGraphicObj); + ImplEnsureGraphicManager(); + mpMgr->ImplRegisterObj(*this, maGraphic, nullptr, &rGraphicObj); if( rGraphicObj.HasUserData() && rGraphicObj.IsSwappedOut() ) SetSwapState(); } @@ -112,7 +115,8 @@ GraphicObject::GraphicObject( const OString& rUniqueID ) : // assign default properties ImplAssignGraphicData(); - ImplSetGraphicManager(&rUniqueID); + ImplEnsureGraphicManager(); + mpMgr->ImplRegisterObj(*this, maGraphic, &rUniqueID, nullptr); // update properties ImplAssignGraphicData(); @@ -161,7 +165,7 @@ void GraphicObject::ImplAssignGraphicData() ImplAfterDataChange(); } -void GraphicObject::ImplSetGraphicManager(const OString* pID, const GraphicObject* pCopyObj) +void GraphicObject::ImplEnsureGraphicManager() { if (!mpGlobalMgr) { @@ -187,7 +191,6 @@ void GraphicObject::ImplSetGraphicManager(const OString* pID, const GraphicObjec } mpMgr = mpGlobalMgr; - mpMgr->ImplRegisterObj( *this, maGraphic, pID, pCopyObj ); } void GraphicObject::ImplAutoSwapIn() |