editeng/source/items/frmitems.cxx | 22 +++++++++++-----------
include/editeng/lrspitem.hxx | 8 ++++----
sc/source/core/data/docpool.cxx | 2 +-
3 files changed, 16 insertions(+), 16 deletions(-)
New commits:
commit fa2389e3f5cbbdd937d7d70531b58c933a79c336
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Wed Feb 5 15:21:41 2020 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Thu Feb 6 12:04:28 2020 +0100
rename nPropFirstLineOfst->nPropFirstLineOffset
Change-Id: I4a51d84131eda55f80e9e3932a8bf8290e1c27c3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88025
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/editeng/source/items/frmitems.cxx
b/editeng/source/items/frmitems.cxx
index 74d6dbdc563c..5fe11a2f52a2 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -287,7 +287,7 @@ SvxLRSpaceItem::SvxLRSpaceItem( const sal_uInt16 nId ) :
nTxtLeft ( 0 ),
nLeftMargin ( 0 ),
nRightMargin ( 0 ),
- nPropFirstLineOfst( 100 ),
+ nPropFirstLineOffset( 100 ),
nPropLeftMargin( 100 ),
nPropRightMargin( 100 ),
nFirstLineOfst ( 0 ),
@@ -306,7 +306,7 @@ SvxLRSpaceItem::SvxLRSpaceItem( const long nLeft, const
long nRight,
nTxtLeft ( nTLeft ),
nLeftMargin ( nLeft ),
nRightMargin ( nRight ),
- nPropFirstLineOfst( 100 ),
+ nPropFirstLineOffset( 100 ),
nPropLeftMargin( 100 ),
nPropRightMargin( 100 ),
nFirstLineOfst ( nOfset ),
@@ -334,7 +334,7 @@ bool SvxLRSpaceItem::QueryValue( uno::Any& rVal, sal_uInt8
nMemberId ) const
aLRSpace.ScaleLeft = static_cast<sal_Int16>(nPropLeftMargin);
aLRSpace.ScaleRight = static_cast<sal_Int16>(nPropRightMargin);
aLRSpace.FirstLine = static_cast<sal_Int32>(bConvert ?
convertTwipToMm100(nFirstLineOfst) : nFirstLineOfst);
- aLRSpace.ScaleFirstLine =
static_cast<sal_Int16>(nPropFirstLineOfst);
+ aLRSpace.ScaleFirstLine =
static_cast<sal_Int16>(nPropFirstLineOffset);
aLRSpace.AutoFirstLine = IsAutoFirst();
rVal <<= aLRSpace;
break;
@@ -361,7 +361,7 @@ bool SvxLRSpaceItem::QueryValue( uno::Any& rVal, sal_uInt8
nMemberId ) const
break;
case MID_FIRST_LINE_REL_INDENT:
- rVal <<= static_cast<sal_Int16>(nPropFirstLineOfst);
+ rVal <<= static_cast<sal_Int16>(nPropFirstLineOffset);
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.GetPropTextFirstLineOffset() &&
+ nPropFirstLineOffset == rOther.GetPropTextFirstLineOffset() &&
nPropLeftMargin == rOther.GetPropLeft() &&
nPropRightMargin == rOther.GetPropRight() &&
bAutoFirst == rOther.IsAutoFirst() &&
@@ -506,9 +506,9 @@ bool SvxLRSpaceItem::GetPresentation
rText = GetMetricText( nLeftMargin,
eCoreUnit, ePresUnit, &rIntl );
rText += OUString(cpDelim);
- if ( 100 != nPropFirstLineOfst )
+ if ( 100 != nPropFirstLineOffset )
{
- rText += unicode::formatPercent(nPropFirstLineOfst,
+ rText += unicode::formatPercent(nPropFirstLineOffset,
Application::GetSettings().GetUILanguageTag());
}
else
@@ -537,11 +537,11 @@ bool SvxLRSpaceItem::GetPresentation
" " + EditResId(GetMetricId(ePresUnit));
}
rText += OUString(cpDelim);
- if ( 100 != nPropFirstLineOfst || nFirstLineOfst )
+ if ( 100 != nPropFirstLineOffset || nFirstLineOfst )
{
rText += EditResId(RID_SVXITEMS_LRSPACE_FLINE);
- if ( 100 != nPropFirstLineOfst )
- rText += unicode::formatPercent(nPropFirstLineOfst,
+ if ( 100 != nPropFirstLineOffset )
+ rText += unicode::formatPercent(nPropFirstLineOffset,
Application::GetSettings().GetUILanguageTag());
else
{
@@ -592,7 +592,7 @@ void SvxLRSpaceItem::dumpAsXml(xmlTextWriterPtr pWriter)
const
xmlTextWriterWriteAttribute(pWriter, BAD_CAST("nTxtLeft"),
BAD_CAST(OString::number(nTxtLeft).getStr()));
xmlTextWriterWriteAttribute(pWriter, BAD_CAST("nLeftMargin"),
BAD_CAST(OString::number(nLeftMargin).getStr()));
xmlTextWriterWriteAttribute(pWriter, BAD_CAST("nRightMargin"),
BAD_CAST(OString::number(nRightMargin).getStr()));
- xmlTextWriterWriteAttribute(pWriter, BAD_CAST("nPropFirstLineOfst"),
BAD_CAST(OString::number(nPropFirstLineOfst).getStr()));
+ xmlTextWriterWriteAttribute(pWriter, BAD_CAST("nPropFirstLineOffset"),
BAD_CAST(OString::number(nPropFirstLineOffset).getStr()));
xmlTextWriterWriteAttribute(pWriter, BAD_CAST("nPropLeftMargin"),
BAD_CAST(OString::number(nPropLeftMargin).getStr()));
xmlTextWriterWriteAttribute(pWriter, BAD_CAST("nPropRightMargin"),
BAD_CAST(OString::number(nPropRightMargin).getStr()));
xmlTextWriterWriteAttribute(pWriter, BAD_CAST("bAutoFirst"),
BAD_CAST(OString::number(int(bAutoFirst)).getStr()));
diff --git a/include/editeng/lrspitem.hxx b/include/editeng/lrspitem.hxx
index 5567c3c03b9f..6293d3479216 100644
--- a/include/editeng/lrspitem.hxx
+++ b/include/editeng/lrspitem.hxx
@@ -52,7 +52,7 @@ class EDITENG_DLLPUBLIC SvxLRSpaceItem final : public
SfxPoolItem
long nLeftMargin; // nLeft or the negative first-line indent
long nRightMargin; // The unproblematic right edge
- sal_uInt16 nPropFirstLineOfst, nPropLeftMargin, nPropRightMargin;
+ sal_uInt16 nPropFirstLineOffset, nPropLeftMargin, nPropRightMargin;
short nFirstLineOfst; // First-line indent _always_ relative to
nTxtLeft
bool bAutoFirst; // Automatic calculation of the first line
indent
bool bExplicitZeroMarginValRight;
@@ -111,9 +111,9 @@ public:
inline void SetTextFirstLineOffset( const short nF, const sal_uInt16
nProp = 100 );
short GetTextFirstLineOffset() const { return nFirstLineOfst; }
void SetPropTextFirstLineOffset( const sal_uInt16 nProp )
- { nPropFirstLineOfst = nProp; }
+ { nPropFirstLineOffset = nProp; }
sal_uInt16 GetPropTextFirstLineOffset() const
- { return nPropFirstLineOfst; }
+ { return nPropFirstLineOffset; }
void SetTextFirstLineOffsetValue( const short nValue )
{ nFirstLineOfst = nValue; }
@@ -140,7 +140,7 @@ inline void SvxLRSpaceItem::SetTextFirstLineOffset( const
short nF,
const sal_uInt16 nProp )
{
nFirstLineOfst = short((long(nF) * nProp ) / 100);
- nPropFirstLineOfst = nProp;
+ nPropFirstLineOffset = nProp;
AdjustLeft();
}
diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx
index d229654de2fe..3325a36e6ff9 100644
--- a/sc/source/core/data/docpool.cxx
+++ b/sc/source/core/data/docpool.cxx
@@ -440,7 +440,7 @@ static bool lcl_HFPresentation
" " + EditResId(GetMetricId(ePresentationMetric));
}
aText += cpDelim +
- // We don't have a nPropFirstLineOfst
+ // We don't have a nPropFirstLineOffset
EditResId(RID_SVXITEMS_LRSPACE_RIGHT);
if ( 100 != nPropRightMargin )
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
