diff options
| author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-12-04 09:06:46 -0500 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-12-04 09:13:40 -0500 |
| commit | e957766a104cb2380d46d7a125ebd0c80eef81d0 (patch) | |
| tree | cb0408fddb18b5eded026ca2fc68c34617f9c3ec | |
| parent | bbb18f679f5a50e9c709520d6c3260d3d9db5aa9 (diff) | |
Putting this back in to fix Windows build.
Change-Id: I98262000956f10dc3b3da069b6bc286fec314a45
| -rw-r--r-- | include/svl/zforlist.hxx | 11 | ||||
| -rw-r--r-- | svl/source/numbers/zforlist.cxx | 6 |
2 files changed, 17 insertions, 0 deletions
diff --git a/include/svl/zforlist.hxx b/include/svl/zforlist.hxx index 8d5b9fcdc184..4b06d40517d4 100644 --- a/include/svl/zforlist.hxx +++ b/include/svl/zforlist.hxx @@ -255,6 +255,8 @@ public: sal_Unicode cZero ); ~NfCurrencyEntry() {} + NfCurrencyEntry* Clone() const; + /// Symbols and language identical bool operator==( const NfCurrencyEntry& r ) const; @@ -302,6 +304,15 @@ public: static inline sal_Unicode GetEuroSymbol() { return sal_Unicode(0x20AC); } }; +/** + * Necessary for ptr_vector on Windows. Please don't remove this, or at + * least check it on Windows before attempting to remove it. + */ +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 cb7af29b357b..b9672a004ec4 100644 --- a/svl/source/numbers/zforlist.cxx +++ b/svl/source/numbers/zforlist.cxx @@ -3837,6 +3837,12 @@ NfCurrencyEntry::NfCurrencyEntry( 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 { return aSymbol == r.aSymbol |