Move MapToO3tlLength and FieldToO3tlLength to respective enums' headers

Decreases dependency on <tools/UnitConversion.hxx> a bit.

Change-Id: Ia469c08ca2844c522f508a724ddc879120d0b50d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169761
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Tested-by: Jenkins

include/tools/UnitConversion.hxx

@@ -12,77 +12,7 @@
 
 #include <o3tl/unit_conversion.hxx>
 #include <sal/types.h>
-#include <tools/fldunit.hxx>
 #include <tools/fract.hxx>
-#include <tools/mapunit.hxx>
-
-constexpr o3tl::Length FieldToO3tlLength(FieldUnit eU, o3tl::Length ePixelValue = o3tl::Length::px)
-{
-    switch (eU)
-    {
-        case FieldUnit::MM:
-            return o3tl::Length::mm;
-        case FieldUnit::CM:
-            return o3tl::Length::cm;
-        case FieldUnit::M:
-            return o3tl::Length::m;
-        case FieldUnit::KM:
-            return o3tl::Length::km;
-        case FieldUnit::TWIP:
-            return o3tl::Length::twip;
-        case FieldUnit::POINT:
-            return o3tl::Length::pt;
-        case FieldUnit::PICA:
-            return o3tl::Length::pc;
-        case FieldUnit::INCH:
-            return o3tl::Length::in;
-        case FieldUnit::FOOT:
-            return o3tl::Length::ft;
-        case FieldUnit::MILE:
-            return o3tl::Length::mi;
-        case FieldUnit::CHAR:
-            return o3tl::Length::ch;
-        case FieldUnit::LINE:
-            return o3tl::Length::line;
-        case FieldUnit::MM_100TH:
-            return o3tl::Length::mm100;
-        case FieldUnit::PIXEL:
-            return ePixelValue;
-        default:
-            return o3tl::Length::invalid;
-    }
-}
-
-constexpr o3tl::Length MapToO3tlLength(MapUnit eU, o3tl::Length ePixelValue = o3tl::Length::px)
-{
-    switch (eU)
-    {
-        case MapUnit::Map100thMM:
-            return o3tl::Length::mm100;
-        case MapUnit::Map10thMM:
-            return o3tl::Length::mm10;
-        case MapUnit::MapMM:
-            return o3tl::Length::mm;
-        case MapUnit::MapCM:
-            return o3tl::Length::cm;
-        case MapUnit::Map1000thInch:
-            return o3tl::Length::in1000;
-        case MapUnit::Map100thInch:
-            return o3tl::Length::in100;
-        case MapUnit::Map10thInch:
-            return o3tl::Length::in10;
-        case MapUnit::MapInch:
-            return o3tl::Length::in;
-        case MapUnit::MapPoint:
-            return o3tl::Length::pt;
-        case MapUnit::MapTwip:
-            return o3tl::Length::twip;
-        case MapUnit::MapPixel:
-            return ePixelValue;
-        default:
-            return o3tl::Length::invalid;
-    }
-}
 
 inline Fraction conversionFract(o3tl::Length from, o3tl::Length to)
 {

include/tools/fldunit.hxx

@@ -19,6 +19,9 @@
 #ifndef INCLUDED_TOOLS_FLDUNIT_HXX
 #define INCLUDED_TOOLS_FLDUNIT_HXX
 
+#include <sal/config.h>
+
+#include <o3tl/unit_conversion.hxx>
 #include <sal/types.h>
 
 // Corresponds to offapi/com/sun/star/awt/FieldUnit.idl
@@ -46,6 +49,43 @@ enum class FieldUnit : sal_uInt16
     MILLISECOND,
 };
 
+constexpr o3tl::Length FieldToO3tlLength(FieldUnit eU, o3tl::Length ePixelValue = o3tl::Length::px)
+{
+    switch (eU)
+    {
+        case FieldUnit::MM:
+            return o3tl::Length::mm;
+        case FieldUnit::CM:
+            return o3tl::Length::cm;
+        case FieldUnit::M:
+            return o3tl::Length::m;
+        case FieldUnit::KM:
+            return o3tl::Length::km;
+        case FieldUnit::TWIP:
+            return o3tl::Length::twip;
+        case FieldUnit::POINT:
+            return o3tl::Length::pt;
+        case FieldUnit::PICA:
+            return o3tl::Length::pc;
+        case FieldUnit::INCH:
+            return o3tl::Length::in;
+        case FieldUnit::FOOT:
+            return o3tl::Length::ft;
+        case FieldUnit::MILE:
+            return o3tl::Length::mi;
+        case FieldUnit::CHAR:
+            return o3tl::Length::ch;
+        case FieldUnit::LINE:
+            return o3tl::Length::line;
+        case FieldUnit::MM_100TH:
+            return o3tl::Length::mm100;
+        case FieldUnit::PIXEL:
+            return ePixelValue;
+        default:
+            return o3tl::Length::invalid;
+    }
+}
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

include/tools/mapunit.hxx

@@ -18,6 +18,9 @@
  */
 #pragma once
 
+#include <sal/config.h>
+
+#include <o3tl/unit_conversion.hxx>
 #include <sal/types.h>
 
 enum class MapUnit : sal_uInt8
@@ -32,4 +35,35 @@ enum class MapUnit : sal_uInt8
     LASTENUMDUMMY // used as an error return
 };
 
+constexpr o3tl::Length MapToO3tlLength(MapUnit eU, o3tl::Length ePixelValue = o3tl::Length::px)
+{
+    switch (eU)
+    {
+        case MapUnit::Map100thMM:
+            return o3tl::Length::mm100;
+        case MapUnit::Map10thMM:
+            return o3tl::Length::mm10;
+        case MapUnit::MapMM:
+            return o3tl::Length::mm;
+        case MapUnit::MapCM:
+            return o3tl::Length::cm;
+        case MapUnit::Map1000thInch:
+            return o3tl::Length::in1000;
+        case MapUnit::Map100thInch:
+            return o3tl::Length::in100;
+        case MapUnit::Map10thInch:
+            return o3tl::Length::in10;
+        case MapUnit::MapInch:
+            return o3tl::Length::in;
+        case MapUnit::MapPoint:
+            return o3tl::Length::pt;
+        case MapUnit::MapTwip:
+            return o3tl::Length::twip;
+        case MapUnit::MapPixel:
+            return ePixelValue;
+        default:
+            return o3tl::Length::invalid;
+    }
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */