[Libreoffice-commits] core.git: svx/source

[Noel Grandin (via logerrit)]

 svx/source/unodraw/unoshape.cxx |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit e5675d7e03de5962af8828663529a780ca31dd5b
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Mon Oct 30 10:40:03 2023 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Mon Oct 30 14:21:51 2023 +0100

    rename mxItemSet->moItemSet in SvxShapeImpl
    
    because the improved naming is useful for a bigger patch that I want to
    land
    
    Change-Id: I3acea11288a2e70d6ea91c99b52d3a05916da4d2
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158643
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 2ce0ed35c3e6..b6ef17b86616 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -111,7 +111,7 @@ class GDIMetaFile;
 
 struct SvxShapeImpl
 {
-    std::optional<SfxItemSet> mxItemSet;
+    std::optional<SfxItemSet> moItemSet;
     SdrObjKind      mnObjId;
     SvxShapeMaster* mpMaster;
     bool            mbDisposing;
@@ -1534,11 +1534,11 @@ void SvxShape::_setPropertyValue( const OUString& 
rPropertyName, const uno::Any&
     SfxItemSet* pSet;
     if( mbIsMultiPropertyCall && !bIsNotPersist )
     {
-        if( !mpImpl->mxItemSet )
+        if( !mpImpl->moItemSet )
         {
-            mpImpl->mxItemSet.emplace( 
GetSdrObject()->GetProperties().CreateObjectSpecificItemSet( 
GetSdrObject()->getSdrModelFromSdrObject().GetItemPool() ) );
+            mpImpl->moItemSet.emplace( 
GetSdrObject()->GetProperties().CreateObjectSpecificItemSet( 
GetSdrObject()->getSdrModelFromSdrObject().GetItemPool() ) );
         }
-        pSet = &*mpImpl->mxItemSet;
+        pSet = &*mpImpl->moItemSet;
     }
     else
     {
@@ -1713,15 +1713,15 @@ void SAL_CALL SvxShape::setPropertyValues( const 
css::uno::Sequence< OUString >&
         }
     }
 
-    if( mpImpl->mxItemSet && HasSdrObject() )
-        GetSdrObject()->SetMergedItemSetAndBroadcast( *mpImpl->mxItemSet );
+    if( mpImpl->moItemSet && HasSdrObject() )
+        GetSdrObject()->SetMergedItemSetAndBroadcast( *mpImpl->moItemSet );
 }
 
 
 void SvxShape::endSetPropertyValues()
 {
     mbIsMultiPropertyCall = false;
-    mpImpl->mxItemSet.reset();
+    mpImpl->moItemSet.reset();
 }