diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2021-11-14 00:09:43 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2021-11-13 23:38:37 +0100 |
| commit | 7b8f630db30ee0066a9f4b6e540368d2fcad7fa8 (patch) | |
| tree | e40626d45db8a228defeca6e66aba9055974d0a6 /embedserv | |
| parent | use new method too in existing unit tests in svdraw.cxx (diff) | |
| download | core-7b8f630db30ee0066a9f4b6e540368d2fcad7fa8.tar.gz core-7b8f630db30ee0066a9f4b6e540368d2fcad7fa8.zip | |
Use o3tl::convert
Change-Id: I78db3001d602ec1a0847785b3c127b9d345f5af7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125173
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'embedserv')
| -rw-r--r-- | embedserv/source/embed/docholder.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/embedserv/source/embed/docholder.cxx b/embedserv/source/embed/docholder.cxx index e79c26a2a0d5..0c4469d62e80 100644 --- a/embedserv/source/embed/docholder.cxx +++ b/embedserv/source/embed/docholder.cxx @@ -62,6 +62,7 @@ #include <comphelper/processfactory.hxx> #include <comphelper/propertyvalue.hxx> #include <o3tl/any.hxx> +#include <o3tl/unit_conversion.hxx> #include <osl/diagnose.h> #include <rtl/process.h> #include <rtl/ref.hxx> @@ -1073,8 +1074,8 @@ HRESULT DocumentHolder::SetExtent( const SIZEL *pSize ) if ( aMapMode == embed::EmbedMapUnits::TWIP ) { // conversion from ONE_100TH_MM - aNewSize.Width = aNewSize.Width * 144 / 254; - aNewSize.Height = aNewSize.Height * 144 / 254; + aNewSize.Width = o3tl::toTwips(aNewSize.Width, o3tl::Length::mm100); + aNewSize.Height = o3tl::toTwips(aNewSize.Height, o3tl::Length::mm100); } @@ -1107,8 +1108,8 @@ HRESULT DocumentHolder::GetExtent( SIZEL *pSize ) if ( aMapMode == embed::EmbedMapUnits::TWIP ) { // conversion to ONE_100TH_MM - aDocSize.Width = aDocSize.Width * 254 / 144; - aDocSize.Height = aDocSize.Height * 254 / 144; + aDocSize.Width = o3tl::convert(aDocSize.Width, o3tl::Length::twip, o3tl::Length::mm100); + aDocSize.Height = o3tl::convert(aDocSize.Height, o3tl::Length::twip, o3tl::Length::mm100); } pSize->cx = aDocSize.Width; |