diff options
| author | Noel <noelgrandin@gmail.com> | 2020-10-19 15:17:25 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-10-20 08:04:35 +0200 |
| commit | b225980d2d65694278c9ed89512fbe21b08febd6 (patch) | |
| tree | acd7e008fdabbed097fd97f6c4ba8ddc366946bb /sc/inc/global.hxx | |
| parent | 6eefea359fe1e51adfd4a2002614013a7c060a33 (diff) | |
use tools::Long in sc
Change-Id: I8f37a8d1174ed816df971b8cee036d4e88d4a7fc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104526
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sc/inc/global.hxx')
| -rw-r--r-- | sc/inc/global.hxx | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx index 118b5a1a8bc5..84f0d9b4c2d8 100644 --- a/sc/inc/global.hxx +++ b/sc/inc/global.hxx @@ -28,6 +28,7 @@ #include <com/sun/star/i18n/CollatorOptions.hpp> #include "scdllapi.h" #include <rtl/ustring.hxx> +#include <tools/long.hxx> #include <atomic> // HACK: <atomic> includes <stdbool.h>, which in some Clang versions does '#define bool bool', @@ -105,9 +106,9 @@ const SCSIZE MAXSUBTOTAL = 3; namespace sc { - inline long TwipsToHMM( long nTwips ) { return (nTwips * 127 + 36) / 72; } - inline long HMMToTwips( long nHMM ) { return (nHMM * 72 + 63) / 127; } - inline long TwipsToEvenHMM( long nTwips ) { return ( (nTwips * 127 + 72) / 144 ) * 2; } + inline ::tools::Long TwipsToHMM( ::tools::Long nTwips ) { return (nTwips * 127 + 36) / 72; } + inline ::tools::Long HMMToTwips( ::tools::Long nHMM ) { return (nHMM * 72 + 63) / 127; } + inline ::tools::Long TwipsToEvenHMM( ::tools::Long nTwips ) { return ( (nTwips * 127 + 72) / 144 ) * 2; } } // standard size as OLE server (cells) @@ -582,8 +583,8 @@ public: static sal_uInt16 nDefFontHeight; SC_DLLPUBLIC static sal_uInt16 nStdRowHeight; - SC_DLLPUBLIC static long nLastRowHeightExtra; - static long nLastColWidthExtra; + SC_DLLPUBLIC static ::tools::Long nLastRowHeightExtra; + static ::tools::Long nLastColWidthExtra; SC_DLLPUBLIC static void Init(); // during start up static void InitAddIns(); |