rename mxItemSet->moItemSet in DefaultProperties

because it reduces the noise in an upcoming patch

Change-Id: I67d7b719609271f626e38596416eb511fbd40b07
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158714
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

12 files changed, 72 insertions, 72 deletions

diff --git a/include/svx/sdr/properties/defaultproperties.hxx b/include/svx/sdr/properties/defaultproperties.hxx
index bec1fbe27320..410fa593ac92 100644
--- a/include/svx/sdr/properties/defaultproperties.hxx
+++ b/include/svx/sdr/properties/defaultproperties.hxx
@@ -38,7 +38,7 @@ namespace sdr::properties
         {
         protected:
             // the to be used ItemSet
-            mutable std::optional<SfxItemSet> mxItemSet;
+            mutable std::optional<SfxItemSet> moItemSet;
 
             // create a new object specific itemset with object specific ranges.
             virtual SfxItemSet CreateObjectSpecificItemSet(SfxItemPool& pPool) override;
@@ -60,7 +60,7 @@ namespace sdr::properties
             virtual void ItemSetChanged(std::span< const SfxPoolItem* const > aChangedItems, sal_uInt16 nDeletedWhich);
 
             // check if SfxItemSet exists
-            bool HasSfxItemSet() const { return bool(mxItemSet); }
+            bool HasSfxItemSet() const { return bool(moItemSet); }
 
         public:
             // basic constructor
diff --git a/svx/source/sdr/properties/attributeproperties.cxx b/svx/source/sdr/properties/attributeproperties.cxx
index 37bdc9cfa05a..3fc050f825f9 100644
--- a/svx/source/sdr/properties/attributeproperties.cxx
+++ b/svx/source/sdr/properties/attributeproperties.cxx
@@ -55,7 +55,7 @@ namespace sdr::properties
                     {
                         if(SfxItemState::SET == aIter.GetItemState())
                         {
-                            mxItemSet->ClearItem(nWhich);
+                            moItemSet->ClearItem(nWhich);
                         }
 
                         nWhich = aIter.NextWhich();
@@ -63,7 +63,7 @@ namespace sdr::properties
                 }
 
                 // set new stylesheet as parent
-                mxItemSet->SetParent(&mpStyleSheet->GetItemSet());
+                moItemSet->SetParent(&mpStyleSheet->GetItemSet());
             }
             else
             {
@@ -110,7 +110,7 @@ namespace sdr::properties
                 // reset parent of ItemSet
                 if(HasSfxItemSet())
                 {
-                    mxItemSet->SetParent(nullptr);
+                    moItemSet->SetParent(nullptr);
                 }
 
                 SdrObject& rObj = GetSdrObject();
@@ -272,7 +272,7 @@ namespace sdr::properties
                 }
             }
 
-            return *mxItemSet;
+            return *moItemSet;
         }
 
         void AttributeProperties::ItemSetChanged(std::span< const SfxPoolItem* const > /*aChangedItems*/, sal_uInt16 /*nDeletedWhich*/)
@@ -339,11 +339,11 @@ namespace sdr::properties
                 if(pResultItem)
                 {
                     // force ItemSet
-                    mxItemSet->Put(std::move(pResultItem));
+                    moItemSet->Put(std::move(pResultItem));
                 }
                 else
                 {
-                    mxItemSet->Put(*pNewItem);
+                    moItemSet->Put(*pNewItem);
                 }
             }
             else
@@ -351,7 +351,7 @@ namespace sdr::properties
                 // clear item if ItemSet exists
                 if(HasSfxItemSet())
                 {
-                    mxItemSet->ClearItem(nWhich);
+                    moItemSet->ClearItem(nWhich);
                 }
             }
         }
@@ -384,7 +384,7 @@ namespace sdr::properties
             GetObjectItemSet();
 
             // prepare copied, new itemset, but WITHOUT parent
-            SfxItemSet aDestItemSet(*mxItemSet);
+            SfxItemSet aDestItemSet(*moItemSet);
             aDestItemSet.SetParent(nullptr);
 
             // prepare forgetting the current stylesheet like in RemoveStyleSheet()
