[Libreoffice-commits] core.git: editeng/source include/editeng include/svx svx/source
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Thu Feb 6 16:31:13 UTC 2020
editeng/source/items/frmitems.cxx | 24 ++++++++++++------------
include/editeng/lrspitem.hxx | 8 ++++----
include/svx/paraprev.hxx | 4 ++--
svx/source/dialog/paraprev.cxx | 4 ++--
4 files changed, 20 insertions(+), 20 deletions(-)
New commits:
commit 3eba9b681994129da5be5b03f9aaa1ab2b7583aa
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Wed Feb 5 15:22:43 2020 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Thu Feb 6 17:30:32 2020 +0100
rename nFirstLineOfst -> nFirstLineOffset
Change-Id: Ic56453d5bffe5b0c0edd354bbaa2c3e78db52a13
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88026
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index 5fe11a2f52a2..9f8764454f7c 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -290,7 +290,7 @@ SvxLRSpaceItem::SvxLRSpaceItem( const sal_uInt16 nId ) :
nPropFirstLineOffset( 100 ),
nPropLeftMargin( 100 ),
nPropRightMargin( 100 ),
- nFirstLineOfst ( 0 ),
+ nFirstLineOffset ( 0 ),
bAutoFirst ( false ),
bExplicitZeroMarginValRight(false),
bExplicitZeroMarginValLeft(false)
@@ -309,7 +309,7 @@ SvxLRSpaceItem::SvxLRSpaceItem( const long nLeft, const long nRight,
nPropFirstLineOffset( 100 ),
nPropLeftMargin( 100 ),
nPropRightMargin( 100 ),
- nFirstLineOfst ( nOfset ),
+ nFirstLineOffset ( nOfset ),
bAutoFirst ( false ),
bExplicitZeroMarginValRight(false),
bExplicitZeroMarginValLeft(false)
@@ -333,7 +333,7 @@ bool SvxLRSpaceItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
aLRSpace.Right = static_cast<sal_Int32>(bConvert ? convertTwipToMm100(nRightMargin) : nRightMargin);
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.FirstLine = static_cast<sal_Int32>(bConvert ? convertTwipToMm100(nFirstLineOffset) : nFirstLineOffset);
aLRSpace.ScaleFirstLine = static_cast<sal_Int16>(nPropFirstLineOffset);
aLRSpace.AutoFirstLine = IsAutoFirst();
rVal <<= aLRSpace;
@@ -357,7 +357,7 @@ bool SvxLRSpaceItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
break;
case MID_FIRST_LINE_INDENT:
- rVal <<= static_cast<sal_Int32>(bConvert ? convertTwipToMm100(nFirstLineOfst) : nFirstLineOfst);
+ rVal <<= static_cast<sal_Int32>(bConvert ? convertTwipToMm100(nFirstLineOffset) : nFirstLineOffset);
break;
case MID_FIRST_LINE_REL_INDENT:
@@ -454,8 +454,8 @@ bool SvxLRSpaceItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
/// Adapt nLeftMargin and nTxtLeft.
void SvxLRSpaceItem::AdjustLeft()
{
- if ( 0 > nFirstLineOfst )
- nLeftMargin = nTxtLeft + nFirstLineOfst;
+ if ( 0 > nFirstLineOffset )
+ nLeftMargin = nTxtLeft + nFirstLineOffset;
else
nLeftMargin = nTxtLeft;
}
@@ -468,7 +468,7 @@ bool SvxLRSpaceItem::operator==( const SfxPoolItem& rAttr ) const
const SvxLRSpaceItem& rOther = static_cast<const SvxLRSpaceItem&>(rAttr);
return (
- nFirstLineOfst == rOther.GetTextFirstLineOffset() &&
+ nFirstLineOffset == rOther.GetTextFirstLineOffset() &&
nTxtLeft == rOther.GetTextLeft() &&
nLeftMargin == rOther.GetLeft() &&
nRightMargin == rOther.GetRight() &&
@@ -512,7 +512,7 @@ bool SvxLRSpaceItem::GetPresentation
Application::GetSettings().GetUILanguageTag());
}
else
- rText += GetMetricText( static_cast<long>(nFirstLineOfst),
+ rText += GetMetricText( static_cast<long>(nFirstLineOffset),
eCoreUnit, ePresUnit, &rIntl );
rText += OUString(cpDelim);
if ( 100 != nRightMargin )
@@ -537,7 +537,7 @@ bool SvxLRSpaceItem::GetPresentation
" " + EditResId(GetMetricId(ePresUnit));
}
rText += OUString(cpDelim);
- if ( 100 != nPropFirstLineOffset || nFirstLineOfst )
+ if ( 100 != nPropFirstLineOffset || nFirstLineOffset )
{
rText += EditResId(RID_SVXITEMS_LRSPACE_FLINE);
if ( 100 != nPropFirstLineOffset )
@@ -545,7 +545,7 @@ bool SvxLRSpaceItem::GetPresentation
Application::GetSettings().GetUILanguageTag());
else
{
- rText += GetMetricText( static_cast<long>(nFirstLineOfst),
+ rText += GetMetricText( static_cast<long>(nFirstLineOffset),
eCoreUnit, ePresUnit, &rIntl ) +
" " + EditResId(GetMetricId(ePresUnit));
}
@@ -571,7 +571,7 @@ bool SvxLRSpaceItem::GetPresentation
void SvxLRSpaceItem::ScaleMetrics( long nMult, long nDiv )
{
- nFirstLineOfst = static_cast<short>(Scale( nFirstLineOfst, nMult, nDiv ));
+ nFirstLineOffset = static_cast<short>(Scale( nFirstLineOffset, nMult, nDiv ));
nTxtLeft = Scale( nTxtLeft, nMult, nDiv );
nLeftMargin = Scale( nLeftMargin, nMult, nDiv );
nRightMargin = Scale( nRightMargin, nMult, nDiv );
@@ -588,7 +588,7 @@ void SvxLRSpaceItem::dumpAsXml(xmlTextWriterPtr pWriter) const
{
xmlTextWriterStartElement(pWriter, BAD_CAST("SvxLRSpaceItem"));
xmlTextWriterWriteAttribute(pWriter, BAD_CAST("whichId"), BAD_CAST(OString::number(Which()).getStr()));
- xmlTextWriterWriteAttribute(pWriter, BAD_CAST("nFirstLineOfst"), BAD_CAST(OString::number(nFirstLineOfst).getStr()));
+ xmlTextWriterWriteAttribute(pWriter, BAD_CAST("nFirstLineOffset"), BAD_CAST(OString::number(nFirstLineOffset).getStr()));
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()));
diff --git a/include/editeng/lrspitem.hxx b/include/editeng/lrspitem.hxx
index 6293d3479216..4fd809ae600e 100644
--- a/include/editeng/lrspitem.hxx
+++ b/include/editeng/lrspitem.hxx
@@ -53,7 +53,7 @@ class EDITENG_DLLPUBLIC SvxLRSpaceItem final : public SfxPoolItem
long nRightMargin; // The unproblematic right edge
sal_uInt16 nPropFirstLineOffset, nPropLeftMargin, nPropRightMargin;
- short nFirstLineOfst; // First-line indent _always_ relative to nTxtLeft
+ short nFirstLineOffset; // First-line indent _always_ relative to nTxtLeft
bool bAutoFirst; // Automatic calculation of the first line indent
bool bExplicitZeroMarginValRight;
bool bExplicitZeroMarginValLeft;
@@ -109,13 +109,13 @@ public:
long GetTextLeft() const { return nTxtLeft; }
inline void SetTextFirstLineOffset( const short nF, const sal_uInt16 nProp = 100 );
- short GetTextFirstLineOffset() const { return nFirstLineOfst; }
+ short GetTextFirstLineOffset() const { return nFirstLineOffset; }
void SetPropTextFirstLineOffset( const sal_uInt16 nProp )
{ nPropFirstLineOffset = nProp; }
sal_uInt16 GetPropTextFirstLineOffset() const
{ return nPropFirstLineOffset; }
void SetTextFirstLineOffsetValue( const short nValue )
- { nFirstLineOfst = nValue; }
+ { nFirstLineOffset = nValue; }
void dumpAsXml(xmlTextWriterPtr pWriter) const override;
virtual boost::property_tree::ptree dumpAsJSON() const override;
@@ -139,7 +139,7 @@ inline void SvxLRSpaceItem::SetRight( const long nR, const sal_uInt16 nProp )
inline void SvxLRSpaceItem::SetTextFirstLineOffset( const short nF,
const sal_uInt16 nProp )
{
- nFirstLineOfst = short((long(nF) * nProp ) / 100);
+ nFirstLineOffset = short((long(nF) * nProp ) / 100);
nPropFirstLineOffset = nProp;
AdjustLeft();
}
diff --git a/include/svx/paraprev.hxx b/include/svx/paraprev.hxx
index 885a22f1b171..8eb4001a75d7 100644
--- a/include/svx/paraprev.hxx
+++ b/include/svx/paraprev.hxx
@@ -41,7 +41,7 @@ class SVX_DLLPUBLIC SvxParaPrevWindow final : public weld::CustomWidgetControlle
// indentation
long nLeftMargin;
long nRightMargin;
- short nFirstLineOfst;
+ short nFirstLineOffset;
// distances
sal_uInt16 nUpper;
sal_uInt16 nLower;
@@ -61,7 +61,7 @@ public:
void SetFirstLineOffset( short nNew )
{
- nFirstLineOfst = nNew;
+ nFirstLineOffset = nNew;
}
void SetLeftMargin( long nNew )
{
diff --git a/svx/source/dialog/paraprev.cxx b/svx/source/dialog/paraprev.cxx
index 641e9ad40d1d..fb5003559edc 100644
--- a/svx/source/dialog/paraprev.cxx
+++ b/svx/source/dialog/paraprev.cxx
@@ -25,7 +25,7 @@
SvxParaPrevWindow::SvxParaPrevWindow() :
nLeftMargin ( 0 ),
nRightMargin ( 0 ),
- nFirstLineOfst ( 0 ),
+ nFirstLineOffset ( 0 ),
nUpper ( 0 ),
nLower ( 0 ),
eAdjust ( SvxAdjust::Left ),
@@ -93,7 +93,7 @@ void SvxParaPrevWindow::DrawParagraph(vcl::RenderContext& rRenderContext)
if (3 <= i && 6 > i)
{
long nLeft = nLeftMargin * aLineSiz.Width() / aSize.Width();
- long nFirst = nFirstLineOfst * aLineSiz.Width() / aSize.Width();
+ long nFirst = nFirstLineOffset * aLineSiz.Width() / aSize.Width();
long nTmp = nLeft + nFirst;
if (i == 3)
More information about the Libreoffice-commits
mailing list