summaryrefslogtreecommitdiff
path: root/include/svl
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2017-12-14 15:05:36 +0100
committerEike Rathke <erack@redhat.com>2017-12-14 19:53:40 +0100
commit0c13d0fb5774327a5d99fc068803a37f7072b3cf (patch)
tree150ab0408b87135d95d5b9ad70e090ed3d3d3640 /include/svl
parent700e1e7fda6f0a415adbbd5bb190efa5c7435c4f (diff)
Also EnglishKeywords is a NfKeywordTable, not just some vector
Change-Id: I0683fe5f7632e9941f347773c2679af82421bdc4 Reviewed-on: https://gerrit.libreoffice.org/46455 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'include/svl')
-rw-r--r--include/svl/nfkeytab.hxx6
-rw-r--r--include/svl/zforlist.hxx2
2 files changed, 7 insertions, 1 deletions
diff --git a/include/svl/nfkeytab.hxx b/include/svl/nfkeytab.hxx
index 7872cc4fb512..458e400ea6ab 100644
--- a/include/svl/nfkeytab.hxx
+++ b/include/svl/nfkeytab.hxx
@@ -111,9 +111,15 @@ class NfKeywordTable final
public:
NfKeywordTable() : m_keywords(NF_KEYWORD_ENTRIES_COUNT) {};
+ NfKeywordTable( const std::initializer_list<OUString> & l ) : m_keywords(l)
+ {
+ assert(m_keywords.size() == NF_KEYWORD_ENTRIES_COUNT);
+ }
OUString & operator[] (Keywords_t::size_type n) { return m_keywords[n]; }
const OUString & operator[] (Keywords_t::size_type n) const { return m_keywords[n]; }
+
+ Keywords_t::size_type size() const { return m_keywords.size(); }
};
#endif // INCLUDED_SVL_NFKEYTAB_HXX
diff --git a/include/svl/zforlist.hxx b/include/svl/zforlist.hxx
index 4f27621c9b0f..a2ff78f90a34 100644
--- a/include/svl/zforlist.hxx
+++ b/include/svl/zforlist.hxx
@@ -822,7 +822,7 @@ public:
const NfKeywordTable & GetKeywords( sal_uInt32 nKey );
/** Access for unit tests. */
- const std::vector<OUString> & GetEnglishKeywords() const;
+ const NfKeywordTable & GetEnglishKeywords() const;
/** Access for unit tests. */
const std::vector<Color> & GetStandardColors() const;