summaryrefslogtreecommitdiff
path: root/include/svl
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2021-07-20 16:16:34 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2021-07-20 21:01:10 +0200
commitb285ea8606b99e2b85125ddf84af0e5e634bdd86 (patch)
treec590edd441bc4335ff42d99d752e85c35a56dc10 /include/svl
parent966ae2345ce09b73c2d8ea47abb983030cc580bf (diff)
flatten the vector in NfCurrencyTable
Change-Id: I4a024e2d8c9743374e58836f95aa1fcbdc406b5b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119288 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/svl')
-rw-r--r--include/svl/currencytable.hxx4
-rw-r--r--include/svl/zforlist.hxx5
2 files changed, 3 insertions, 6 deletions
diff --git a/include/svl/currencytable.hxx b/include/svl/currencytable.hxx
index 2214b1903a6a..f7573f48b80b 100644
--- a/include/svl/currencytable.hxx
+++ b/include/svl/currencytable.hxx
@@ -18,7 +18,7 @@
class SVL_DLLPUBLIC NfCurrencyTable
{
- typedef std::vector<std::unique_ptr<NfCurrencyEntry>> DataType;
+ typedef std::vector<NfCurrencyEntry> DataType;
DataType maData;
NfCurrencyTable(NfCurrencyTable const&) = delete;
@@ -36,7 +36,7 @@ public:
size_t size() const;
- void insert(const iterator& it, std::unique_ptr<NfCurrencyEntry> p);
+ void insert(const iterator& it, NfCurrencyEntry p);
};
#endif
diff --git a/include/svl/zforlist.hxx b/include/svl/zforlist.hxx
index c3d82d7b109a..b929e6255277 100644
--- a/include/svl/zforlist.hxx
+++ b/include/svl/zforlist.hxx
@@ -302,7 +302,7 @@ typedef ::std::set< LanguageType > NfInstalledLocales;
/** Language/country dependent currency entries
*/
-class UNLESS_MERGELIBS(SVL_DLLPUBLIC) NfCurrencyEntry
+class UNLESS_MERGELIBS(SVL_DLLPUBLIC) NfCurrencyEntry final
{
OUString aSymbol; /// currency symbol
OUString aBankSymbol; /// currency abbreviation
@@ -312,9 +312,6 @@ class UNLESS_MERGELIBS(SVL_DLLPUBLIC) NfCurrencyEntry
sal_uInt16 nDigits; /// count of decimal digits
sal_Unicode cZeroChar; /// which character is used for zeros as last decimal digits
- NfCurrencyEntry( const NfCurrencyEntry& ) = delete;
- NfCurrencyEntry& operator=( const NfCurrencyEntry& ) = delete;
-
private:
// nDecimalFormat := 0, 1, 2