diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2020-05-23 11:54:01 +0200 |
|---|---|---|
| committer | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2020-07-29 20:46:49 +0200 |
| commit | c0eab53fe745b5fbb66b950ae549e5a2466bd060 (patch) | |
| tree | 9ab494bd14b91f08edc953a0211d017ce9d69815 /include | |
| parent | vcl: VectorGraphicSearch return text rectangles in 100th mm (diff) | |
| download | core-c0eab53fe745b5fbb66b950ae549e5a2466bd060.tar.gz core-c0eab53fe745b5fbb66b950ae549e5a2466bd060.zip | |
vcl: add conversion point to twip int64 & double values
Change-Id: Id54d28b57c055269259317521f59d37dcdf9a456
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95274
Tested-by: Tomaž Vajngerl <quikee@gmail.com>
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
(cherry picked from commit 5f8f8889a47a7079fc1beaa179e29cc32aa10e0e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95914
(cherry picked from commit 37543a1bad3122461fd7b2ebe61f4a60e16a4ba4)
Diffstat (limited to 'include')
| -rw-r--r-- | include/tools/UnitConversion.hxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/tools/UnitConversion.hxx b/include/tools/UnitConversion.hxx index 2093db6181d9..2585fecbb590 100644 --- a/include/tools/UnitConversion.hxx +++ b/include/tools/UnitConversion.hxx @@ -20,11 +20,15 @@ constexpr sal_Int64 convertMm100ToTwip(sal_Int64 n) return (n >= 0) ? (n * 72 + 63) / 127 : (n * 72 - 63) / 127; } +constexpr sal_Int64 convertPointToTwip(sal_Int64 nNumber) { return nNumber * 20; } + constexpr sal_Int64 convertPointToMm100(sal_Int64 nNumber) { - return convertTwipToMm100(nNumber * 20); + return convertTwipToMm100(convertPointToTwip(nNumber)); } +constexpr double convertPointToTwip(double fNumber) { return fNumber * 20.0; } + constexpr double convertPointToMm100(double fNumber) { return fNumber * 35.27777777778; } // Convert PPT's "master unit" (1/576 inch) to twips |