diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2019-10-02 23:07:56 +0200 |
|---|---|---|
| committer | Julien Nabet <serval2412@yahoo.fr> | 2019-10-03 10:06:28 +0200 |
| commit | 72d22380f9356b196e51299bf608c192b6fd6cf7 (patch) | |
| tree | e092f32446fd236414c4d0292eb3a4e8f20f2677 /svl | |
| parent | 86e4d68e62c6291ef386b5fcf0f8912989f8e661 (diff) | |
Simplify a bit SfxAllEnumItem (svl)
Make private GetValueByPos which is only used in svl/source/items/aeitem.cxx
Remove "RemoveValue" method which is only used in InsertValue( sal_uInt16 nValue, const OUString &rValue )
It allows to call once "GetPosByValue" and the assert is useless since we're in the case:
"else if ( nPos != USHRT_MAX )"
I think we can more optimize by replacing vector by another container for pValues (type "SfxAllEnumValueArr").
Indeed, we insert and remove a lot in pValues in a specific position. Vector is not the best container for this
There's also still the part "//FIXME: Optimisation: use binary search or SortArray" in GetPosByValue_ method
Change-Id: I0cafea70e9d0361ef9a7b345ff770a9b888ef85b
Reviewed-on: https://gerrit.libreoffice.org/80089
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Diffstat (limited to 'svl')
| -rw-r--r-- | svl/source/items/aeitem.cxx | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/svl/source/items/aeitem.cxx b/svl/source/items/aeitem.cxx index 03431b91594a..cafa6fe3a3b7 100644 --- a/svl/source/items/aeitem.cxx +++ b/svl/source/items/aeitem.cxx @@ -108,11 +108,14 @@ void SfxAllEnumItem::InsertValue( sal_uInt16 nValue, const OUString &rValue ) SfxAllEnumValue_Impl aVal; aVal.nValue = nValue; aVal.aText = rValue; + sal_uInt16 nPos = GetPosByValue(nValue); if ( !pValues ) pValues.reset( new SfxAllEnumValueArr ); - else if ( GetPosByValue( nValue ) != USHRT_MAX ) + else if ( nPos != USHRT_MAX ) + { // remove when exists - RemoveValue( nValue ); + pValues->erase( pValues->begin() + nPos ); + } // then insert pValues->insert(pValues->begin() + GetPosByValue_(nValue), aVal); // FIXME: Duplicates? } @@ -128,11 +131,4 @@ void SfxAllEnumItem::InsertValue( sal_uInt16 nValue ) pValues->insert(pValues->begin() + GetPosByValue_(nValue), aVal); // FIXME: Duplicates? } -void SfxAllEnumItem::RemoveValue( sal_uInt16 nValue ) -{ - sal_uInt16 nPos = GetPosByValue(nValue); - assert(nPos != USHRT_MAX); - pValues->erase( pValues->begin() + nPos ); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |