diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2017-05-18 13:25:31 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2017-05-18 18:04:38 +0200 |
| commit | 1be2684512e5ad21526c65ee04acf2c71a8691b6 (patch) | |
| tree | 87f35143a54c19238e1dc9bb64e1b32512b42de1 /include/tools | |
| parent | drop toString (diff) | |
| download | core-1be2684512e5ad21526c65ee04acf2c71a8691b6.tar.gz core-1be2684512e5ad21526c65ee04acf2c71a8691b6.zip | |
sw lok: Make the default for the Web view larger.
Change-Id: I943711e084adcfa0af2a79cf83d5c3e1b6dc45e6
Reviewed-on: https://gerrit.libreoffice.org/37758
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Diffstat (limited to 'include/tools')
| -rw-r--r-- | include/tools/mapunit.hxx | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/include/tools/mapunit.hxx b/include/tools/mapunit.hxx index 334e2f5202bf..2209f4d35261 100644 --- a/include/tools/mapunit.hxx +++ b/include/tools/mapunit.hxx @@ -34,20 +34,14 @@ enum class MapUnit LASTENUMDUMMY // used as an error return }; -inline sal_Int64 convertTwipToMm100(sal_Int64 n) +constexpr sal_Int64 convertTwipToMm100(sal_Int64 n) { - if (n >= 0) - return (n*127+36)/72; - else - return (n*127-36)/72; + return (n >= 0)? (n*127+36)/72: (n*127-36)/72; } -inline sal_Int64 convertMm100ToTwip(sal_Int64 n) +constexpr sal_Int64 convertMm100ToTwip(sal_Int64 n) { - if (n >= 0) - return (n*72+63)/127; - else - return (n*72-63)/127; + return (n >= 0)? (n*72+63)/127: (n*72-63)/127; } #endif |