diff options
| -rw-r--r-- | include/svx/svdetc.hxx | 2 | ||||
| -rw-r--r-- | svx/source/svdraw/svdetc.cxx | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/include/svx/svdetc.hxx b/include/svx/svdetc.hxx index f594550a5aa2..8bd6b744ec46 100644 --- a/include/svx/svdetc.hxx +++ b/include/svx/svdetc.hxx @@ -164,7 +164,7 @@ class OLEObjCache size_t nSize; std::unique_ptr<AutoTimer> pTimer; - static bool UnloadObj( SdrOle2Obj* pObj ); + static bool UnloadObj(SdrOle2Obj& rObj); DECL_LINK( UnloadCheckHdl, Timer*, void ); public: diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx index 04219e7a8477..e97593ca0319 100644 --- a/svx/source/svdraw/svdetc.cxx +++ b/svx/source/svdraw/svdetc.cxx @@ -151,7 +151,7 @@ IMPL_LINK_NOARG(OLEObjCache, UnloadCheckHdl, Timer*, void) } } - if ( bUnload && UnloadObj(pUnloadObj) ) + if (bUnload && UnloadObj(*pUnloadObj)) { // object was successfully unloaded RemoveObj(pUnloadObj); @@ -216,7 +216,7 @@ const SdrOle2Obj* OLEObjCache::operator[](size_t nPos) const return maObjs[nPos]; } -bool OLEObjCache::UnloadObj(SdrOle2Obj* pObj) +bool OLEObjCache::UnloadObj(SdrOle2Obj& rObj) { bool bUnloaded = false; @@ -227,12 +227,12 @@ bool OLEObjCache::UnloadObj(SdrOle2Obj* pObj) // A much better (and working) criteria would be the VOC contact count. // The question is what will happen when i make it work now suddenly? I // will try it for 2.4. - const sdr::contact::ViewContact& rViewContact = pObj->GetViewContact(); + const sdr::contact::ViewContact& rViewContact = rObj.GetViewContact(); const bool bVisible(rViewContact.HasViewObjectContacts()); if(!bVisible) { - bUnloaded = pObj->Unload(); + bUnloaded = rObj.Unload(); } return bUnloaded; |