@@ -402,7 +402,7 @@ namespace sdr::properties
             {
                 // #i61284# use mpItemSet with parents, makes things easier and reduces to
                 // one loop
-                if(SfxItemState::SET == mxItemSet->GetItemState(nWhich, true, &pItem))
+                if(SfxItemState::SET == moItemSet->GetItemState(nWhich, true, &pItem))
                 {
                     aDestItemSet.Put(*pItem);
                 }
@@ -411,7 +411,7 @@ namespace sdr::properties
             }
 
             // replace itemsets
-            mxItemSet.emplace(std::move(aDestItemSet));
+            moItemSet.emplace(std::move(aDestItemSet));
 
             // set necessary changes like in RemoveStyleSheet()
             GetSdrObject().SetBoundRectDirty();
diff --git a/svx/source/sdr/properties/captionproperties.cxx b/svx/source/sdr/properties/captionproperties.cxx
index 93c6146ac0d4..31bb62268521 100644
--- a/svx/source/sdr/properties/captionproperties.cxx
+++ b/svx/source/sdr/properties/captionproperties.cxx
@@ -96,10 +96,10 @@ namespace sdr::properties
             // reset to default
             if (static_cast<SdrCaptionObj&>(GetSdrObject()).GetSpecialTextBoxShadow())
             {
-                mxItemSet->ClearItem(XATTR_FILLCOLOR);
-                mxItemSet->ClearItem(XATTR_FILLSTYLE);
+                moItemSet->ClearItem(XATTR_FILLCOLOR);
+                moItemSet->ClearItem(XATTR_FILLSTYLE);
             }
-            mxItemSet->ClearItem(XATTR_LINESTYLE);
+            moItemSet->ClearItem(XATTR_LINESTYLE);
         }
 } // end of namespace
 
diff --git a/svx/source/sdr/properties/circleproperties.cxx b/svx/source/sdr/properties/circleproperties.cxx
index 6c77c365f989..6f589f67548f 100644
--- a/svx/source/sdr/properties/circleproperties.cxx
+++ b/svx/source/sdr/properties/circleproperties.cxx
@@ -101,16 +101,16 @@ namespace sdr::properties
                 // force ItemSet
                 GetObjectItemSet();
 
-                mxItemSet->Put(SdrCircKindItem(eKind));
+                moItemSet->Put(SdrCircKindItem(eKind));
 
                 if(rObj.GetStartAngle())
                 {
-                    mxItemSet->Put(makeSdrCircStartAngleItem(rObj.GetStartAngle()));
+                    moItemSet->Put(makeSdrCircStartAngleItem(rObj.GetStartAngle()));
                 }
 
                 if(rObj.GetEndAngle() != 36000_deg100)
                 {
-                    mxItemSet->Put(makeSdrCircEndAngleItem(rObj.GetEndAngle()));
+                    moItemSet->Put(makeSdrCircEndAngleItem(rObj.GetEndAngle()));
                 }
             }
 
