summaryrefslogtreecommitdiff
path: root/sd
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 /sd
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 'sd')
-rw-r--r--sd/source/core/stlsheet.cxx4
-rw-r--r--sd/source/filter/xml/sdtransform.cxx4
-rw-r--r--sd/source/ui/view/drtxtob1.cxx4
-rw-r--r--sd/source/ui/view/drviews3.cxx20
4 files changed, 16 insertions, 16 deletions
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index 89db33f8a85d..8e9a91d4b854 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -536,8 +536,8 @@ void SdStyleSheet::AdjustToFontHeight(SfxItemSet& rSet, bool bOnlyMissingItems)
double fIndentFraction = double(rLRItem.GetTextLeft()) / nOldHeight;
SvxLRSpaceItem aNewLRItem(rLRItem);
aNewLRItem.SetTextLeft(fIndentFraction * nNewHeight);
- double fFirstIndentFraction = double(rLRItem.GetTextFirstLineOfst()) / nOldHeight;
- aNewLRItem.SetTextFirstLineOfst(static_cast<short>(fFirstIndentFraction * nNewHeight));
+ double fFirstIndentFraction = double(rLRItem.GetTextFirstLineOffset()) / nOldHeight;
+ aNewLRItem.SetTextFirstLineOffset(static_cast<short>(fFirstIndentFraction * nNewHeight));
rSet.Put(aNewLRItem);
}
diff --git a/sd/source/filter/xml/sdtransform.cxx b/sd/source/filter/xml/sdtransform.cxx
index 586d6ba9dbdc..4866b5563ca6 100644
--- a/sd/source/filter/xml/sdtransform.cxx
+++ b/sd/source/filter/xml/sdtransform.cxx
@@ -299,10 +299,10 @@ bool SdTransformOOo2xDocument::transformItemSet( SfxItemSet& rSet, bool bNumberi
if( bNumbering )
{
SvxLRSpaceItem aItem( *rSet.GetItem<SvxLRSpaceItem>( EE_PARA_LRSPACE ) );
- if( (aItem.GetLeft() != 0) || (aItem.GetTextFirstLineOfst() != 0) )
+ if( (aItem.GetLeft() != 0) || (aItem.GetTextFirstLineOffset() != 0) )
{
aItem.SetLeftValue( 0 );
- aItem.SetTextFirstLineOfst( 0 );
+ aItem.SetTextFirstLineOffset( 0 );
rSet.Put( aItem );
bRet = true;
}
diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx
index b7ceab073a9f..288e8b3c1ea3 100644
--- a/sd/source/ui/view/drtxtob1.cxx
+++ b/sd/source/ui/view/drtxtob1.cxx
@@ -376,9 +376,9 @@ void TextObjectBar::Execute( SfxRequest &rReq )
SvxLRSpaceItem aParaMargin( aLRSpaceSet.Get( EE_PARA_LRSPACE ) );
SvxLRSpaceItem aNewMargin( EE_PARA_LRSPACE );
- 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 );
aLRSpaceSet.Put( aNewMargin );
mpView->SetAttributes( aLRSpaceSet );
diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx
index 6f1607aefc10..f6358f3629c2 100644
--- a/sd/source/ui/view/drviews3.cxx
+++ b/sd/source/ui/view/drviews3.cxx
@@ -822,7 +822,7 @@ void DrawViewShell::ExecRuler(SfxRequest& rReq)
nId = EE_PARA_LRSPACE;
SvxLRSpaceItem aLRSpaceItem( rItem.GetLeft(),
rItem.GetRight(), rItem.GetTextLeft(),
- rItem.GetTextFirstLineOfst(), nId );
+ rItem.GetTextFirstLineOffset(), nId );
const sal_Int16 nOutlineLevel = aEditAttr.Get( EE_PARA_OUTLLEVEL ).GetValue();
const SvxLRSpaceItem& rOrigLRSpaceItem = aEditAttr.Get( EE_PARA_LRSPACE );
@@ -849,19 +849,19 @@ void DrawViewShell::ExecRuler(SfxRequest& rReq)
// negative first line indent goes to the number
// format, positive to the lrSpace item
- if( rItem.GetTextFirstLineOfst() < 0 )
+ if( rItem.GetTextFirstLineOffset() < 0 )
{
aFormat.SetFirstLineOffset(
- rItem.GetTextFirstLineOfst()
- - rOrigLRSpaceItem.GetTextFirstLineOfst()
+ rItem.GetTextFirstLineOffset()
+ - rOrigLRSpaceItem.GetTextFirstLineOffset()
+ aFormat.GetCharTextDistance());
- aLRSpaceItem.SetTextFirstLineOfst(0);
+ aLRSpaceItem.SetTextFirstLineOffset(0);
}
else
{
aFormat.SetFirstLineOffset(0);
- aLRSpaceItem.SetTextFirstLineOfst(
- rItem.GetTextFirstLineOfst()
+ aLRSpaceItem.SetTextFirstLineOffset(
+ rItem.GetTextFirstLineOffset()
- aFormat.GetFirstLineOffset() //TODO: overflow
+ aFormat.GetCharTextDistance());
}
@@ -953,7 +953,7 @@ void DrawViewShell::GetRulerState(SfxItemSet& rSet)
const SvxLRSpaceItem& rLRSpaceItem = aEditAttr.Get( EE_PARA_LRSPACE );
SvxLRSpaceItem aLRSpaceItem( rLRSpaceItem.GetLeft(),
rLRSpaceItem.GetRight(), rLRSpaceItem.GetTextLeft(),
- rLRSpaceItem.GetTextFirstLineOfst(), SID_ATTR_PARA_LRSPACE );
+ rLRSpaceItem.GetTextFirstLineOffset(), SID_ATTR_PARA_LRSPACE );
const sal_Int16 nOutlineLevel = aEditAttr.Get( EE_PARA_OUTLLEVEL ).GetValue();
const SvxNumBulletItem& rNumBulletItem = aEditAttr.Get( EE_PARA_NUMBULLET );
@@ -963,8 +963,8 @@ void DrawViewShell::GetRulerState(SfxItemSet& rSet)
{
const SvxNumberFormat& rFormat = rNumBulletItem.GetNumRule()->GetLevel(nOutlineLevel);
aLRSpaceItem.SetTextLeft(rFormat.GetAbsLSpace() + rLRSpaceItem.GetTextLeft());
- aLRSpaceItem.SetTextFirstLineOfst(
- rLRSpaceItem.GetTextFirstLineOfst() + rFormat.GetFirstLineOffset()
+ aLRSpaceItem.SetTextFirstLineOffset(
+ rLRSpaceItem.GetTextFirstLineOffset() + rFormat.GetFirstLineOffset()
//TODO: overflow
- rFormat.GetCharTextDistance());
}