[Libreoffice-commits] core.git: include/svl svl/source

[Chris Sherlock (via logerrit)]

 include/svl/rectitem.hxx      |    4 +--
 svl/source/items/rectitem.cxx |   44 +++++++++++++++++++++---------------------
 2 files changed, 24 insertions(+), 24 deletions(-)

New commits:
commit e1ab83cbc47ff581dd826d757dd2997743f47d58
Author:     Chris Sherlock <chris.sherloc...@gmail.com>
AuthorDate: Sun Jul 24 00:00:12 2022 +1000
Commit:     Tomaž Vajngerl <qui...@gmail.com>
CommitDate: Fri Aug 19 10:18:35 2022 +0200

    svl: rename SfxRectangleItem::aVal to maVal
    
    Change-Id: I7bc86de644749fb42eba89872828b15be47bb0dd
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137380
    Tested-by: Jenkins
    Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>

diff --git a/include/svl/rectitem.hxx b/include/svl/rectitem.hxx
index 94465bad4149..26c2acd37b65 100644
--- a/include/svl/rectitem.hxx
+++ b/include/svl/rectitem.hxx
@@ -27,7 +27,7 @@ class SvStream;
 
 class SVL_DLLPUBLIC SfxRectangleItem final : public SfxPoolItem
 {
-    tools::Rectangle                aVal;
+    tools::Rectangle                maVal;
 
 public:
                              static SfxPoolItem* CreateDefault();
@@ -43,7 +43,7 @@ public:
     virtual bool             operator==( const SfxPoolItem& ) const override;
     virtual SfxRectangleItem* Clone( SfxItemPool *pPool = nullptr ) const 
override;
 
-    const tools::Rectangle&         GetValue() const { return aVal; }
+    const tools::Rectangle&         GetValue() const { return maVal; }
     virtual bool             QueryValue( css::uno::Any& rVal,
                                           sal_uInt8 nMemberId = 0 ) const 
override;
     virtual bool             PutValue( const css::uno::Any& rVal,
diff --git a/svl/source/items/rectitem.cxx b/svl/source/items/rectitem.cxx
index 9f6789d3b707..f6a5db309d4b 100644
--- a/svl/source/items/rectitem.cxx
+++ b/svl/source/items/rectitem.cxx
@@ -37,7 +37,7 @@ SfxRectangleItem::SfxRectangleItem()
 
 SfxRectangleItem::SfxRectangleItem( sal_uInt16 nW, const tools::Rectangle& 
rVal ) :
     SfxPoolItem( nW ),
-    aVal( rVal )
+    maVal( rVal )
 {
 }
 
@@ -51,10 +51,10 @@ bool SfxRectangleItem::GetPresentation
     const IntlWrapper&
 )   const
 {
-    rText = OUString::number(aVal.Top())    + ", " +
-            OUString::number(aVal.Left())   + ", " +
-            OUString::number(aVal.Bottom()) + ", " +
-            OUString::number(aVal.Right());
+    rText = OUString::number(maVal.Top())    + ", " +
+            OUString::number(maVal.Left())   + ", " +
+            OUString::number(maVal.Bottom()) + ", " +
+            OUString::number(maVal.Right());
     return true;
 }
 
@@ -62,7 +62,7 @@ bool SfxRectangleItem::GetPresentation
 bool SfxRectangleItem::operator==( const SfxPoolItem& rItem ) const
 {
     assert(SfxPoolItem::operator==(rItem));
-    return static_cast<const SfxRectangleItem&>(rItem).aVal == aVal;
+    return static_cast<const SfxRectangleItem&>(rItem).maVal == maVal;
 }
 
 SfxRectangleItem* SfxRectangleItem::Clone(SfxItemPool *) const
@@ -78,16 +78,16 @@ bool SfxRectangleItem::QueryValue( css::uno::Any& rVal,
     {
         case 0:
         {
-            rVal <<= css::awt::Rectangle( aVal.Left(),
-                                             aVal.Top(),
-                                             aVal.getOpenWidth(),
-                                             aVal.getOpenHeight() );
+            rVal <<= css::awt::Rectangle( maVal.Left(),
+                                             maVal.Top(),
+                                             maVal.getOpenWidth(),
+                                             maVal.getOpenHeight() );
             break;
         }
-        case MID_RECT_LEFT:  rVal <<= aVal.Left(); break;
-        case MID_RECT_RIGHT: rVal <<= aVal.Top(); break;
-        case MID_WIDTH: rVal <<= aVal.getOpenWidth(); break;
-        case MID_HEIGHT: rVal <<= aVal.getOpenHeight(); break;
+        case MID_RECT_LEFT:  rVal <<= maVal.Left(); break;
+        case MID_RECT_RIGHT: rVal <<= maVal.Top(); break;
+        case MID_WIDTH: rVal <<= maVal.getOpenWidth(); break;
+        case MID_HEIGHT: rVal <<= maVal.getOpenHeight(); break;
         default: OSL_FAIL("Wrong MemberID!"); return false;
     }
 
@@ -112,15 +112,15 @@ bool SfxRectangleItem::PutValue( const css::uno::Any& 
rVal,
         switch ( nMemberId )
         {
             case 0:
-                aVal.SetLeft( aValue.X );
-                aVal.SetTop( aValue.Y );
-                aVal.setWidth( aValue.Width );
-                aVal.setHeight( aValue.Height );
+                maVal.SetLeft( aValue.X );
+                maVal.SetTop( aValue.Y );
+                maVal.setWidth( aValue.Width );
+                maVal.setHeight( aValue.Height );
                 break;
-            case MID_RECT_LEFT:  aVal.SetPosX( nVal ); break;
-            case MID_RECT_RIGHT: aVal.SetPosY( nVal ); break;
-            case MID_WIDTH: aVal.setWidth( nVal ); break;
-            case MID_HEIGHT: aVal.setHeight( nVal ); break;
+            case MID_RECT_LEFT:  maVal.SetPosX( nVal ); break;
+            case MID_RECT_RIGHT: maVal.SetPosY( nVal ); break;
+            case MID_WIDTH: maVal.setWidth( nVal ); break;
+            case MID_HEIGHT: maVal.setHeight( nVal ); break;
             default: OSL_FAIL("Wrong MemberID!"); return false;
         }
     }