svx/inc/sdr/properties/groupproperties.hxx | 2 +-
svx/source/sdr/properties/groupproperties.cxx | 14 +++++++-------
2 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 6e0eb7da0601ab4bf828a0fa71bbad83b9e8f465
Author: Noel Grandin <noelgran...@gmail.com>
AuthorDate: Sat Apr 29 16:27:38 2023 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sat Apr 29 21:16:45 2023 +0200
rename field in GroupProperties
to distinguish it from the similarly named field in the
DefaultProperties superclass.
Change-Id: I8512c1a60e360a1e31ceaa86a8ff63ebe068d0cb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151185
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/svx/inc/sdr/properties/groupproperties.hxx
b/svx/inc/sdr/properties/groupproperties.hxx
index 40e944eb572a..d31806d06bd1 100644
--- a/svx/inc/sdr/properties/groupproperties.hxx
+++ b/svx/inc/sdr/properties/groupproperties.hxx
@@ -29,7 +29,7 @@ namespace sdr::properties
class GroupProperties final : public BaseProperties
{
// the to be used ItemSet
- mutable std::optional<SfxItemSet> mxItemSet;
+ mutable std::optional<SfxItemSet> moMergedItemSet;
public:
// basic constructor
explicit GroupProperties(SdrObject& rObj);
diff --git a/svx/source/sdr/properties/groupproperties.cxx
b/svx/source/sdr/properties/groupproperties.cxx
index 6ec522aa36b9..6bb3485689b4 100644
--- a/svx/source/sdr/properties/groupproperties.cxx
+++ b/svx/source/sdr/properties/groupproperties.cxx
@@ -57,12 +57,12 @@ namespace sdr::properties
const SfxItemSet& GroupProperties::GetMergedItemSet() const
{
// prepare ItemSet
- if(mxItemSet)
+ if(moMergedItemSet)
// clear local itemset for merge
- mxItemSet->ClearItem();
- else if(!mxItemSet)
+ moMergedItemSet->ClearItem();
+ else if(!moMergedItemSet)
// force local itemset
- mxItemSet.emplace(GetSdrObject().GetObjectItemPool());
+ moMergedItemSet.emplace(GetSdrObject().GetObjectItemPool());
// collect all ItemSets in mpItemSet
const SdrObjList* pSub(static_cast<const
SdrObjGroup&>(GetSdrObject()).GetSubList());
@@ -79,11 +79,11 @@ namespace sdr::properties
{
if(SfxItemState::DONTCARE == aIter.GetItemState(false))
{
- mxItemSet->InvalidateItem(nWhich);
+ moMergedItemSet->InvalidateItem(nWhich);
}
else
{
- mxItemSet->MergeValue(rSet.Get(nWhich), true);
+ moMergedItemSet->MergeValue(rSet.Get(nWhich), true);
}
nWhich = aIter.NextWhich();
@@ -92,7 +92,7 @@ namespace sdr::properties
// For group properties, do not call parent since groups do
// not have local ItemSets.
- return *mxItemSet;
+ return *moMergedItemSet;
}
void GroupProperties::SetMergedItemSet(const SfxItemSet& rSet, bool
bClearAllItems)
