include/svx/unoshape.hxx | 2 +-
svx/source/unodraw/unoshap4.cxx | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 444179c7e14d1d0d1ffadd905a6c7c5961ce6e6d
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Mon Jan 13 08:22:27 2025 +0100
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Mon Jan 13 11:25:00 2025 +0100
svx: prefix members of SvxOle2Shape
See tdf#94879 for motivation.
No problem with _ suffixes, but parent SvxShape uses m_ prefixes, so
switch to that here as well for consistency.
Change-Id: I7a1f8630c5281c629a5b02ffe51fd9df208602dc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/180153
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
Tested-by: Jenkins
diff --git a/include/svx/unoshape.hxx b/include/svx/unoshape.hxx
index cbf4936dc4c1..a8670722d5ce 100644
--- a/include/svx/unoshape.hxx
+++ b/include/svx/unoshape.hxx
@@ -587,7 +587,7 @@ public:
class UNLESS_MERGELIBS_MORE(SVXCORE_DLLPUBLIC) SvxOle2Shape : public
SvxShapeText
{
private:
- OUString referer_;
+ OUString m_referer;
protected:
// override these for special property handling in subcasses. Return true
if property is handled
virtual bool setPropertyValueImpl( const OUString& rName, const
SfxItemPropertyMapEntry* pProperty, const css::uno::Any& rValue ) override;
diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx
index a7e41c0c80b1..7ef5d9b0007a 100644
--- a/svx/source/unodraw/unoshap4.cxx
+++ b/svx/source/unodraw/unoshap4.cxx
@@ -67,13 +67,13 @@ using namespace ::com::sun::star::beans;
SvxOle2Shape::SvxOle2Shape(SdrObject* pObject, OUString referer)
: SvxShapeText(pObject, getSvxMapProvider().GetMap(SVXMAP_OLE2),
getSvxMapProvider().GetPropertySet(SVXMAP_OLE2,SdrObject::GetGlobalDrawObjectItemPool()))
- , referer_(std::move(referer))
+ , m_referer(std::move(referer))
{
}
SvxOle2Shape::SvxOle2Shape(SdrObject* pObject, OUString referer,
std::span<const SfxItemPropertyMapEntry> pPropertyMap, const
SvxItemPropertySet* pPropertySet)
: SvxShapeText(pObject, pPropertyMap, pPropertySet)
- , referer_(std::move(referer))
+ , m_referer(std::move(referer))
{
}
@@ -452,7 +452,7 @@ void SvxOle2Shape::createLink( const OUString& aLinkURL )
uno::Sequence< beans::PropertyValue > aMediaDescr{
comphelper::makePropertyValue(u"URL"_ustr, aLinkURL),
- comphelper::makePropertyValue(u"Referer"_ustr, referer_)
+ comphelper::makePropertyValue(u"Referer"_ustr, m_referer)
};
uno::Reference< task::XInteractionHandler > xInteraction =
pPersist->getInteractionHandler();
