diff options
| author | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-10-18 15:08:39 +0200 |
|---|---|---|
| committer | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-11-07 10:45:08 +0100 |
| commit | 17475638138c92162be1c0f34cf1f9cc95c63579 (patch) | |
| tree | 36ff59050a651514352c4a1b5fbc22ab23d31850 /svtools | |
| parent | da612badf7897ab41aa99437e5df874934596fd9 (diff) | |
Make SetSwapState() an internal method
So we can be sure it is always called when user data changed.
Change-Id: If107907afffb85a7a57817f5807847a5c028416c
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/graphic/grfmgr.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx index f02b185b4bda..2c4746d7ed16 100644 --- a/svtools/source/graphic/grfmgr.cxx +++ b/svtools/source/graphic/grfmgr.cxx @@ -102,6 +102,8 @@ GraphicObject::GraphicObject( const GraphicObject& rGraphicObj, const GraphicMan ImplConstruct(); ImplAssignGraphicData(); ImplSetGraphicManager( pMgr, NULL, &rGraphicObj ); + if( rGraphicObj.HasUserData() && rGraphicObj.IsSwappedOut() ) + SetSwapState(); } GraphicObject::GraphicObject( const OString& rUniqueID, const GraphicManager* pMgr ) : @@ -351,8 +353,9 @@ GraphicObject& GraphicObject::operator=( const GraphicObject& rGraphicObj ) ImplAssignGraphicData(); mbAutoSwapped = false; mpMgr = rGraphicObj.mpMgr; - mpMgr->ImplRegisterObj( *this, maGraphic, NULL, &rGraphicObj ); + if( rGraphicObj.HasUserData() && rGraphicObj.IsSwappedOut() ) + SetSwapState(); } return *this; @@ -427,6 +430,7 @@ void GraphicObject::SetUserData() void GraphicObject::SetUserData( const OUString& rUserData ) { maUserData = rUserData; + SetSwapState(); } void GraphicObject::SetSwapStreamHdl() |