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

[Noel Grandin (via logerrit)]

 cui/source/tabpages/paragrph.cxx  |    4 ++--
 editeng/source/items/frmitems.cxx |    6 +++---
 include/editeng/lrspitem.hxx      |    4 ++--
 sw/source/core/doc/fmtcol.cxx     |    4 ++--
 sw/source/filter/xml/xmlexpit.cxx |    4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 2b3ece8b2e22b42dd3e80a691a4a492837f7996b
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Tue Feb 4 11:50:32 2020 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Tue Feb 4 18:39:07 2020 +0100

    rename Get/SetPropTextFirstLineOfst -> Get/SetPropTextFirstLineOffset
    
    Change-Id: Ib963dccf0f803534c741eacc31a44dc5c90889fb
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87958
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index 749d03a03eef..54889cbf0bb5 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -483,10 +483,10 @@ void SvxStdParagraphTabPage::Reset( const SfxItemSet* rSet )
                 m_xRightIndent->SetMetricValue(rOldItem.GetRight(), eUnit);
             }
 
-            if ( rOldItem.GetPropTextFirstLineOfst() != 100 )
+            if ( rOldItem.GetPropTextFirstLineOffset() != 100 )
             {
                 m_xFLineIndent->SetRelative(true);
-                m_xFLineIndent->set_value(rOldItem.GetPropTextFirstLineOfst(), FieldUnit::NONE);
+                m_xFLineIndent->set_value(rOldItem.GetPropTextFirstLineOffset(), FieldUnit::NONE);
             }
             else
             {
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index 9530ce4423cc..74d6dbdc563c 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -401,7 +401,7 @@ bool SvxLRSpaceItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
             nPropLeftMargin = aLRSpace.ScaleLeft;
             nPropRightMargin = aLRSpace.ScaleRight;
             SetTextFirstLineOffset(static_cast<short>(bConvert ?  convertMm100ToTwip(aLRSpace.FirstLine) : aLRSpace.FirstLine));
-            SetPropTextFirstLineOfst ( static_cast<sal_uInt16>(aLRSpace.ScaleFirstLine) );
+            SetPropTextFirstLineOffset ( static_cast<sal_uInt16>(aLRSpace.ScaleFirstLine) );
             SetAutoFirst( aLRSpace.AutoFirstLine );
             break;
         }
@@ -436,7 +436,7 @@ bool SvxLRSpaceItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
             break;
 
         case MID_FIRST_LINE_REL_INDENT:
-            SetPropTextFirstLineOfst ( static_cast<sal_uInt16>(nVal) );
+            SetPropTextFirstLineOffset ( static_cast<sal_uInt16>(nVal) );
             break;
 
         case MID_FIRST_AUTO:
@@ -472,7 +472,7 @@ bool SvxLRSpaceItem::operator==( const SfxPoolItem& rAttr ) const
         nTxtLeft == rOther.GetTextLeft() &&
         nLeftMargin == rOther.GetLeft()  &&
         nRightMargin == rOther.GetRight() &&
-        nPropFirstLineOfst == rOther.GetPropTextFirstLineOfst() &&
+        nPropFirstLineOfst == rOther.GetPropTextFirstLineOffset() &&
         nPropLeftMargin == rOther.GetPropLeft()  &&
         nPropRightMargin == rOther.GetPropRight() &&
         bAutoFirst == rOther.IsAutoFirst() &&
diff --git a/include/editeng/lrspitem.hxx b/include/editeng/lrspitem.hxx
index f6ebc1ead0bd..5567c3c03b9f 100644
--- a/include/editeng/lrspitem.hxx
+++ b/include/editeng/lrspitem.hxx
@@ -110,9 +110,9 @@ public:
 
     inline void   SetTextFirstLineOffset( const short nF, const sal_uInt16 nProp = 100 );
     short  GetTextFirstLineOffset() const { return nFirstLineOfst; }
-    void SetPropTextFirstLineOfst( const sal_uInt16 nProp )
+    void SetPropTextFirstLineOffset( const sal_uInt16 nProp )
                     { nPropFirstLineOfst = nProp; }
-    sal_uInt16 GetPropTextFirstLineOfst() const
+    sal_uInt16 GetPropTextFirstLineOffset() const
                     { return nPropFirstLineOfst; }
     void SetTextFirstLineOffsetValue( const short nValue )
                     { nFirstLineOfst = nValue; }
diff --git a/sw/source/core/doc/fmtcol.cxx b/sw/source/core/doc/fmtcol.cxx
index d037a1357fa5..ab39abf3194f 100644
--- a/sw/source/core/doc/fmtcol.cxx
+++ b/sw/source/core/doc/fmtcol.cxx
@@ -225,11 +225,11 @@ void SwTextFormatColl::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew
                 bChg |= nTmp != aNew.GetRight();
             }
             // We had a relative value -> recalculate
-            if( 100 != aNew.GetPropTextFirstLineOfst() )
+            if( 100 != aNew.GetPropTextFirstLineOffset() )
             {
                 short nTmp = aNew.GetTextFirstLineOffset();    // keep so that we can compare
                 aNew.SetTextFirstLineOffset( pNewLRSpace->GetTextFirstLineOffset(),
-                                            aNew.GetPropTextFirstLineOfst() );
+                                            aNew.GetPropTextFirstLineOffset() );
                 bChg |= nTmp != aNew.GetTextFirstLineOffset();
             }
             if( bChg )
diff --git a/sw/source/filter/xml/xmlexpit.cxx b/sw/source/filter/xml/xmlexpit.cxx
index 57bb8c93a41c..1f8319562bef 100644
--- a/sw/source/filter/xml/xmlexpit.cxx
+++ b/sw/source/filter/xml/xmlexpit.cxx
@@ -410,10 +410,10 @@ bool SvXMLExportItemMapper::QueryXMLValue(
                 case  MID_FIRST_LINE_INDENT:
                     if (!rLRSpace.IsAutoFirst())
                     {
-                        if (rLRSpace.GetPropTextFirstLineOfst() != 100)
+                        if (rLRSpace.GetPropTextFirstLineOffset() != 100)
                         {
                             ::sax::Converter::convertPercent(
-                                aOut, rLRSpace.GetPropTextFirstLineOfst() );
+                                aOut, rLRSpace.GetPropTextFirstLineOffset() );
                         }
                         else
                         {