include/svtools/grfmgr.hxx | 5 +---- svtools/source/graphic/grfmgr.cxx | 15 +++++++++------ 2 files changed, 10 insertions(+), 10 deletions(-)
New commits: commit 8065e33626b8b9cf02caaa12b345b538535a8acf Author: Caolán McNamara <caol...@redhat.com> Date: Mon Jan 9 16:05:35 2017 +0000 move the ImplRegisterObj outside ImplSetGraphicManager and rename it Change-Id: I1eded3ee41787b9a3339e01cf6e1157724bba1a6 diff --git a/include/svtools/grfmgr.hxx b/include/svtools/grfmgr.hxx index 9c3ddc9..247b036 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 9c5b89f..003063d 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()
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits