core.git: sc/source

[Mike Kaganski (via logerrit)]

 sc/source/filter/orcus/interface.cxx |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 0a687d1eeffcb21b947b181ceb2424680d1cce46
Author:     Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Sat Apr 13 23:39:24 2024 +0500
Commit:     Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Sun Apr 14 06:52:28 2024 +0200

    Use more o3tl::convert
    
    Change-Id: I5a6a1c05083fbaef71e94799a61c6f918a5134f4
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166064
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>

diff --git a/sc/source/filter/orcus/interface.cxx 
b/sc/source/filter/orcus/interface.cxx
index af425079708d..1f5ac13f358a 100644
--- a/sc/source/filter/orcus/interface.cxx
+++ b/sc/source/filter/orcus/interface.cxx
@@ -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");