[Libreoffice-commits] core.git: extensions/source include/vcl vcl/source

[Caolán McNamara (via logerrit)]

 extensions/source/propctrlr/standardcontrol.cxx |    2 --
 include/vcl/field.hxx                           |    1 -
 vcl/source/control/field.cxx                    |    5 +----
 3 files changed, 1 insertion(+), 7 deletions(-)

New commits:
commit 3a40b3649d5ea44435aad99d69680a0525a32406
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Dec 4 19:59:30 2019 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Dec 5 10:40:38 2019 +0100

    the only call to MetricField::SetDefaultUnit doesn't change the default
    
    so is of no use
    
    Change-Id: Ibb1187183abff6b8dc26ed5011b43af1a86a7d04
    Reviewed-on: https://gerrit.libreoffice.org/84458
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx
index 568804909835..9f0f2c23a343 100644
--- a/extensions/source/propctrlr/standardcontrol.cxx
+++ b/extensions/source/propctrlr/standardcontrol.cxx
@@ -483,8 +483,6 @@ namespace pcr
         ,m_eValueUnit( FieldUnit::NONE )
         ,m_nFieldToUNOValueFactor( 1 )
     {
-        MetricField::SetDefaultUnit( FieldUnit::NONE );
-
         getTypedControlWindow()->EnableEmptyFieldValue( true );
         getTypedControlWindow()->SetStrictFormat( true );
         Optional< double > value( getMaxValue() );
diff --git a/include/vcl/field.hxx b/include/vcl/field.hxx
index 3fb2a5468861..db71ee3ebb4b 100644
--- a/include/vcl/field.hxx
+++ b/include/vcl/field.hxx
@@ -486,7 +486,6 @@ public:
     void             SetLast(sal_Int64 last) { SetLast(last, FieldUnit::NONE); }
     sal_Int64               GetLast( FieldUnit eOutUnit ) const;
 
-    static void             SetDefaultUnit( FieldUnit eDefaultUnit );
     static FieldUnit        GetDefaultUnit();
     static sal_Int64        ConvertValue( sal_Int64 nValue, sal_Int64 mnBaseValue, sal_uInt16 nDecDigits,
                                           FieldUnit eInUnit, FieldUnit eOutUnit );
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index 2aa7e85a402f..814093ff5818 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -1118,10 +1118,7 @@ mm/100    mm    cm       m     km  twip point  pica  inch    foot       mile
 #undef M
 #undef K
 
-static FieldUnit eDefaultUnit = FieldUnit::NONE;
-
-FieldUnit MetricField::GetDefaultUnit() { return eDefaultUnit; }
-void MetricField::SetDefaultUnit( FieldUnit meUnit ) { eDefaultUnit = meUnit; }
+FieldUnit MetricField::GetDefaultUnit() { return FieldUnit::NONE; }
 
 static FieldUnit ImplMap2FieldUnit( MapUnit meUnit, long& nDecDigits )
 {