diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2017-11-05 08:39:47 +0100 |
|---|---|---|
| committer | Julien Nabet <serval2412@yahoo.fr> | 2017-11-05 11:40:33 +0100 |
| commit | e567694246d99a2a99c4079b04ed2ad8cd5ed785 (patch) | |
| tree | 006797c2b3e74e1a3e37c4739b0b5e513041dd2f /svx | |
| parent | ca2aaa2b9f4ce69d05d415e13451ae6a6030f032 (diff) | |
Remove GetNextSubset and create GetSubsetMap
To avoid to store an iterator and simplify loops
Change-Id: I9b160714125176841961a56905d81dcb876c68b6
Reviewed-on: https://gerrit.libreoffice.org/44326
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/dialog/charmap.cxx | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx index b529e3a9ebfa..510ca605711a 100644 --- a/svx/source/dialog/charmap.cxx +++ b/svx/source/dialog/charmap.cxx @@ -960,18 +960,9 @@ SubsetMap::SubsetMap( const FontCharMapRef& rxFontCharMap ) ApplyCharMap(rxFontCharMap); } -const Subset* SubsetMap::GetNextSubset( bool bFirst ) const +const SubsetList& SubsetMap::GetSubsetMap() const { - if( bFirst ) - { - maSubsetIterator = maSubsets.begin(); - } - - if( maSubsetIterator == maSubsets.end() ) - return nullptr; - - const Subset* s = &*(maSubsetIterator++); - return s; + return maSubsets; } const Subset* SubsetMap::GetSubsetByUnicode( sal_UCS4 cChar ) const |