From 17231d0b94ef47f602db2a40875e7274d938b15b Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Fri, 14 Feb 2020 10:51:39 +0000 Subject: split StringToMetric and TextToValue into fieldvalue.hxx MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I5d1102f7a50a7a246df9f6de8b7a6df6557eb54d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88682 Tested-by: Jenkins Reviewed-by: Caolán McNamara --- include/vcl/field.hxx | 3 --- include/vcl/fieldvalues.hxx | 8 ++++++++ 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/vcl/field.hxx b/include/vcl/field.hxx index c011132f4c81..7cb371a25e4a 100644 --- a/include/vcl/field.hxx +++ b/include/vcl/field.hxx @@ -219,9 +219,6 @@ public: virtual OUString CreateFieldText( sal_Int64 nValue ) const override; sal_Int64 GetCorrectedValue( FieldUnit eOutUnit ) const; - static FieldUnit StringToMetric(const OUString &rMetricString); - static bool TextToValue(const OUString& rStr, double& rValue, sal_Int64 nBaseValue, sal_uInt16 nDecDigits, const LocaleDataWrapper& rLocaleDataWrapper, FieldUnit eUnit); - protected: FieldUnit meUnit; diff --git a/include/vcl/fieldvalues.hxx b/include/vcl/fieldvalues.hxx index e36b0590ae71..e8f78bd5e119 100644 --- a/include/vcl/fieldvalues.hxx +++ b/include/vcl/fieldvalues.hxx @@ -21,11 +21,19 @@ #define INCLUDED_VCL_FIELDVALUES_HXX #include +#include #include #include +class LocaleDataWrapper; + namespace vcl { +VCL_DLLPUBLIC FieldUnit StringToMetric(const OUString& rMetricString); +VCL_DLLPUBLIC bool TextToValue(const OUString& rStr, double& rValue, sal_Int64 nBaseValue, + sal_uInt16 nDecDigits, const LocaleDataWrapper& rLocaleDataWrapper, + FieldUnit eUnit); + VCL_DLLPUBLIC sal_Int64 ConvertValue(sal_Int64 nValue, sal_Int64 mnBaseValue, sal_uInt16 nDecDigits, FieldUnit eInUnit, FieldUnit eOutUnit); VCL_DLLPUBLIC sal_Int64 ConvertValue(sal_Int64 nValue, sal_uInt16 nDecDigits, MapUnit eInUnit, -- cgit