From 4e7e0a29836f0c28471a2f5c605976453f6d29ae Mon Sep 17 00:00:00 2001 From: Justin Luth Date: Tue, 26 Nov 2019 15:49:53 +0300 Subject: NFC tdf#120412 cleanup: use DFLT_ESC_* more and all of the comment references to 14400% are no longer accurate, so they were removed. Change-Id: Ic958cc240e4898e914958fc32d09e2bb9478f197 Reviewed-on: https://gerrit.libreoffice.org/83845 Tested-by: Jenkins Reviewed-by: Justin Luth --- editeng/source/items/svxfont.cxx | 2 +- editeng/source/items/textitem.cxx | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'editeng') diff --git a/editeng/source/items/svxfont.cxx b/editeng/source/items/svxfont.cxx index 58cc0ddab5da..3ee013a03cf4 100644 --- a/editeng/source/items/svxfont.cxx +++ b/editeng/source/items/svxfont.cxx @@ -511,7 +511,7 @@ void SvxFont::DrawPrev( OutputDevice *pOut, Printer* pPrinter, { short nTmpEsc; if( DFLT_ESC_AUTO_SUPER == nEsc ) - nTmpEsc = 33; + nTmpEsc = DFLT_ESC_SUPER; else if( DFLT_ESC_AUTO_SUB == nEsc ) nTmpEsc = -20; else diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx index 34b6ac42d8ec..bd39fa4cf3f7 100644 --- a/editeng/source/items/textitem.cxx +++ b/editeng/source/items/textitem.cxx @@ -1707,7 +1707,7 @@ SvxEscapementItem::SvxEscapementItem( const SvxEscapement eEscape, { SetEscapement( eEscape ); if( nEsc ) - nProp = 58; + nProp = DFLT_ESC_PROP; } @@ -1817,8 +1817,7 @@ bool SvxEscapementItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) case MID_ESC: { sal_Int16 nVal = sal_Int16(); - // tdf#120412 up to 14400% (eg. 1584 pt with 11 pt letters) - if( (rVal >>= nVal) && (std::abs(nVal) <= 14400)) + if( (rVal >>= nVal) && (std::abs(nVal) <= MAX_ESC_POS+1)) nEsc = nVal; else return false; -- cgit