include/svx/svdoole2.hxx | 2 +- svx/source/svdraw/svdoole2.cxx | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-)
New commits: commit daf8190858d36e0629fe038ea2bbd243b8eef413 Author: Miklos Vajna <vmik...@collabora.com> AuthorDate: Mon Apr 14 08:08:00 2025 +0200 Commit: Miklos Vajna <vmik...@collabora.com> CommitDate: Mon Apr 14 10:23:09 2025 +0200 svx: prefix members of SdrEmbedObjectLink See tdf#94879 for motivation. Change-Id: Ib8e7b2bca1347304395149c294634341ba7154f2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/184128 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmik...@collabora.com> diff --git a/include/svx/svdoole2.hxx b/include/svx/svdoole2.hxx index 2ccdfae6a284..ba414d69f476 100644 --- a/include/svx/svdoole2.hxx +++ b/include/svx/svdoole2.hxx @@ -189,7 +189,7 @@ public: class SVXCORE_DLLPUBLIC SdrEmbedObjectLink final : public sfx2::SvBaseLink { - SdrOle2Obj* pObj; + SdrOle2Obj* m_pObj; public: SAL_DLLPRIVATE explicit SdrEmbedObjectLink(SdrOle2Obj* pObj); diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx index dbcb73b2cbe3..74fcadd5a1d5 100644 --- a/svx/source/svdraw/svdoole2.cxx +++ b/svx/source/svdraw/svdoole2.cxx @@ -544,7 +544,7 @@ void SdrLightEmbeddedClient_Impl::setWindow(const uno::Reference< awt::XWindow > SdrEmbedObjectLink::SdrEmbedObjectLink(SdrOle2Obj* pObject): ::sfx2::SvBaseLink( ::SfxLinkUpdateMode::ONCALL, SotClipboardFormatId::SVXB ), - pObj(pObject) + m_pObj(pObject) { SetSynchron( false ); } @@ -556,10 +556,10 @@ SdrEmbedObjectLink::~SdrEmbedObjectLink() ::sfx2::SvBaseLink::UpdateResult SdrEmbedObjectLink::DataChanged( const OUString& /*rMimeType*/, const css::uno::Any & /*rValue*/ ) { - if ( !pObj->UpdateLinkURL_Impl() ) + if ( !m_pObj->UpdateLinkURL_Impl() ) { // the link URL was not changed - uno::Reference< embed::XEmbeddedObject > xObject = pObj->GetObjRef(); + uno::Reference< embed::XEmbeddedObject > xObject = m_pObj->GetObjRef(); OSL_ENSURE( xObject.is(), "The object must exist always!" ); if ( xObject.is() ) { @@ -582,15 +582,15 @@ SdrEmbedObjectLink::~SdrEmbedObjectLink() } } - pObj->GetNewReplacement(); - pObj->SetChanged(); + m_pObj->GetNewReplacement(); + m_pObj->SetChanged(); return SUCCESS; } void SdrEmbedObjectLink::Closed() { - pObj->BreakFileLink_Impl(); + m_pObj->BreakFileLink_Impl(); SvBaseLink::Closed(); }