diff options
| author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-11-22 18:35:06 -0500 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-11-22 18:38:49 -0500 |
| commit | 84a6d8eeaab540e5b2ea3baffd919903dff8c247 (patch) | |
| tree | 40caa8028110eddadef72c15194a2238c3b9f12f | |
| parent | 3a79d1c0001252483c695eed8e709304cd43ca84 (diff) | |
ptr_container sometimes requires new_clone function.
This fixes Windows build breakage.
Change-Id: I188e38b20674700132c7d7c78304f58748540556
| -rw-r--r-- | include/svl/zforlist.hxx | 10 | ||||
| -rw-r--r-- | svl/source/numbers/zforlist.cxx | 13 |
2 files changed, 23 insertions, 0 deletions
diff --git a/include/svl/zforlist.hxx b/include/svl/zforlist.hxx index 7607af724b7d..7ada1b58ed6b 100644 --- a/include/svl/zforlist.hxx +++ b/include/svl/zforlist.hxx @@ -250,8 +250,13 @@ public: NfCurrencyEntry( const ::com::sun::star::i18n::Currency & rCurr, const LocaleDataWrapper& rLocaleData, LanguageType eLang ); + NfCurrencyEntry( const OUString& rSymbol, const OUString& rBankSymbol, LanguageType eLang, + sal_uInt16 nPositiveFmt, sal_uInt16 nNegativeFmt, sal_uInt16 nDig, + sal_Unicode cZero ); ~NfCurrencyEntry() {} + NfCurrencyEntry* Clone() const; + /// Symbols and language identical bool operator==( const NfCurrencyEntry& r ) const; @@ -299,6 +304,11 @@ public: static inline sal_Unicode GetEuroSymbol() { return sal_Unicode(0x20AC); } }; +inline NfCurrencyEntry* new_clone( const NfCurrencyEntry& r ) +{ + return r.Clone(); +} + typedef std::vector< OUString > NfWSStringsDtor; class SvNumberFormatterRegistry_Impl; diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx index 9b8e562db476..f0fe0c9fa883 100644 --- a/svl/source/numbers/zforlist.cxx +++ b/svl/source/numbers/zforlist.cxx @@ -3840,6 +3840,19 @@ NfCurrencyEntry::NfCurrencyEntry( const ::com::sun::star::i18n::Currency & rCurr cZeroChar = rLocaleData.getCurrZeroChar(); } +NfCurrencyEntry::NfCurrencyEntry( + const OUString& rSymbol, const OUString& rBankSymbol, LanguageType eLang, + sal_uInt16 nPositiveFmt, sal_uInt16 nNegativeFmt, sal_uInt16 nDig, + sal_Unicode cZero ) : + aSymbol(rSymbol), aBankSymbol(rBankSymbol), eLanguage(eLang), + nPositiveFormat(nPositiveFmt), nNegativeFormat(nNegativeFmt), + nDigits(nDig), cZeroChar(cZero) {} + +NfCurrencyEntry* NfCurrencyEntry::Clone() const +{ + return new NfCurrencyEntry( + aSymbol, aBankSymbol, eLanguage, nPositiveFormat, nNegativeFormat, nDigits, cZeroChar); +} bool NfCurrencyEntry::operator==( const NfCurrencyEntry& r ) const { |