[Libreoffice-commits] core.git: include/svl svl/source unusedcode.easy
Caolán McNamara
caolanm at redhat.com
Fri Nov 7 01:24:07 PST 2014
include/svl/zforlist.hxx | 10 -------
include/svl/zformat.hxx | 6 ----
svl/source/numbers/zforlist.cxx | 57 ----------------------------------------
svl/source/numbers/zformat.cxx | 20 --------------
unusedcode.easy | 1
5 files changed, 94 deletions(-)
New commits:
commit 8b8b0dfa1ce9015f0514feaa64234831972a5f1d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Nov 7 09:17:46 2014 +0000
callcatcher: number format serialization cleanup fallout
Change-Id: Ib5b5f653b027bfe5c05c0db417a2aa713309d9a5
diff --git a/include/svl/zforlist.hxx b/include/svl/zforlist.hxx
index bd3c0de..2ce4730 100644
--- a/include/svl/zforlist.hxx
+++ b/include/svl/zforlist.hxx
@@ -295,12 +295,6 @@ public:
sal_uInt16 nCurrFormat, bool bBank );
static sal_uInt16 GetEffectiveNegativeFormat( sal_uInt16 nIntlFormat,
sal_uInt16 nCurrFormat, bool bBank );
-
- /// General Unicode Euro symbol
- static inline sal_Unicode GetEuroSymbol() { return sal_Unicode(0x20AC); }
- /** Platform and CharSet dependent Euro symbol,
- needed for import/export */
- static sal_Char GetEuroSymbol( rtl_TextEncoding eTextEncoding );
};
typedef boost::ptr_vector<NfCurrencyEntry> NfCurrencyTable;
@@ -809,10 +803,6 @@ private:
// called by ctors
SVL_DLLPRIVATE void ImpConstruct( LanguageType eLang );
- // Changes initialized language/country, clears the entries and generates
- // new ones, may ONLY be called by the binary file format load
- SVL_DLLPRIVATE void ImpChangeSysCL( LanguageType eLnge, bool bNoAdditionalFormats );
-
// Generate builtin formats provided by i18n behind CLOffset,
// if bNoAdditionalFormats==false also generate additional i18n formats.
SVL_DLLPRIVATE void ImpGenerateFormats( sal_uInt32 CLOffset, bool bNoAdditionalFormats );
diff --git a/include/svl/zformat.hxx b/include/svl/zformat.hxx
index b488647..00b1aa6 100644
--- a/include/svl/zformat.hxx
+++ b/include/svl/zformat.hxx
@@ -163,9 +163,6 @@ class SVL_DLLPUBLIC SvNumberformat
};
public:
- // Ctor for Load
- SvNumberformat( ImpSvNumberformatScan& rSc, LanguageType eLge );
-
// Normal ctor
SvNumberformat( OUString& rString,
ImpSvNumberformatScan* pSc,
@@ -313,9 +310,6 @@ public:
// Whether a new SYMBOLTYPE_CURRENCY is contained in the format
bool HasNewCurrency() const;
- // Build string from NewCurrency for saving it SO50 compatible
- void Build50Formatstring( OUString& rStr ) const;
-
// strip [$-yyy] from all [$xxx-yyy] leaving only xxx's,
// if bQuoteSymbol==true the xxx will become "xxx"
static OUString StripNewCurrencyDelimiters( const OUString& rStr,
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index 5363d6a..b7885f8 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 8d4e08a..315b848 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;
diff --git a/unusedcode.easy b/unusedcode.easy
index ff93219..433c410 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1,6 +1,5 @@
BigInt::BigInt(unsigned int)
CalcUnoApiTest::CalcUnoApiTest(rtl::OUString const&)
-Chart2ImportTest::testTextCanOverlapXLSX()
FontCharMap::GetDefaultMap(bool)
GDriveDocument::GDriveDocument(GDriveSession*)
GDriveFolder::GDriveFolder(GDriveSession*)
More information about the Libreoffice-commits
mailing list