diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-04-04 13:39:38 +0300 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-04-11 10:19:05 +0000 |
| commit | 84272d115da1165ac5f7cf4ae53875855d762b25 (patch) | |
| tree | fa97d5319616492e230ebe03a08e1f898c389d77 /cui | |
| parent | Fix bounds (diff) | |
| download | core-84272d115da1165ac5f7cf4ae53875855d762b25.tar.gz core-84272d115da1165ac5f7cf4ae53875855d762b25.zip | |
Introduce twip/mm100 conversion functions instead of duplicated macros
Change-Id: Ib689e35b417e0e9016cd6a239c986e0603a99d62
Reviewed-on: https://gerrit.libreoffice.org/8837
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/tabpages/numpages.cxx | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index a85745a6d35a..2588b189d776 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -25,6 +25,7 @@ #include <numpages.hrc> #include <dialmgr.hxx> #include <tools/shl.hxx> +#include <tools/mapunit.hxx> #include <i18nlangtag/mslangid.hxx> #include <helpid.hrc> #include <editeng/numitem.hxx> @@ -2687,25 +2688,23 @@ SvxNumPositionTabPage::~SvxNumPositionTabPage() #if OSL_DEBUG_LEVEL > 1 void lcl_PrintDebugOutput(FixedText& rFixed, const SvxNumberFormat& rNumFmt) { -#define TWIP_TO_MM100(TWIP) ((TWIP) >= 0 ? (((TWIP)*127L+36L)/72L) : (((TWIP)*127L-36L)/72L)) - OUString const sHash( " # " ); if ( rNumFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_WIDTH_AND_POSITION ) { - OUString sDebugText( OUString::number( TWIP_TO_MM100(rNumFmt.GetAbsLSpace() ) ) ); + OUString sDebugText( OUString::number( convertTwipToMm100(rNumFmt.GetAbsLSpace() ) ) ); sDebugText += sHash; - sDebugText += OUString::number( TWIP_TO_MM100(rNumFmt.GetCharTextDistance() ) ); + sDebugText += OUString::number( convertTwipToMm100(rNumFmt.GetCharTextDistance() ) ); sDebugText += sHash; - sDebugText += OUString::number( TWIP_TO_MM100(rNumFmt.GetFirstLineOffset() ) ); + sDebugText += OUString::number( convertTwipToMm100(rNumFmt.GetFirstLineOffset() ) ); rFixed.SetText(sDebugText); } else if ( rNumFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_ALIGNMENT ) { - OUString sDebugText( OUString::number( TWIP_TO_MM100(rNumFmt.GetListtabPos() ) ) ); + OUString sDebugText( OUString::number( convertTwipToMm100(rNumFmt.GetListtabPos() ) ) ); sDebugText += sHash; - sDebugText += OUString::number( TWIP_TO_MM100(rNumFmt.GetFirstLineIndent() ) ); + sDebugText += OUString::number( convertTwipToMm100(rNumFmt.GetFirstLineIndent() ) ); sDebugText += sHash; - sDebugText += OUString::number( TWIP_TO_MM100(rNumFmt.GetIndentAt() ) ); + sDebugText += OUString::number( convertTwipToMm100(rNumFmt.GetIndentAt() ) ); rFixed.SetText(sDebugText); } |