diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-08-18 09:25:40 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-08-18 12:53:31 +0200 |
| commit | 88bf1749f1eb7322106da1254e349f51f5df0df5 (patch) | |
| tree | 9dede2758a1cdc913b04b0bd76aca981f838254e /editeng | |
| parent | 821ae763cc03f69e226cdba66bb9c82c03483a23 (diff) | |
undo changes to TextAlign
revert commit 8689bd5490b473a7ffb149bbe5f7f0683f679c72
Author: Caolán McNamara <caolanm@redhat.com>
Date: Thu Jul 29 20:49:29 2021 +0100
convert TextAlign to scoped enum
lets leave this as it always was
Change-Id: Id4d2a5644974cdd2b0ed6d361d5c52629674d057
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120626
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'editeng')
| -rw-r--r-- | editeng/source/editeng/editdoc.cxx | 2 | ||||
| -rw-r--r-- | editeng/source/items/bulitem.cxx | 2 | ||||
| -rw-r--r-- | editeng/source/outliner/outliner.cxx | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx index 902dc3369d68..27aa19ed2992 100644 --- a/editeng/source/editeng/editdoc.cxx +++ b/editeng/source/editeng/editdoc.cxx @@ -1939,7 +1939,7 @@ void EditDoc::RemoveItemsFromPool(const ContentNode& rNode) void CreateFont( SvxFont& rFont, const SfxItemSet& rSet, bool bSearchInParent, SvtScriptType nScriptType ) { vcl::Font aPrevFont( rFont ); - rFont.SetAlignment( TextAlign::Baseline ); + rFont.SetAlignment( ALIGN_BASELINE ); rFont.SetTransparent( true ); sal_uInt16 nWhich_FontInfo = GetScriptItemId( EE_CHAR_FONTINFO, nScriptType ); diff --git a/editeng/source/items/bulitem.cxx b/editeng/source/items/bulitem.cxx index aee2cd203a51..769179748b40 100644 --- a/editeng/source/items/bulitem.cxx +++ b/editeng/source/items/bulitem.cxx @@ -30,7 +30,7 @@ SvxBulletItem::SvxBulletItem( sal_uInt16 _nWhich ) , nScale(75) , cSymbol(' ') { - aFont.SetAlignment(TextAlign::Bottom); + aFont.SetAlignment(ALIGN_BOTTOM); aFont.SetTransparent( true ); } diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx index 7370c5666313..0459ac1f2873 100644 --- a/editeng/source/outliner/outliner.cxx +++ b/editeng/source/outliner/outliner.cxx @@ -858,7 +858,7 @@ vcl::Font Outliner::ImpCalcBulletFont( sal_Int32 nPara ) const nScaledLineHeight *= nScale*10; nScaledLineHeight /= 1000; - aBulletFont.SetAlignment( TextAlign::Bottom ); + aBulletFont.SetAlignment( ALIGN_BOTTOM ); aBulletFont.SetFontSize( Size( 0, nScaledLineHeight ) ); bool bVertical = IsVertical(); aBulletFont.SetVertical( bVertical ); @@ -921,7 +921,7 @@ void Outliner::PaintBullet(sal_Int32 nPara, const Point& rStartPos, const Point& vcl::Font aBulletFont( ImpCalcBulletFont( nPara ) ); // Use baseline bool bSymbol = pFmt->GetNumberingType() == SVX_NUM_CHAR_SPECIAL; - aBulletFont.SetAlignment( bSymbol ? TextAlign::Bottom : TextAlign::Baseline ); + aBulletFont.SetAlignment( bSymbol ? ALIGN_BOTTOM : ALIGN_BASELINE ); vcl::Font aOldFont = rOutDev.GetFont(); rOutDev.SetFont( aBulletFont ); |