[Libreoffice-commits] core.git: include/svl svl/source sw/source

Eike Rathke erack at redhat.com
Wed Oct 25 10:00:22 UTC 2017


 include/svl/zforlist.hxx         |    3 ---
 svl/source/numbers/zforlist.cxx  |    5 -----
 sw/source/core/fields/fldbas.cxx |    2 +-
 3 files changed, 1 insertion(+), 9 deletions(-)

New commits:
commit 425e06aa7f8c2ca7fdc179278c848da213e8062d
Author: Eike Rathke <erack at redhat.com>
Date:   Wed Oct 25 02:12:21 2017 +0200

    Eliminate deprecated SvNumberFormatter::GetDecSep()
    
    Was only one call left..
    
    Change-Id: I140099d77e762e53579b2a5954fe4c59855104da
    Reviewed-on: https://gerrit.libreoffice.org/43798
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Eike Rathke <erack at redhat.com>

diff --git a/include/svl/zforlist.hxx b/include/svl/zforlist.hxx
index 19015cc1000c..20fb1d453652 100644
--- a/include/svl/zforlist.hxx
+++ b/include/svl/zforlist.hxx
@@ -651,9 +651,6 @@ public:
     sal_uInt16  ExpandTwoDigitYear( sal_uInt16 nYear ) const;
     static sal_uInt16 ExpandTwoDigitYear( sal_uInt16 nYear, sal_uInt16 nTwoDigitYearStart );
 
-    /// DEPRECATED: Return first character of the decimal separator of the current language/country
-    sal_Unicode GetDecSep() const;
-
     /// Return the decimal separator matching the locale of the given format
     OUString GetFormatDecimalSep( sal_uInt32 nFormat ) const;
 
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index 1a5147daaa54..720070d869c6 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -1982,11 +1982,6 @@ sal_uInt16 SvNumberFormatter::GetFormatIntegerDigits( sal_uInt32 nFormat ) const
         return 1;
 }
 
-sal_Unicode SvNumberFormatter::GetDecSep() const
-{
-    return GetNumDecimalSep()[0];
-}
-
 OUString SvNumberFormatter::GetFormatDecimalSep( sal_uInt32 nFormat ) const
 {
     const SvNumberformat* pFormat = GetFormatEntry(nFormat);
diff --git a/sw/source/core/fields/fldbas.cxx b/sw/source/core/fields/fldbas.cxx
index 2b8e111e726f..6febf519af6a 100644
--- a/sw/source/core/fields/fldbas.cxx
+++ b/sw/source/core/fields/fldbas.cxx
@@ -536,7 +536,7 @@ OUString SwValueFieldType::DoubleToString( const double &rVal,
 
     pFormatter->ChangeIntl( nLng ); // get separator in the correct language
     return ::rtl::math::doubleToUString( rVal, rtl_math_StringFormat_F, 12,
-                                    pFormatter->GetDecSep(), true );
+                                    pFormatter->GetNumDecimalSep()[0], true );
 }
 
 SwValueField::SwValueField( SwValueFieldType* pFieldType, sal_uInt32 nFormat,


More information about the Libreoffice-commits mailing list