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

[Kohei Yoshida]

 include/svl/zforlist.hxx        |   11 +++++++++++
 svl/source/numbers/zforlist.cxx |    6 ++++++
 2 files changed, 17 insertions(+)

New commits:
commit e957766a104cb2380d46d7a125ebd0c80eef81d0
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date:   Thu Dec 4 09:06:46 2014 -0500

    Putting this back in to fix Windows build.
    
    Change-Id: I98262000956f10dc3b3da069b6bc286fec314a45

diff --git a/include/svl/zforlist.hxx b/include/svl/zforlist.hxx
index 8d5b9fc..4b06d40 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 cb7af29..b9672a0 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