diff --git a/svx/source/sdr/properties/customshapeproperties.cxx b/svx/source/sdr/properties/customshapeproperties.cxx
index 82ec37c7de07..cbad73ab78c2 100644
--- a/svx/source/sdr/properties/customshapeproperties.cxx
+++ b/svx/source/sdr/properties/customshapeproperties.cxx
@@ -95,7 +95,7 @@ namespace sdr::properties
         {
             if ( !nWhich )
             {
-                SfxWhichIter aIter( *mxItemSet );
+                SfxWhichIter aIter( *moItemSet );
                 sal_uInt16 nWhich2 = aIter.FirstWhich();
                 while( nWhich2 )
                 {
@@ -112,7 +112,7 @@ namespace sdr::properties
         {
             if ( !nWhich )
             {
-                SfxWhichIter aIter( *mxItemSet );
+                SfxWhichIter aIter( *moItemSet );
                 sal_uInt16 nWhich2 = aIter.FirstWhich();
                 while( nWhich2 )
                 {
diff --git a/svx/source/sdr/properties/defaultproperties.cxx b/svx/source/sdr/properties/defaultproperties.cxx
index 2d3d54c15e06..ec98d7a0d07d 100644
--- a/svx/source/sdr/properties/defaultproperties.cxx
+++ b/svx/source/sdr/properties/defaultproperties.cxx
@@ -48,13 +48,13 @@ namespace sdr::properties
         DefaultProperties::DefaultProperties(const DefaultProperties& rProps, SdrObject& rObj)
         :   BaseProperties(rObj)
         {
-            if(!rProps.mxItemSet)
+            if(!rProps.moItemSet)
                 return;
 
             // Clone may be to another model and thus another ItemPool.
             // SfxItemSet supports that thus we are able to Clone all
             // SfxItemState::SET items to the target pool.
-            mxItemSet.emplace(rProps.mxItemSet->CloneAsValue(
+            moItemSet.emplace(rProps.moItemSet->CloneAsValue(
                 true,
                 &rObj.getSdrModelFromSdrObject().GetItemPool()));
 
@@ -74,15 +74,15 @@ namespace sdr::properties
                 {
                     const Fraction aMetricFactor(GetMapFactor(aOldUnit, aNewUnit).X());
 
-                    ScaleItemSet(*mxItemSet, aMetricFactor);
+                    ScaleItemSet(*moItemSet, aMetricFactor);
                 }
             }
 
             // do not keep parent info, this may be changed by later constructors.
             // This class just copies the ItemSet, ignore parent.
-            if(mxItemSet && mxItemSet->GetParent())
+            if(moItemSet && moItemSet->GetParent())
             {
-                mxItemSet->SetParent(nullptr);
+                moItemSet->SetParent(nullptr);
             }
         }
 
@@ -95,15 +95,15 @@ namespace sdr::properties
 
         const SfxItemSet& DefaultProperties::GetObjectItemSet() const
         {
-            if(!mxItemSet)
+            if(!moItemSet)
             {
-                mxItemSet.emplace(const_cast<DefaultProperties*>(this)->CreateObjectSpecificItemSet(GetSdrObject().GetObjectItemPool()));
+                moItemSet.emplace(const_cast<DefaultProperties*>(this)->CreateObjectSpecificItemSet(GetSdrObject().GetObjectItemPool()));
                 const_cast<DefaultProperties*>(this)->ForceDefaultAttributes();
             }
 
-            assert(mxItemSet && "Could not create an SfxItemSet(!)");
+            assert(moItemSet && "Could not create an SfxItemSet(!)");
 
-            return *mxItemSet;
+            return *moItemSet;
         }
 
         void DefaultProperties::SetObjectItem(const SfxPoolItem& rItem)
@@ -216,8 +216,8 @@ namespace sdr::properties
 
         void DefaultProperties::PostItemChange(const sal_uInt16 nWhich )
         {
-            if( (nWhich == XATTR_FILLSTYLE) && mxItemSet )
-                CleanupFillProperties(*mxItemSet);
+            if( (nWhich == XATTR_FILLSTYLE) && moItemSet )
+                CleanupFillProperties(*moItemSet);
         }
 
         void DefaultProperties::SetStyleSheet(SfxStyleSheet* /*pNewStyleSheet*/, bool /*bDontRemoveHardAttr*/,
@@ -240,9 +240,9 @@ namespace sdr::properties
         {
             (void)xmlTextWriterStartElement(pWriter, BAD_CAST("DefaultProperties"));
             BaseProperties::dumpAsXml(pWriter);
-            if (mxItemSet)
+            if (moItemSet)
             {
-                mxItemSet->dumpAsXml(pWriter);
+                moItemSet->dumpAsXml(pWriter);
             }
             (void)xmlTextWriterEndElement(pWriter);
         }
diff --git a/svx/source/sdr/properties/e3dcompoundproperties.cxx b/svx/source/sdr/properties/e3dcompoundproperties.cxx
index c31d85fdc9de..2d65a74983f9 100644
--- a/svx/source/sdr/properties/e3dcompoundproperties.cxx
+++ b/svx/source/sdr/properties/e3dcompoundproperties.cxx
@@ -56,9 +56,9 @@ namespace sdr::properties
                 GetObjectItemSet();
 
                 // add filtered scene properties (SDRATTR_3DSCENE_) to local itemset
-                SfxItemSetFixed<SDRATTR_3DSCENE_FIRST, SDRATTR_3DSCENE_LAST> aSet(*mxItemSet->GetPool() );
+                SfxItemSetFixed<SDRATTR_3DSCENE_FIRST, SDRATTR_3DSCENE_LAST> aSet(*moItemSet->GetPool() );
                 aSet.Put(pScene->GetProperties().GetObjectItemSet());
-                mxItemSet->Put(aSet);
+                moItemSet->Put(aSet);
             }
 
             // call parent
@@ -77,7 +77,7 @@ namespace sdr::properties
                 GetObjectItemSet();
 
                 // Generate filtered scene properties (SDRATTR_3DSCENE_) itemset
-                SfxItemSetFixed<SDRATTR_3DSCENE_FIRST, SDRATTR_3DSCENE_LAST> aSet(*mxItemSet->GetPool());
+                SfxItemSetFixed<SDRATTR_3DSCENE_FIRST, SDRATTR_3DSCENE_LAST> aSet(*moItemSet->GetPool());
                 aSet.Put(rSet);
 
                 if(bClearAllItems)
diff --git a/svx/source/sdr/properties/e3dsceneproperties.cxx b/svx/source/sdr/properties/e3dsceneproperties.cxx
index 789472d5087a..b08d534aa685 100644
--- a/svx/source/sdr/properties/e3dsceneproperties.cxx
+++ b/svx/source/sdr/properties/e3dsceneproperties.cxx
@@ -50,13 +50,13 @@ namespace sdr::properties
         const SfxItemSet& E3dSceneProperties::GetMergedItemSet() const
         {
             // prepare ItemSet
-            if(mxItemSet)
+            if(moItemSet)
             {
                 // filter for SDRATTR_3DSCENE_ items, only keep those items
-                SfxItemSetFixed<SDRATTR_3DSCENE_FIRST, SDRATTR_3DSCENE_LAST> aNew(*mxItemSet->GetPool());
-                aNew.Put(*mxItemSet);
-                mxItemSet->ClearItem();
-                mxItemSet->Put(aNew);
+                SfxItemSetFixed<SDRATTR_3DSCENE_FIRST, SDRATTR_3DSCENE_LAST> aNew(*moItemSet->GetPool());
+                aNew.Put(*moItemSet);
+                moItemSet->ClearItem();
+                moItemSet->Put(aNew);
             }
             else
             {
@@ -85,11 +85,11 @@ namespace sdr::properties
                             {
                                 if(SfxItemState::DONTCARE == aIter.GetItemState(false))
                                 {
-                                    mxItemSet->InvalidateItem(nWhich);
+                                    moItemSet->InvalidateItem(nWhich);
                                 }
                                 else
                                 {
-                                    mxItemSet->MergeValue(rSet.Get(nWhich), true);
+                                    moItemSet->MergeValue(rSet.Get(nWhich), true);
                                 }
                             }
 
@@ -273,13 +273,13 @@ namespace sdr::properties
             const Camera3D& aSceneCam(rObj.GetCamera());
 
             // ProjectionType
-            mxItemSet->Put(Svx3DPerspectiveItem(aSceneCam.GetProjection()));
+            moItemSet->Put(Svx3DPerspectiveItem(aSceneCam.GetProjection()));
 
             // CamPos
-            mxItemSet->Put(makeSvx3DDistanceItem(static_cast<sal_uInt32>(aSceneCam.GetPosition().getZ() + 0.5)));
+            moItemSet->Put(makeSvx3DDistanceItem(static_cast<sal_uInt32>(aSceneCam.GetPosition().getZ() + 0.5)));
 
             // FocalLength
-            mxItemSet->Put(makeSvx3DFocalLengthItem(static_cast<sal_uInt32>((aSceneCam.GetFocalLength() * 100.0) + 0.5)));
+            moItemSet->Put(makeSvx3DFocalLengthItem(static_cast<sal_uInt32>((aSceneCam.GetFocalLength() * 100.0) + 0.5)));
         }
 } // end of namespace
 
diff --git a/svx/source/sdr/properties/graphicproperties.cxx b/svx/source/sdr/properties/graphicproperties.cxx
index 311b2708c490..3346c5d80048 100644
--- a/svx/source/sdr/properties/graphicproperties.cxx
+++ b/svx/source/sdr/properties/graphicproperties.cxx
@@ -135,16 +135,16 @@ namespace sdr::properties
             // force ItemSet
             GetObjectItemSet();
 
-            mxItemSet->Put( SdrGrafLuminanceItem( 0 ) );
-            mxItemSet->Put( SdrGrafContrastItem( 0 ) );
-            mxItemSet->Put( SdrGrafRedItem( 0 ) );
-            mxItemSet->Put( SdrGrafGreenItem( 0 ) );
-            mxItemSet->Put( SdrGrafBlueItem( 0 ) );
-            mxItemSet->Put( SdrGrafGamma100Item( 100 ) );
-            mxItemSet->Put( SdrGrafTransparenceItem( 0 ) );
-            mxItemSet->Put( SdrGrafInvertItem( false ) );
-            mxItemSet->Put( SdrGrafModeItem( GraphicDrawMode::Standard ) );
-            mxItemSet->Put( SdrGrafCropItem( 0, 0, 0, 0 ) );
+            moItemSet->Put( SdrGrafLuminanceItem( 0 ) );
+            moItemSet->Put( SdrGrafContrastItem( 0 ) );
+            moItemSet->Put( SdrGrafRedItem( 0 ) );
+            moItemSet->Put( SdrGrafGreenItem( 0 ) );
+            moItemSet->Put( SdrGrafBlueItem( 0 ) );
+            moItemSet->Put( SdrGrafGamma100Item( 100 ) );
+            moItemSet->Put( SdrGrafTransparenceItem( 0 ) );
+            moItemSet->Put( SdrGrafInvertItem( false ) );
+            moItemSet->Put( SdrGrafModeItem( GraphicDrawMode::Standard ) );
+            moItemSet->Put( SdrGrafCropItem( 0, 0, 0, 0 ) );
         }
 } // end of namespace
 
diff --git a/svx/source/sdr/properties/measureproperties.cxx b/svx/source/sdr/properties/measureproperties.cxx
index bd976345ba57..44cdae798899 100644
--- a/svx/source/sdr/properties/measureproperties.cxx
+++ b/svx/source/sdr/properties/measureproperties.cxx
@@ -111,7 +111,7 @@ namespace sdr::properties
             //#71958# by default, the show units Bool-Item is set as hard
             // attribute to sal_True to avoid confusion when copying SdrMeasureObj's
             // from one application to another
-            mxItemSet->Put(SdrYesNoItem(SDRATTR_MEASURESHOWUNIT, true));
+            moItemSet->Put(SdrYesNoItem(SDRATTR_MEASURESHOWUNIT, true));
 
             basegfx::B2DPolygon aNewPolygon;
             aNewPolygon.append(basegfx::B2DPoint(100.0, 0.0));
@@ -119,11 +119,11 @@ namespace sdr::properties
             aNewPolygon.append(basegfx::B2DPoint(0.0, 400.0));
             aNewPolygon.setClosed(true);
 
-            mxItemSet->Put(XLineStartItem(OUString(), basegfx::B2DPolyPolygon(aNewPolygon)));
-            mxItemSet->Put(XLineStartWidthItem(200));
-            mxItemSet->Put(XLineEndItem(OUString(), basegfx::B2DPolyPolygon(aNewPolygon)));
-            mxItemSet->Put(XLineEndWidthItem(200));
-            mxItemSet->Put(XLineStyleItem(css::drawing::LineStyle_SOLID));
+            moItemSet->Put(XLineStartItem(OUString(), basegfx::B2DPolyPolygon(aNewPolygon)));
+            moItemSet->Put(XLineStartWidthItem(200));
+            moItemSet->Put(XLineEndItem(OUString(), basegfx::B2DPolyPolygon(aNewPolygon)));
+            moItemSet->Put(XLineEndWidthItem(200));
+            moItemSet->Put(XLineStyleItem(css::drawing::LineStyle_SOLID));
         }
 } // end of namespace
 
diff --git a/svx/source/sdr/properties/textproperties.cxx b/svx/source/sdr/properties/textproperties.cxx
index 101287b79b97..b2bb7b746ab9 100644
--- a/svx/source/sdr/properties/textproperties.cxx
+++ b/svx/source/sdr/properties/textproperties.cxx
@@ -135,7 +135,7 @@ namespace sdr::properties
                             // force ItemSet
                             GetObjectItemSet();
 
-                            mxItemSet->Put(pOutliner->GetParaAttribs(0));
+                            moItemSet->Put(pOutliner->GetParaAttribs(0));
                         }
 
                         std::optional<OutlinerParaObject> pTemp = pOutliner->CreateParaObject(0, nParaCount);
@@ -379,15 +379,15 @@ namespace sdr::properties
 
             if(bTextFrame)
             {
-                mxItemSet->Put(XLineStyleItem(drawing::LineStyle_NONE));
-                mxItemSet->Put(XFillColorItem(OUString(), COL_WHITE));
-                mxItemSet->Put(XFillStyleItem(drawing::FillStyle_NONE));
+                moItemSet->Put(XLineStyleItem(drawing::LineStyle_NONE));
+                moItemSet->Put(XFillColorItem(OUString(), COL_WHITE));
+                moItemSet->Put(XFillStyleItem(drawing::FillStyle_NONE));
             }
             else
             {
-                mxItemSet->Put(SvxAdjustItem(SvxAdjust::Center, EE_PARA_JUST));
-                mxItemSet->Put(SdrTextHorzAdjustItem(SDRTEXTHORZADJUST_CENTER));
-                mxItemSet->Put(SdrTextVertAdjustItem(SDRTEXTVERTADJUST_CENTER));
+                moItemSet->Put(SvxAdjustItem(SvxAdjust::Center, EE_PARA_JUST));
+                moItemSet->Put(SdrTextHorzAdjustItem(SDRTEXTHORZADJUST_CENTER));
+                moItemSet->Put(SdrTextVertAdjustItem(SDRTEXTVERTADJUST_CENTER));
             }
         }
 
@@ -400,7 +400,7 @@ namespace sdr::properties
             // using existing functionality
             GetObjectItemSet(); // force ItemSet
             std::vector<const SfxPoolItem*> aChangedItems;
-            SfxItemIter aIter(*mxItemSet);
+            SfxItemIter aIter(*moItemSet);
             for (const SfxPoolItem* pItem = aIter.GetCurItem(); pItem; pItem = aIter.NextItem())
             {
                 if(!IsInvalidItem(pItem))
@@ -544,7 +544,7 @@ namespace sdr::properties
         void TextProperties::SetObjectItemNoBroadcast(const SfxPoolItem& rItem)
         {
             GetObjectItemSet();
-            mxItemSet->Put(rItem);
+            moItemSet->Put(rItem);
         }
 
 
diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx
index ea8e75efe3e5..98e46842e414 100644
--- a/svx/source/table/cell.cxx
+++ b/svx/source/table/cell.cxx
@@ -240,7 +240,7 @@ SdrText* CellTextProvider::getText(sal_Int32 nIndex) const
                             GetObjectItemSet();
 
                             SfxItemSet aNewSet(pOutliner->GetParaAttribs(0));
-                            mxItemSet->Put(aNewSet);
+                            moItemSet->Put(aNewSet);
                         }
 
                         std::optional<OutlinerParaObject> pTemp = pOutliner->CreateParaObject(0, nParaCount);