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

[Noel Grandin]

 editeng/source/items/paraitem.cxx |    2 +-
 include/editeng/tstpitem.hxx      |   22 ++++++++++++----------
 2 files changed, 13 insertions(+), 11 deletions(-)

New commits:
commit 2149bbfd2798cb5ed065ea25387616261a840634
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Thu Sep 28 13:40:12 2017 +0200

    rename SvxTabStop::IsEqual to operator==
    
    Change-Id: I98f8db6e80d6a5dc30826ec755deb9432f809e92
    Reviewed-on: https://gerrit.libreoffice.org/42907
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx
index 66adce966e62..d44253facaa8 100644
--- a/editeng/source/items/paraitem.cxx
+++ b/editeng/source/items/paraitem.cxx
@@ -922,7 +922,7 @@ bool SvxTabStopItem::operator==( const SfxPoolItem& rAttr ) const
         return false;
 
     for ( sal_uInt16 i = 0; i < Count(); ++i )
-        if( !(*this)[i].IsEqual( rTSI[i] ) )
+        if( (*this)[i] != rTSI[i] )
             return false;
     return true;
 }
diff --git a/include/editeng/tstpitem.hxx b/include/editeng/tstpitem.hxx
index c5ba30035058..34c65604bc8c 100644
--- a/include/editeng/tstpitem.hxx
+++ b/include/editeng/tstpitem.hxx
@@ -35,10 +35,10 @@
 class EDITENG_DLLPUBLIC SvxTabStop
 {
 private:
-    sal_Int32 nTabPos;
-
+    sal_Int32       nTabPos;
     SvxTabAdjust    eAdjustment;
-    mutable sal_Unicode     m_cDecimal;
+    mutable sal_Unicode
+                    m_cDecimal;
     sal_Unicode     cFill;
 
     void fillDecimal() const;
@@ -50,11 +50,11 @@ public:
                 const sal_Unicode cDec = cDfltDecimalChar,
                 const sal_Unicode cFil = cDfltFillChar );
 
-    sal_Int32& GetTabPos() { return nTabPos; }
-    sal_Int32  GetTabPos() const { return nTabPos; }
+    sal_Int32&    GetTabPos() { return nTabPos; }
+    sal_Int32     GetTabPos() const { return nTabPos; }
 
-    SvxTabAdjust&   GetAdjustment() { return eAdjustment; }
-    SvxTabAdjust    GetAdjustment() const { return eAdjustment; }
+    SvxTabAdjust& GetAdjustment() { return eAdjustment; }
+    SvxTabAdjust  GetAdjustment() const { return eAdjustment; }
 
     sal_Unicode&  GetDecimal() { fillDecimal(); return m_cDecimal; }
     sal_Unicode   GetDecimal() const { fillDecimal(); return m_cDecimal; }
@@ -62,15 +62,17 @@ public:
     sal_Unicode&  GetFill() { return cFill; }
     sal_Unicode   GetFill() const { return cFill; }
 
-    // the "old" operator==()
-    bool          IsEqual( const SvxTabStop& rTS ) const
+    bool          operator==( const SvxTabStop& rTS ) const
                         {
                             return ( nTabPos     == rTS.nTabPos     &&
                                      eAdjustment == rTS.eAdjustment &&
                                      m_cDecimal    == rTS.m_cDecimal    &&
                                      cFill       == rTS.cFill );
                         }
-
+    bool          operator!=( const SvxTabStop& rTS ) const
+                        {
+                            return !operator==(rTS);
+                        }
     // For the SortedArray:
     bool            operator <( const SvxTabStop& rTS ) const
                         { return nTabPos < rTS.nTabPos; }