Use more o3tl::convert
Change-Id: I5a6a1c05083fbaef71e94799a61c6f918a5134f4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166064 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
This commit is contained in:
parent
b21978ba64
commit
0a687d1eef
1 changed files with 6 additions and 3 deletions
|
@ -45,6 +45,7 @@
|
|||
#include <svl/intitem.hxx>
|
||||
#include <com/sun/star/task/XStatusIndicator.hpp>
|
||||
#include <i18nlangtag/lang.h>
|
||||
#include <o3tl/unit_conversion.hxx>
|
||||
#include <tools/fontenum.hxx>
|
||||
#include <sal/log.hxx>
|
||||
|
||||
|
@ -750,13 +751,15 @@ double translateToInternal(double nVal, orcus::length_unit_t unit)
|
|||
switch(unit)
|
||||
{
|
||||
case orcus::length_unit_t::inch:
|
||||
return nVal * 72.0 * 20.0;
|
||||
return o3tl::convert(nVal, o3tl::Length::in, o3tl::Length::twip);
|
||||
case orcus::length_unit_t::twip:
|
||||
return nVal;
|
||||
case orcus::length_unit_t::point:
|
||||
return nVal * 20.0;
|
||||
return o3tl::convert(nVal, o3tl::Length::pt, o3tl::Length::twip);
|
||||
case orcus::length_unit_t::centimeter:
|
||||
return nVal * 20.0 * 72.0 / 2.54;
|
||||
return o3tl::convert(nVal, o3tl::Length::cm, o3tl::Length::twip);
|
||||
case orcus::length_unit_t::millimeter:
|
||||
return o3tl::convert(nVal, o3tl::Length::mm, o3tl::Length::twip);
|
||||
case orcus::length_unit_t::unknown:
|
||||
if (nVal != 0)
|
||||
SAL_WARN("sc.orcus", "unknown unit");
|
||||
|
|
Loading…
Reference in a new issue