summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2020-02-04 11:15:02 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2020-02-04 13:12:24 +0100
commit7940abb4cc491fd1c72859ef21d120b3543bc40c (patch)
tree71acdbd0f8f5725b2fc2f982c7ce5d4c5ae6f52c /sw
parent042054d0507bac8ede0c045a58a91c0830312fc5 (diff)
rename Set/GetTextFirstLineOfst->Set/GetTextFirstLineOffset
Change-Id: Iaeb3c17fe157dec82cd70991122c08ee1e215752 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87955 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw')
-rw-r--r--sw/source/core/crsr/crstrvl.cxx2
-rw-r--r--sw/source/core/doc/DocumentStylePoolManager.cxx12
-rw-r--r--sw/source/core/doc/docfmt.cxx2
-rw-r--r--sw/source/core/doc/fmtcol.cxx6
-rw-r--r--sw/source/core/edit/autofmt.cxx4
-rw-r--r--sw/source/core/layout/fly.cxx2
-rw-r--r--sw/source/core/text/EnhancedPDFExportHelper.cxx2
-rw-r--r--sw/source/core/text/frmpaint.cxx4
-rw-r--r--sw/source/core/text/porfld.cxx2
-rw-r--r--sw/source/core/tox/ToxTabStopTokenHandler.cxx2
-rw-r--r--sw/source/core/txtnode/ndtxt.cxx10
-rw-r--r--sw/source/core/txtnode/thints.cxx2
-rw-r--r--sw/source/filter/html/css1atr.cxx2
-rw-r--r--sw/source/filter/html/htmlatr.cxx4
-rw-r--r--sw/source/filter/html/htmlcss1.cxx2
-rw-r--r--sw/source/filter/html/htmlctxt.cxx4
-rw-r--r--sw/source/filter/html/htmldrawreader.cxx2
-rw-r--r--sw/source/filter/html/htmlform.cxx2
-rw-r--r--sw/source/filter/html/htmlnumreader.cxx2
-rw-r--r--sw/source/filter/html/htmlplug.cxx2
-rw-r--r--sw/source/filter/html/svxcss1.cxx6
-rw-r--r--sw/source/filter/html/swhtml.cxx10
-rw-r--r--sw/source/filter/ww8/docxattributeoutput.cxx2
-rw-r--r--sw/source/filter/ww8/rtfattributeoutput.cxx4
-rw-r--r--sw/source/filter/ww8/wrtw8nds.cxx8
-rw-r--r--sw/source/filter/ww8/ww8atr.cxx4
-rw-r--r--sw/source/filter/ww8/ww8par.cxx8
-rw-r--r--sw/source/filter/ww8/ww8par2.cxx2
-rw-r--r--sw/source/filter/ww8/ww8par3.cxx6
-rw-r--r--sw/source/filter/ww8/ww8par6.cxx6
-rw-r--r--sw/source/filter/xml/xmlexpit.cxx2
-rw-r--r--sw/source/filter/xml/xmlimpit.cxx2
-rw-r--r--sw/source/uibase/app/docstyle.cxx2
-rw-r--r--sw/source/uibase/shells/drwtxtex.cxx4
-rw-r--r--sw/source/uibase/uiview/viewtab.cxx8
-rw-r--r--sw/source/uibase/wrtsh/delete.cxx6
36 files changed, 75 insertions, 75 deletions
diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index fc5b606b539a..ea8a4608aaef 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -2119,7 +2119,7 @@ bool SwCursorShell::SetShadowCursorPos( const Point& rPt, SwFillMode eFillMode )
SvxLRSpaceItem aLR( static_cast<const SvxLRSpaceItem&>(
pCNd->GetAttr( RES_LR_SPACE ) ) );
aLR.SetTextLeft( aFPos.nTabCnt );
- aLR.SetTextFirstLineOfst( 0 );
+ aLR.SetTextFirstLineOffset( 0 );
aSet.Put( aLR );
const SvxAdjustItem& rAdj = static_cast<const SvxAdjustItem&>(pCNd->
diff --git a/sw/source/core/doc/DocumentStylePoolManager.cxx b/sw/source/core/doc/DocumentStylePoolManager.cxx
index 60d38a272a55..6aab632e2cff 100644
--- a/sw/source/core/doc/DocumentStylePoolManager.cxx
+++ b/sw/source/core/doc/DocumentStylePoolManager.cxx
@@ -204,7 +204,7 @@ namespace
( rNFormat.GetAbsLSpace() || rNFormat.GetFirstLineOffset() ) )
{
SvxLRSpaceItem aLR( pColl->GetFormatAttr( RES_LR_SPACE ) );
- aLR.SetTextFirstLineOfstValue( rNFormat.GetFirstLineOffset() );
+ aLR.SetTextFirstLineOffsetValue( rNFormat.GetFirstLineOffset() );
//TODO: overflow
aLR.SetTextLeft( rNFormat.GetAbsLSpace() );
pColl->SetFormatAttr( aLR );
@@ -251,7 +251,7 @@ namespace
SvxLRSpaceItem aLR( RES_LR_SPACE );
SvxULSpaceItem aUL( RES_UL_SPACE );
- aLR.SetTextFirstLineOfst( sal_uInt16(nEZ) );
+ aLR.SetTextFirstLineOffset( sal_uInt16(nEZ) );
aLR.SetTextLeft( sal_uInt16(nLeft) );
aUL.SetUpper( sal_uInt16(nUpper) );
aUL.SetLower( sal_uInt16(nLower) );
@@ -690,14 +690,14 @@ SwTextFormatColl* DocumentStylePoolManager::GetTextCollFromPool( sal_uInt16 nId,
case RES_POOLCOLL_TEXT_IDENT: // Text body indentation
{
SvxLRSpaceItem aLR( RES_LR_SPACE );
- aLR.SetTextFirstLineOfst( GetMetricVal( CM_05 ));
+ aLR.SetTextFirstLineOffset( GetMetricVal( CM_05 ));
aSet.Put( aLR );
}
break;
case RES_POOLCOLL_TEXT_NEGIDENT: // Text body neg. indentation
{
SvxLRSpaceItem aLR( RES_LR_SPACE );
- aLR.SetTextFirstLineOfst( -static_cast<short>(GetMetricVal( CM_05 )));
+ aLR.SetTextFirstLineOffset( -static_cast<short>(GetMetricVal( CM_05 )));
aLR.SetTextLeft( GetMetricVal( CM_1 ));
SvxTabStopItem aTStops(RES_PARATR_TABSTOP);
aTStops.Insert( SvxTabStop( 0 ));
@@ -717,7 +717,7 @@ SwTextFormatColl* DocumentStylePoolManager::GetTextCollFromPool( sal_uInt16 nId,
case RES_POOLCOLL_CONFRONTATION: // Text body confrontation
{
SvxLRSpaceItem aLR( RES_LR_SPACE );
- aLR.SetTextFirstLineOfst( - short( GetMetricVal( CM_1 ) * 4 +
+ aLR.SetTextFirstLineOffset( - short( GetMetricVal( CM_1 ) * 4 +
GetMetricVal( CM_05)) );
aLR.SetTextLeft( GetMetricVal( CM_1 ) * 5 );
SvxTabStopItem aTStops( RES_PARATR_TABSTOP );
@@ -922,7 +922,7 @@ SwTextFormatColl* DocumentStylePoolManager::GetTextCollFromPool( sal_uInt16 nId,
case RES_POOLCOLL_ENDNOTE: // paragraph style Endnote
{
SvxLRSpaceItem aLR( RES_LR_SPACE );
- aLR.SetTextFirstLineOfst( -static_cast<short>( GetMetricVal( CM_05 ) + GetMetricVal( CM_01 ) ) );
+ aLR.SetTextFirstLineOffset( -static_cast<short>( GetMetricVal( CM_05 ) + GetMetricVal( CM_01 ) ) );
aLR.SetTextLeft( GetMetricVal( CM_05 ) + GetMetricVal( CM_01 ) );
SetAllScriptItem( aSet, SvxFontHeightItem( PT_10, 100, RES_CHRATR_FONTSIZE ) );
aSet.Put( aLR );
diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index 9c4609b2030a..c2cc80d11f20 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -1652,7 +1652,7 @@ void SwDoc::MoveLeftMargin(const SwPaM& rPam, bool bRight, bool bModulus,
if ( rFormat.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_ALIGNMENT )
{
aLS.SetTextLeft( rFormat.GetIndentAt() );
- aLS.SetTextFirstLineOfst( static_cast<short>(rFormat.GetFirstLineIndent()) );
+ aLS.SetTextFirstLineOffset( static_cast<short>(rFormat.GetFirstLineIndent()) );
}
}
}
diff --git a/sw/source/core/doc/fmtcol.cxx b/sw/source/core/doc/fmtcol.cxx
index e28ca618fc45..d037a1357fa5 100644
--- a/sw/source/core/doc/fmtcol.cxx
+++ b/sw/source/core/doc/fmtcol.cxx
@@ -227,10 +227,10 @@ void SwTextFormatColl::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew
// We had a relative value -> recalculate
if( 100 != aNew.GetPropTextFirstLineOfst() )
{
- short nTmp = aNew.GetTextFirstLineOfst(); // keep so that we can compare
- aNew.SetTextFirstLineOfst( pNewLRSpace->GetTextFirstLineOfst(),
+ short nTmp = aNew.GetTextFirstLineOffset(); // keep so that we can compare
+ aNew.SetTextFirstLineOffset( pNewLRSpace->GetTextFirstLineOffset(),
aNew.GetPropTextFirstLineOfst() );
- bChg |= nTmp != aNew.GetTextFirstLineOfst();
+ bChg |= nTmp != aNew.GetTextFirstLineOffset();
}
if( bChg )
{
diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx
index dbef15654fc0..16d817f48df4 100644
--- a/sw/source/core/edit/autofmt.cxx
+++ b/sw/source/core/edit/autofmt.cxx
@@ -2402,7 +2402,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFormatFlags const &
if (SfxItemState::SET == m_pCurTextFrame->GetTextNodeForParaProps()->GetSwAttrSet().
GetItemState( RES_LR_SPACE, true,
reinterpret_cast<const SfxPoolItem**>(&pLRSpace) ) &&
- ( 0 != (nSz = pLRSpace->GetTextFirstLineOfst()) ||
+ ( 0 != (nSz = pLRSpace->GetTextFirstLineOffset()) ||
0 != pLRSpace->GetTextLeft() ) )
{
// exception: numbering/enumeration can have an indentation
@@ -2637,7 +2637,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFormatFlags const &
SfxItemState::SET == m_pCurTextFrame->GetTextNodeForParaProps()->GetSwAttrSet().
GetItemState( RES_LR_SPACE, false,
reinterpret_cast<const SfxPoolItem**>(&pLRSpace) ) &&
- ( 0 != (nSz = pLRSpace->GetTextFirstLineOfst()) ||
+ ( 0 != (nSz = pLRSpace->GetTextFirstLineOffset()) ||
0 != pLRSpace->GetTextLeft() ) )
{
// then use one of our templates
diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx
index c1054bda87f5..1540097ad5b1 100644
--- a/sw/source/core/layout/fly.cxx
+++ b/sw/source/core/layout/fly.cxx
@@ -2539,7 +2539,7 @@ static SwTwips lcl_CalcAutoWidth( const SwLayoutFrame& rFrame )
const SvxLRSpaceItem &rSpace =
static_cast<const SwTextFrame*>(pFrame)->GetTextNodeForParaProps()->GetSwAttrSet().GetLRSpace();
if (!static_cast<const SwTextFrame*>(pFrame)->IsLocked())
- nMin += rSpace.GetRight() + rSpace.GetTextLeft() + rSpace.GetTextFirstLineOfst();
+ nMin += rSpace.GetRight() + rSpace.GetTextLeft() + rSpace.GetTextFirstLineOffset();
}
else if ( pFrame->IsTabFrame() )
{
diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx b/sw/source/core/text/EnhancedPDFExportHelper.cxx
index 5069edccac17..264e7db82580 100644
--- a/sw/source/core/text/EnhancedPDFExportHelper.cxx
+++ b/sw/source/core/text/EnhancedPDFExportHelper.cxx
@@ -619,7 +619,7 @@ void SwTaggedPDFHelper::SetAttributes( vcl::PDFWriter::StructElement eType )
OSL_ENSURE( pFrame->IsTextFrame(), "Frame type <-> tag attribute mismatch" );
const SvxLRSpaceItem &rSpace =
static_cast<const SwTextFrame*>(pFrame)->GetTextNodeForParaProps()->GetSwAttrSet().GetLRSpace();
- nVal = rSpace.GetTextFirstLineOfst();
+ nVal = rSpace.GetTextFirstLineOffset();
if ( 0 != nVal )
mpPDFExtOutDevData->SetStructureAttributeNumerical( vcl::PDFWriter::TextIndent, nVal );
}
diff --git a/sw/source/core/text/frmpaint.cxx b/sw/source/core/text/frmpaint.cxx
index 88e188dda2ed..9bf759eb6320 100644
--- a/sw/source/core/text/frmpaint.cxx
+++ b/sw/source/core/text/frmpaint.cxx
@@ -515,8 +515,8 @@ bool SwTextFrame::PaintEmpty( const SwRect &rRect, bool bCheck ) const
const SvxLRSpaceItem &rSpace =
GetTextNodeForParaProps()->GetSwAttrSet().GetLRSpace();
- if ( rSpace.GetTextFirstLineOfst() > 0 )
- aPos.AdjustX(rSpace.GetTextFirstLineOfst() );
+ if ( rSpace.GetTextFirstLineOffset() > 0 )
+ aPos.AdjustX(rSpace.GetTextFirstLineOffset() );
std::unique_ptr<SwSaveClip> pClip;
if( IsUndersized() )
diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx
index 2b8bd65a446a..8a2b2f0a100a 100644
--- a/sw/source/core/text/porfld.cxx
+++ b/sw/source/core/text/porfld.cxx
@@ -556,7 +556,7 @@ bool SwNumberPortion::Format( SwTextFormatInfo &rInf )
{
nDiff = rInf.Left()
+ rInf.GetTextFrame()->GetTextNodeForParaProps()->
- GetSwAttrSet().GetLRSpace().GetTextFirstLineOfst()
+ GetSwAttrSet().GetLRSpace().GetTextFirstLineOffset()
- rInf.First()
+ rInf.ForcedLeftMargin();
}
diff --git a/sw/source/core/tox/ToxTabStopTokenHandler.cxx b/sw/source/core/tox/ToxTabStopTokenHandler.cxx
index d45acc676c7f..e54271c9dd82 100644
--- a/sw/source/core/tox/ToxTabStopTokenHandler.cxx
+++ b/sw/source/core/tox/ToxTabStopTokenHandler.cxx
@@ -75,7 +75,7 @@ DefaultToxTabStopTokenHandler::HandleTabStopToken(
// left margin of paragraph style
const SvxLRSpaceItem& rLRSpace = targetNode.GetTextColl()->GetLRSpace();
nRightMargin -= rLRSpace.GetLeft();
- nRightMargin -= rLRSpace.GetTextFirstLineOfst();
+ nRightMargin -= rLRSpace.GetTextFirstLineOffset();
}
result.tabStop = SvxTabStop(nRightMargin, SvxTabAdjust::Right, cDfltDecimalChar, aToken.cTabFillChar);
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 97b975f90e30..33c2d67b605a 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -3211,7 +3211,7 @@ bool SwTextNode::GetFirstLineOfsWithNum( short& rFLOffset ) const
if (!getIDocumentSettingAccess()->get(DocumentSettingId::IGNORE_FIRST_LINE_INDENT_IN_NUMBERING))
{
SvxLRSpaceItem aItem = GetSwAttrSet().GetLRSpace();
- rFLOffset = rFLOffset + aItem.GetTextFirstLineOfst();
+ rFLOffset = rFLOffset + aItem.GetTextFirstLineOffset();
}
}
else if ( rFormat.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_ALIGNMENT )
@@ -3223,7 +3223,7 @@ bool SwTextNode::GetFirstLineOfsWithNum( short& rFLOffset ) const
else if (!getIDocumentSettingAccess()->get(DocumentSettingId::IGNORE_FIRST_LINE_INDENT_IN_NUMBERING))
{
SvxLRSpaceItem aItem = GetSwAttrSet().GetLRSpace();
- rFLOffset = aItem.GetTextFirstLineOfst();
+ rFLOffset = aItem.GetTextFirstLineOffset();
}
}
}
@@ -3231,7 +3231,7 @@ bool SwTextNode::GetFirstLineOfsWithNum( short& rFLOffset ) const
return true;
}
- rFLOffset = GetSwAttrSet().GetLRSpace().GetTextFirstLineOfst();
+ rFLOffset = GetSwAttrSet().GetLRSpace().GetTextFirstLineOffset();
return false;
}
@@ -3250,7 +3250,7 @@ SwTwips SwTextNode::GetAdditionalIndentForStartingNewList() const
if (getIDocumentSettingAccess()->get(DocumentSettingId::IGNORE_FIRST_LINE_INDENT_IN_NUMBERING))
{
nAdditionalIndent = nAdditionalIndent -
- GetSwAttrSet().GetLRSpace().GetTextFirstLineOfst();
+ GetSwAttrSet().GetLRSpace().GetTextFirstLineOffset();
}
}
else if ( rFormat.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_ALIGNMENT )
@@ -3265,7 +3265,7 @@ SwTwips SwTextNode::GetAdditionalIndentForStartingNewList() const
if (getIDocumentSettingAccess()->get(DocumentSettingId::IGNORE_FIRST_LINE_INDENT_IN_NUMBERING))
{
nAdditionalIndent = nAdditionalIndent -
- GetSwAttrSet().GetLRSpace().GetTextFirstLineOfst();
+ GetSwAttrSet().GetLRSpace().GetTextFirstLineOffset();
}
}
}
diff --git a/sw/source/core/txtnode/thints.cxx b/sw/source/core/txtnode/thints.cxx
index 0bc8cd921fb6..e58d0e7e6892 100644
--- a/sw/source/core/txtnode/thints.cxx
+++ b/sw/source/core/txtnode/thints.cxx
@@ -2084,7 +2084,7 @@ static void lcl_MergeListLevelIndentAsLRSpaceItem( const SwTextNode& rTextNode,
{
SvxLRSpaceItem aLR( RES_LR_SPACE );
aLR.SetTextLeft( rFormat.GetIndentAt() );
- aLR.SetTextFirstLineOfst( static_cast<short>(rFormat.GetFirstLineIndent()) );
+ aLR.SetTextFirstLineOffset( static_cast<short>(rFormat.GetFirstLineIndent()) );
rSet.Put( aLR );
}
}
diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx
index 0a48de57e35c..a9cea1b6f146 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -2940,7 +2940,7 @@ static Writer& OutCSS1_SvxLRSpace( Writer& rWrt, const SfxPoolItem& rHt )
}
// The LineIndent of the first line might contain the room for numbering
- long nFirstLineIndent = static_cast<long>(rLRItem.GetTextFirstLineOfst()) -
+ long nFirstLineIndent = static_cast<long>(rLRItem.GetTextFirstLineOffset()) -
rHTMLWrt.m_nFirstLineIndent;
if( rHTMLWrt.m_nDfltFirstLineIndent != nFirstLineIndent )
{
diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx
index 9e41f0da2289..3b4b9bac0ac5 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -371,7 +371,7 @@ SwHTMLFormatInfo::SwHTMLFormatInfo( const SwFormat *pF, SwDoc *pDoc, SwDoc *pTem
(pReferenceFormat ? pReferenceFormat : pFormat)->GetLRSpace();
nLeftMargin = rLRSpace.GetTextLeft();
nRightMargin = rLRSpace.GetRight();
- nFirstLineIndent = rLRSpace.GetTextFirstLineOfst();
+ nFirstLineIndent = rLRSpace.GetTextFirstLineOffset();
const SvxULSpaceItem &rULSpace =
(pReferenceFormat ? pReferenceFormat : pFormat)->GetULSpace();
@@ -708,7 +708,7 @@ static void OutHTML_SwFormat( Writer& rWrt, const SwFormat& rFormat,
rHWrt.m_nDfltLeftMargin = rLRSpace.GetTextLeft();
// In numbered lists, don't output a first line indent.
- rHWrt.m_nFirstLineIndent = rLRSpace.GetTextFirstLineOfst();
+ rHWrt.m_nFirstLineIndent = rLRSpace.GetTextFirstLineOffset();
}
if( rInfo.bInNumberBulletList && bNumbered && bPara && !rHWrt.m_bCfgOutStyles )
diff --git a/sw/source/filter/html/htmlcss1.cxx b/sw/source/filter/html/htmlcss1.cxx
index 3a0c5cb34aae..ca28eac168b5 100644
--- a/sw/source/filter/html/htmlcss1.cxx
+++ b/sw/source/filter/html/htmlcss1.cxx
@@ -285,7 +285,7 @@ static void SetTextCollAttrs( SwTextFormatColl *pColl, SfxItemSet& rItemSet,
if( rPropInfo.m_bRightMargin )
aLRItem.SetRight( pLRItem->GetRight() );
if( rPropInfo.m_bTextIndent )
- aLRItem.SetTextFirstLineOfst( pLRItem->GetTextFirstLineOfst() );
+ aLRItem.SetTextFirstLineOffset( pLRItem->GetTextFirstLineOffset() );
rItemSet.Put( aLRItem );
}
diff --git a/sw/source/filter/html/htmlctxt.cxx b/sw/source/filter/html/htmlctxt.cxx
index 5ed9cf0427ff..6be3cab727d1 100644
--- a/sw/source/filter/html/htmlctxt.cxx
+++ b/sw/source/filter/html/htmlctxt.cxx
@@ -617,14 +617,14 @@ void SwHTMLParser::InsertAttrs( SfxItemSet &rItemSet,
nRight = nOldRight + static_cast< sal_uInt16 >(rPropInfo.m_nRightMargin);
}
if( rPropInfo.m_bTextIndent )
- nIndent = pLRItem->GetTextFirstLineOfst();
+ nIndent = pLRItem->GetTextFirstLineOffset();
// Remember the value for the following paragraphs
pContext->SetMargins( nLeft, nRight, nIndent );
// Set the attribute on the current paragraph
SvxLRSpaceItem aLRItem( *pLRItem );
- aLRItem.SetTextFirstLineOfst( nIndent );
+ aLRItem.SetTextFirstLineOffset( nIndent );
aLRItem.SetTextLeft( nLeft );
aLRItem.SetRight( nRight );
NewAttr(m_xAttrTab, &m_xAttrTab->pLRSpace, aLRItem);
diff --git a/sw/source/filter/html/htmldrawreader.cxx b/sw/source/filter/html/htmldrawreader.cxx
index 0aadae724084..c1ed88829383 100644
--- a/sw/source/filter/html/htmldrawreader.cxx
+++ b/sw/source/filter/html/htmldrawreader.cxx
@@ -104,7 +104,7 @@ void SwHTMLParser::InsertDrawObject( SdrObject* pNewDrawObj,
// maybe flatten the first line indentation
const SvxLRSpaceItem *pLRItem = static_cast<const SvxLRSpaceItem *>(pItem);
SvxLRSpaceItem aLRItem( *pLRItem );
- aLRItem.SetTextFirstLineOfst( 0 );
+ aLRItem.SetTextFirstLineOffset( 0 );
if( rCSS1PropInfo.m_bLeftMargin )
{
nLeftSpace = static_cast< sal_uInt16 >(aLRItem.GetLeft());
diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx
index b89807242701..c13ee2bad430 100644
--- a/sw/source/filter/html/htmlform.cxx
+++ b/sw/source/filter/html/htmlform.cxx
@@ -888,7 +888,7 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl(
// Flatten first line indent
const SvxLRSpaceItem *pLRItem = static_cast<const SvxLRSpaceItem *>(pItem);
SvxLRSpaceItem aLRItem( *pLRItem );
- aLRItem.SetTextFirstLineOfst( 0 );
+ aLRItem.SetTextFirstLineOffset( 0 );
if( rCSS1PropInfo.m_bLeftMargin )
{
nLeftSpace = convertTwipToMm100( aLRItem.GetLeft() );
diff --git a/sw/source/filter/html/htmlnumreader.cxx b/sw/source/filter/html/htmlnumreader.cxx
index cf20539e8b13..95ce01d8b2db 100644
--- a/sw/source/filter/html/htmlnumreader.cxx
+++ b/sw/source/filter/html/htmlnumreader.cxx
@@ -280,7 +280,7 @@ void SwHTMLParser::NewNumberBulletList( HtmlTokenId nToken )
if( aPropInfo.m_bTextIndent )
{
short nTextIndent =
- aItemSet.Get( RES_LR_SPACE ).GetTextFirstLineOfst();
+ aItemSet.Get( RES_LR_SPACE ).GetTextFirstLineOffset();
aNumFormat.SetFirstLineOffset( nTextIndent );
bChangeNumFormat = true;
}
diff --git a/sw/source/filter/html/htmlplug.cxx b/sw/source/filter/html/htmlplug.cxx
index ddff54de50ab..525b3b0ea175 100644
--- a/sw/source/filter/html/htmlplug.cxx
+++ b/sw/source/filter/html/htmlplug.cxx
@@ -262,7 +262,7 @@ void SwHTMLParser::SetSpace( const Size& rPixSpace,
// if applicable remove the first line indent
const SvxLRSpaceItem *pLRItem = static_cast<const SvxLRSpaceItem *>(pItem);
SvxLRSpaceItem aLRItem( *pLRItem );
- aLRItem.SetTextFirstLineOfst( 0 );
+ aLRItem.SetTextFirstLineOffset( 0 );
if( rCSS1PropInfo.m_bLeftMargin )
{
nLeftSpace = aLRItem.GetLeft();
diff --git a/sw/source/filter/html/svxcss1.cxx b/sw/source/filter/html/svxcss1.cxx
index 07d5cd0d844b..4045c8ca3a82 100644
--- a/sw/source/filter/html/svxcss1.cxx
+++ b/sw/source/filter/html/svxcss1.cxx
@@ -953,7 +953,7 @@ void SvxCSS1Parser::MergeStyles( const SfxItemSet& rSrcSet,
if( rSrcInfo.m_bRightMargin )
aLRSpace.SetRight( rNewLRSpace.GetRight() );
if( rSrcInfo.m_bTextIndent )
- aLRSpace.SetTextFirstLineOfst( rNewLRSpace.GetTextFirstLineOfst() );
+ aLRSpace.SetTextFirstLineOffset( rNewLRSpace.GetTextFirstLineOffset() );
rTargetSet.Put( aLRSpace );
}
@@ -1981,13 +1981,13 @@ static void ParseCSS1_text_indent( const CSS1Expression *pExpr,
&pItem ) )
{
SvxLRSpaceItem aLRItem( *static_cast<const SvxLRSpaceItem*>(pItem) );
- aLRItem.SetTextFirstLineOfst( nIndent );
+ aLRItem.SetTextFirstLineOffset( nIndent );
rItemSet.Put( aLRItem );
}
else
{
SvxLRSpaceItem aLRItem( aItemIds.nLRSpace );
- aLRItem.SetTextFirstLineOfst( nIndent );
+ aLRItem.SetTextFirstLineOffset( nIndent );
rItemSet.Put( aLRItem );
}
rPropInfo.m_bTextIndent = true;
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 36e1139d5f2a..71377d3a7034 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -4690,7 +4690,7 @@ void SwHTMLParser::SetTextCollAttrs( HTMLAttrContext *pContext )
sal_Int32 nLeft = pLRItem->GetTextLeft();
sal_Int32 nRight = pLRItem->GetRight();
- nFirstLineIndent = pLRItem->GetTextFirstLineOfst();
+ nFirstLineIndent = pLRItem->GetTextFirstLineOffset();
// In Definition lists the margins also contain the margins from the previous levels
if( RES_POOLCOLL_HTML_DD == nTopColl )
@@ -4732,7 +4732,7 @@ void SwHTMLParser::SetTextCollAttrs( HTMLAttrContext *pContext )
if( !nRightMargin )
nRightMargin = static_cast< sal_uInt16 >(rLRItem.GetRight());
if( !nFirstLineIndent )
- nFirstLineIndent = rLRItem.GetTextFirstLineOfst();
+ nFirstLineIndent = rLRItem.GetTextFirstLineOffset();
}
// remove previous hard attribution of paragraph
@@ -4746,7 +4746,7 @@ void SwHTMLParser::SetTextCollAttrs( HTMLAttrContext *pContext )
// if applicable correct the paragraph indent
const SvxLRSpaceItem& rLRItem = pCollToSet->GetLRSpace();
bool bSetLRSpace = nLeftMargin != rLRItem.GetTextLeft() ||
- nFirstLineIndent != rLRItem.GetTextFirstLineOfst() ||
+ nFirstLineIndent != rLRItem.GetTextFirstLineOffset() ||
nRightMargin != rLRItem.GetRight();
if( bSetLRSpace )
@@ -4754,7 +4754,7 @@ void SwHTMLParser::SetTextCollAttrs( HTMLAttrContext *pContext )
SvxLRSpaceItem aLRItem( rLRItem );
aLRItem.SetTextLeft( nLeftMargin );
aLRItem.SetRight( nRightMargin );
- aLRItem.SetTextFirstLineOfst( nFirstLineIndent );
+ aLRItem.SetTextFirstLineOffset( nFirstLineIndent );
if( pItemSet )
pItemSet->Put( aLRItem );
else
@@ -4990,7 +4990,7 @@ void SwHTMLParser::InsertSpacer()
SvxLRSpaceItem aLRItem( RES_LR_SPACE );
aLRItem.SetTextLeft( nLeft );
aLRItem.SetRight( nRight );
- aLRItem.SetTextFirstLineOfst( nIndent );
+ aLRItem.SetTextFirstLineOffset( nIndent );
NewAttr(m_xAttrTab, &m_xAttrTab->pLRSpace, aLRItem);
EndAttr( m_xAttrTab->pLRSpace, false );
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 53fa35acfe52..28d7b6447acf 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -8100,7 +8100,7 @@ void DocxAttributeOutput::FormatLRSpace( const SvxLRSpaceItem& rLRSpace )
{
pLRSpaceAttrList->add( FSNS( XML_w, ( bEcma ? XML_right : XML_end ) ), OString::number( rLRSpace.GetRight() ) );
}
- sal_Int32 nFirstLineAdjustment = rLRSpace.GetTextFirstLineOfst();
+ sal_Int32 nFirstLineAdjustment = rLRSpace.GetTextFirstLineOffset();
if (nFirstLineAdjustment > 0)
pLRSpaceAttrList->add( FSNS( XML_w, XML_firstLine ), OString::number( nFirstLineAdjustment ) );
else
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 18992cc46931..4e729a4adb26 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -2951,7 +2951,7 @@ void RtfAttributeOutput::ParaNumRule_Impl(const SwTextNode* pTextNd, sal_Int32 n
SvxLRSpaceItem aLR(rNdSet.Get(RES_LR_SPACE));
aLR.SetTextLeft(aLR.GetTextLeft() + pFormat->GetIndentAt());
- aLR.SetTextFirstLineOfst(pFormat->GetFirstLineOffset()); //TODO: overflow
+ aLR.SetTextFirstLineOffset(pFormat->GetFirstLineOffset()); //TODO: overflow
sal_uInt16 nStyle = m_rExport.GetId(pFormat->GetCharFormat());
OString* pString = m_rExport.GetStyle(nStyle);
@@ -3093,7 +3093,7 @@ void RtfAttributeOutput::FormatLRSpace(const SvxLRSpaceItem& rLRSpace)
m_aStyles.append(OOO_STRING_SVTOOLS_RTF_RIN);
m_aStyles.append(static_cast<sal_Int32>(rLRSpace.GetRight()));
m_aStyles.append(OOO_STRING_SVTOOLS_RTF_FI);
- m_aStyles.append(static_cast<sal_Int32>(rLRSpace.GetTextFirstLineOfst()));
+ m_aStyles.append(static_cast<sal_Int32>(rLRSpace.GetTextFirstLineOffset()));
}
}
else if (m_rExport.GetRTFFlySyntax())
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index da7bc1de87e7..379b9cf46264 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -2466,7 +2466,7 @@ void MSWordExportBase::OutputTextNode( SwTextNode& rNode )
{
const SvxLRSpaceItem* pLRSpace = aSet.GetItem<SvxLRSpaceItem>(RES_LR_SPACE);
if ( pLRSpace )
- nFirstLineIndent = pLRSpace->GetTextFirstLineOfst();
+ nFirstLineIndent = pLRSpace->GetTextFirstLineOffset();
}
// Insert tab for aesthetic purposes #i24762#
@@ -2748,9 +2748,9 @@ void MSWordExportBase::OutputTextNode( SwTextNode& rNode )
SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
{
if (bParaRTL)
- aLR.SetTextFirstLineOfstValue(pFormat->GetAbsLSpace() - pFormat->GetFirstLineOffset()); //TODO: overflow
+ aLR.SetTextFirstLineOffsetValue(pFormat->GetAbsLSpace() - pFormat->GetFirstLineOffset()); //TODO: overflow
else
- aLR.SetTextFirstLineOfst(GetWordFirstLineOffset(*pFormat));
+ aLR.SetTextFirstLineOffset(GetWordFirstLineOffset(*pFormat));
}
// correct fix for issue i94187
@@ -2870,7 +2870,7 @@ void MSWordExportBase::OutputTextNode( SwTextNode& rNode )
// new first line indent = 0
// (first line indent is ignored for NO_NUMLEVEL)
if (!bParaRTL)
- aLRSpace.SetTextFirstLineOfst( 0 );
+ aLRSpace.SetTextFirstLineOffset( 0 );
// put back the new item
pTmpSet->Put( aLRSpace );
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 038630b2c081..96c7ebe0f50c 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -817,7 +817,7 @@ void MSWordExportBase::OutputFormat( const SwFormat& rFormat, bool bPapFormat, b
ItemGet<SvxLRSpaceItem>(aSet, RES_LR_SPACE));
aLR.SetTextLeft( aLR.GetTextLeft() + rNFormat.GetAbsLSpace() );
- aLR.SetTextFirstLineOfst( GetWordFirstLineOffset(rNFormat));
+ aLR.SetTextFirstLineOffset( GetWordFirstLineOffset(rNFormat));
aSet.Put( aLR );
CorrectTabStopInSet( aSet, rNFormat.GetAbsLSpace() );
@@ -4076,7 +4076,7 @@ void WW8AttributeOutput::FormatLRSpace( const SvxLRSpaceItem& rLR )
// sprmPDxaLeft1
m_rWW8Export.InsUInt16( 0x8460 ); //asian version ?
- m_rWW8Export.InsUInt16( rLR.GetTextFirstLineOfst() );
+ m_rWW8Export.InsUInt16( rLR.GetTextFirstLineOffset() );
}
}
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index f135c70eeba2..e7275d0486dc 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -1238,7 +1238,7 @@ static long lcl_GetTrueMargin(const SvxLRSpaceItem &rLR, const SwNumFormat &rFor
"<lcl_GetTrueMargin> - misusage: position-and-space-mode does not equal LABEL_WIDTH_AND_POSITION" );
const long nBodyIndent = rLR.GetTextLeft();
- const long nFirstLineDiff = rLR.GetTextFirstLineOfst();
+ const long nFirstLineDiff = rLR.GetTextFirstLineOffset();
rFirstLinePos = nBodyIndent + nFirstLineDiff;
const auto nPseudoListBodyIndent = rFormat.GetAbsLSpace();
@@ -1260,14 +1260,14 @@ void SyncIndentWithList( SvxLRSpaceItem &rLR,
long nWantedFirstLinePos;
long nExtraListIndent = lcl_GetTrueMargin(rLR, rFormat, nWantedFirstLinePos);
rLR.SetTextLeft(nWantedFirstLinePos - nExtraListIndent);
- rLR.SetTextFirstLineOfst(0);
+ rLR.SetTextFirstLineOffset(0);
}
else if ( rFormat.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_ALIGNMENT )
{
if ( !bFirstLineOfstSet && bLeftIndentSet &&
rFormat.GetFirstLineIndent() != 0 )
{
- rLR.SetTextFirstLineOfst( rFormat.GetFirstLineIndent() );
+ rLR.SetTextFirstLineOffset( rFormat.GetFirstLineIndent() );
}
else if ( bFirstLineOfstSet && !bLeftIndentSet &&
rFormat.GetIndentAt() != 0 )
@@ -1278,7 +1278,7 @@ void SyncIndentWithList( SvxLRSpaceItem &rLR,
{
if ( rFormat.GetFirstLineIndent() != 0 )
{
- rLR.SetTextFirstLineOfst( rFormat.GetFirstLineIndent() );
+ rLR.SetTextFirstLineOffset( rFormat.GetFirstLineIndent() );
}
if ( rFormat.GetIndentAt() != 0 )
{
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 8a52b7eb9641..6f417543014d 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -256,7 +256,7 @@ sal_uInt16 SwWW8ImplReader::End_Footnote()
{
const SvxLRSpaceItem* pLRSpace = aSet.GetItem<SvxLRSpaceItem>(RES_LR_SPACE);
if ( pLRSpace )
- nFirstLineIndent = pLRSpace->GetTextFirstLineOfst();
+ nFirstLineIndent = pLRSpace->GetTextFirstLineOffset();
}
m_pPaM->GetPoint()->nContent.Assign( pTNd, 0 );
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index 52fa05de6de5..d95fe07d4f80 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -1694,7 +1694,7 @@ void UseListIndent(SwWW8StyInf &rStyle, const SwNumFormat &rFormat)
const long nListFirstLineIndent = GetListFirstLineIndent(rFormat);
SvxLRSpaceItem aLR(ItemGet<SvxLRSpaceItem>(*rStyle.m_pFormat, RES_LR_SPACE));
aLR.SetTextLeft(nAbsLSpace);
- aLR.SetTextFirstLineOfst(writer_cast<short>(nListFirstLineIndent));
+ aLR.SetTextFirstLineOffset(writer_cast<short>(nListFirstLineIndent));
rStyle.m_pFormat->SetFormatAttr(aLR);
rStyle.m_bListReleventIndentSet = true;
}
@@ -1713,7 +1713,7 @@ void SetStyleIndent(SwWW8StyInf &rStyle, const SwNumFormat &rFormat)
else
{
aLR.SetTextLeft(0);
- aLR.SetTextFirstLineOfst(0);
+ aLR.SetTextFirstLineOffset(0);
}
rStyle.m_pFormat->SetFormatAttr(aLR);
}
@@ -2004,7 +2004,7 @@ void SwWW8ImplReader::Read_LFOPosition(sal_uInt16, const sal_uInt8* pData,
// reset/blank the left indent (and only the left)
aLR->SetTextLeft(0);
- aLR->SetTextFirstLineOfst(0);
+ aLR->SetTextFirstLineOffset(0);
// apply the modified SvxLRSpaceItem to the current paragraph
pTextNode->SetAttr( *aLR );
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 9b1c95217cb8..992409d562c8 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -4174,7 +4174,7 @@ void SwWW8ImplReader::Read_LR( sal_uInt16 nId, const sal_uInt8* pData, short nLe
if ( pFormat && pFormat->GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_ALIGNMENT )
{
aLR->SetTextLeft( pFormat->GetIndentAt() );
- aLR->SetTextFirstLineOfst( static_cast<short>(pFormat->GetFirstLineIndent()) );
+ aLR->SetTextFirstLineOffset( static_cast<short>(pFormat->GetFirstLineIndent()) );
// make paragraph have hard-set indent attributes
pTextNode->SetAttr( *aLR );
}
@@ -4246,11 +4246,11 @@ void SwWW8ImplReader::Read_LR( sal_uInt16 nId, const sal_uInt8* pData, short nLe
const SvxLRSpaceItem &rLR =
ItemGet<SvxLRSpaceItem>(*(m_vColl[m_nCurrentColl].m_pFormat),
RES_LR_SPACE);
- nPara = nPara - rLR.GetTextFirstLineOfst();
+ nPara = nPara - rLR.GetTextFirstLineOffset();
}
}
- aLR->SetTextFirstLineOfst(nPara);
+ aLR->SetTextFirstLineOffset(nPara);
if (!m_pCurrentColl)
{
diff --git a/sw/source/filter/xml/xmlexpit.cxx b/sw/source/filter/xml/xmlexpit.cxx
index ba94cdcd9ffe..57bb8c93a41c 100644
--- a/sw/source/filter/xml/xmlexpit.cxx
+++ b/sw/source/filter/xml/xmlexpit.cxx
@@ -418,7 +418,7 @@ bool SvXMLExportItemMapper::QueryXMLValue(
else
{
rUnitConverter.convertMeasureToXML(
- aOut, rLRSpace.GetTextFirstLineOfst() );
+ aOut, rLRSpace.GetTextFirstLineOffset() );
}
}
else
diff --git a/sw/source/filter/xml/xmlimpit.cxx b/sw/source/filter/xml/xmlimpit.cxx
index ee5641691518..476865ec5c30 100644
--- a/sw/source/filter/xml/xmlimpit.cxx
+++ b/sw/source/filter/xml/xmlimpit.cxx
@@ -292,7 +292,7 @@ bool SvXMLImportItemMapper::PutXMLValue(
bOk = rUnitConverter.convertMeasureToCore(nAbs, rValue,
-0x7fff, 0x7fff );
- rLRSpace.SetTextFirstLineOfst( static_cast<short>(nAbs), static_cast<sal_uInt16>(nProp) );
+ rLRSpace.SetTextFirstLineOffset( static_cast<short>(nAbs), static_cast<sal_uInt16>(nProp) );
}
break;
diff --git a/sw/source/uibase/app/docstyle.cxx b/sw/source/uibase/app/docstyle.cxx
index 5fef48e77b9c..db623a8d9277 100644
--- a/sw/source/uibase/app/docstyle.cxx
+++ b/sw/source/uibase/app/docstyle.cxx
@@ -1423,7 +1423,7 @@ void SwDocStyleSheet::MergeIndentAttrsOfListStyle( SfxItemSet& rSet )
{
SvxLRSpaceItem aLR( RES_LR_SPACE );
aLR.SetTextLeft( rFormat.GetIndentAt() );
- aLR.SetTextFirstLineOfst( static_cast<short>(rFormat.GetFirstLineIndent()) );
+ aLR.SetTextFirstLineOffset( static_cast<short>(rFormat.GetFirstLineIndent()) );
rSet.Put( aLR );
}
}
diff --git a/sw/source/uibase/shells/drwtxtex.cxx b/sw/source/uibase/shells/drwtxtex.cxx
index 120c6a162004..35709effdf3d 100644
--- a/sw/source/uibase/shells/drwtxtex.cxx
+++ b/sw/source/uibase/shells/drwtxtex.cxx
@@ -249,10 +249,10 @@ void SwDrawTextShell::Execute( SfxRequest &rReq )
{
SvxLRSpaceItem aParaMargin = aEditAttr.Get( EE_PARA_LRSPACE );
aParaMargin.SetWhich( EE_PARA_LRSPACE );
- short int nFirstLineOffset = aParaMargin.GetTextFirstLineOfst();
+ short int nFirstLineOffset = aParaMargin.GetTextFirstLineOffset();
aParaMargin.SetTextLeft( aParaMargin.GetTextLeft() + nFirstLineOffset );
aParaMargin.SetRight( aParaMargin.GetRight() );
- aParaMargin.SetTextFirstLineOfst( nFirstLineOffset * -1 );
+ aParaMargin.SetTextFirstLineOffset( nFirstLineOffset * -1 );
aNewAttr.Put(aParaMargin);
rReq.Done();
}
diff --git a/sw/source/uibase/uiview/viewtab.cxx b/sw/source/uibase/uiview/viewtab.cxx
index 0ddf545a3d1a..844bbfce782b 100644
--- a/sw/source/uibase/uiview/viewtab.cxx
+++ b/sw/source/uibase/uiview/viewtab.cxx
@@ -627,7 +627,7 @@ void SwView::ExecTabWin( SfxRequest const & rReq )
rSh.GetCurAttr( aSet );
const SvxLRSpaceItem& rLR = aSet.Get(RES_LR_SPACE);
- if ( rLR.GetTextFirstLineOfst() < 0 )
+ if ( rLR.GetTextFirstLineOffset() < 0 )
{
SvxTabStop aSwTabStop( 0, SvxTabAdjust::Default );
aTabStops.Insert( aSwTabStop );
@@ -655,9 +655,9 @@ void SwView::ExecTabWin( SfxRequest const & rReq )
SvxLRSpaceItem aParaMargin( aLRSpaceSet.Get( RES_LR_SPACE ) );
SvxLRSpaceItem aNewMargin( RES_LR_SPACE );
- aNewMargin.SetTextLeft( aParaMargin.GetTextLeft() + aParaMargin.GetTextFirstLineOfst() );
+ aNewMargin.SetTextLeft( aParaMargin.GetTextLeft() + aParaMargin.GetTextFirstLineOffset() );
aNewMargin.SetRight( aParaMargin.GetRight() );
- aNewMargin.SetTextFirstLineOfst( (aParaMargin.GetTextFirstLineOfst()) * -1 );
+ aNewMargin.SetTextFirstLineOffset( (aParaMargin.GetTextFirstLineOffset()) * -1 );
rSh.SetAttrItem( aNewMargin );
break;
@@ -700,7 +700,7 @@ void SwView::ExecTabWin( SfxRequest const & rReq )
else
rSh.SetAttrItem( aParaMargin );
- if ( aParaMargin.GetTextFirstLineOfst() < 0 )
+ if ( aParaMargin.GetTextFirstLineOffset() < 0 )
{
SfxItemSet aSet( GetPool(), svl::Items<RES_PARATR_TABSTOP, RES_PARATR_TABSTOP>{} );
diff --git a/sw/source/uibase/wrtsh/delete.cxx b/sw/source/uibase/wrtsh/delete.cxx
index 4a2420ad7b84..177cb2344c46 100644
--- a/sw/source/uibase/wrtsh/delete.cxx
+++ b/sw/source/uibase/wrtsh/delete.cxx
@@ -62,16 +62,16 @@ bool SwWrtShell::TryRemoveIndent()
GetCurAttr(aAttrSet);
SvxLRSpaceItem aItem = aAttrSet.Get(RES_LR_SPACE);
- short aOldFirstLineOfst = aItem.GetTextFirstLineOfst();
+ short aOldFirstLineOfst = aItem.GetTextFirstLineOffset();
if (aOldFirstLineOfst > 0)
{
- aItem.SetTextFirstLineOfst(0);
+ aItem.SetTextFirstLineOffset(0);
bResult = true;
}
else if (aOldFirstLineOfst < 0)
{
- aItem.SetTextFirstLineOfst(0);
+ aItem.SetTextFirstLineOffset(0);
aItem.SetLeft(aItem.GetLeft() + aOldFirstLineOfst);
bResult = true;