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

[Kohei Yoshida]

 include/svl/zforlist.hxx        |   10 ++++++++++
 svl/source/numbers/zforlist.cxx |   13 +++++++++++++
 2 files changed, 23 insertions(+)

New commits:
commit 84a6d8eeaab540e5b2ea3baffd919903dff8c247
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date:   Sat Nov 22 18:35:06 2014 -0500

    ptr_container sometimes requires new_clone function.
    
    This fixes Windows build breakage.
    
    Change-Id: I188e38b20674700132c7d7c78304f58748540556

diff --git a/include/svl/zforlist.hxx b/include/svl/zforlist.hxx
index 7607af7..7ada1b5 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 9b8e562..f0fe0c9 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
 {