summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/svtools/grfmgr.hxx5
-rw-r--r--svtools/source/graphic/grfmgr.cxx15
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()