From 8b8b0dfa1ce9015f0514feaa64234831972a5f1d Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Fri, 7 Nov 2014 09:17:46 +0000
Subject: callcatcher: number format serialization cleanup fallout

Change-Id: Ib5b5f653b027bfe5c05c0db417a2aa713309d9a5
---
 svl/source/numbers/zforlist.cxx | 57 -----------------------------------------
 svl/source/numbers/zformat.cxx  | 20 ---------------
 2 files changed, 77 deletions(-)

(limited to 'svl')

diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index 5363d6aebc8b..b7885f805dcc 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -348,40 +348,6 @@ sal_uInt16 SvNumberFormatter::GetStandardPrec()
     return pFormatScanner->GetStandardPrec();
 }
 
-void SvNumberFormatter::ImpChangeSysCL( LanguageType eLnge, bool bNoAdditionalFormats )
-{
-    if (eLnge == LANGUAGE_DONTKNOW)
-    {
-        eLnge = UNKNOWN_SUBSTITUTE;
-    }
-    if (eLnge != IniLnge)
-    {
-        IniLnge = eLnge;
-        ChangeIntl(eLnge);
-        // delete old formats
-        for (SvNumberFormatTable::iterator it = aFTable.begin(); it != aFTable.end(); ++it)
-        {
-            delete it->second;
-        }
-        aFTable.clear();
-        ImpGenerateFormats( 0, bNoAdditionalFormats );   // new standard formats
-    }
-    else if ( bNoAdditionalFormats )
-    {
-        // delete additional standard formats
-        sal_uInt32 nKey;
-        SvNumberFormatTable::iterator it = aFTable.find( SV_MAX_ANZ_STANDARD_FORMATE + 1 );
-        while ( it != aFTable.end() &&
-                (nKey = it->first) > SV_MAX_ANZ_STANDARD_FORMATE &&
-                nKey < SV_COUNTRY_LANGUAGE_OFFSET )
-        {
-            delete it->second;
-            aFTable.erase( it++ );
-        }
-    }
-}
-
-
 void SvNumberFormatter::ReplaceSystemCL( LanguageType eOldLanguage )
 {
     sal_uInt32 nCLOffset = ImpGetCLOffset( LANGUAGE_SYSTEM );
@@ -4258,27 +4224,4 @@ sal_uInt16 NfCurrencyEntry::GetEffectiveNegativeFormat( sal_uInt16 nIntlFormat,
     return nIntlFormat;
 }
 
-
-// we only support default encodings here
-// static
-sal_Char NfCurrencyEntry::GetEuroSymbol( rtl_TextEncoding eTextEncoding )
-{
-    switch ( eTextEncoding )
-    {
-    case RTL_TEXTENCODING_MS_1252 :
-    case RTL_TEXTENCODING_ISO_8859_1 :
-        return '\x80';
-    case RTL_TEXTENCODING_ISO_8859_15 :
-        return '\xA4';
-    case RTL_TEXTENCODING_IBM_850 :
-        return '\xD5';
-    case RTL_TEXTENCODING_APPLE_ROMAN :
-        return '\xDB';
-    default:
-        return '\x80';      // Windows code for the converted TrueType fonts (whatever that means)
-    }
-}
-
-
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index 8d4e08a53bae..315b848a589d 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -467,21 +467,6 @@ enum BracketFormatSymbolType
     BRACKET_SYMBOLTYPE_NATNUM19 = -33
 };
 
-SvNumberformat::SvNumberformat( ImpSvNumberformatScan& rSc, LanguageType eLge )
-    : fLimit1(0.0)
-    , fLimit2(0.0)
-    , rScan(rSc)
-    , eOp1(NUMBERFORMAT_OP_NO)
-    , eOp2(NUMBERFORMAT_OP_NO)
-    , eType(0)
-    , bAdditionalBuiltin( false )
-    , bStarFlag( false )
-    , bStandard( false )
-    , bIsUsed( false )
-{
-    maLocale.meLanguage = eLge;
-}
-
 void SvNumberformat::ImpCopyNumberformat( const SvNumberformat& rFormat )
 {
     sFormatstring = rFormat.sFormatstring;
@@ -1726,11 +1711,6 @@ OUString SvNumberformat::StripNewCurrencyDelimiters( const OUString& rStr,
     return aTmp;
 }
 
-void SvNumberformat::Build50Formatstring( OUString& rStr ) const
-{
-    rStr = StripNewCurrencyDelimiters( sFormatstring, true );
-}
-
 void SvNumberformat::ImpGetOutputStandard(double& fNumber, OUStringBuffer& OutString)
 {
     OUString sTemp;
-- 
cgit