diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2020-10-27 20:57:04 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-10-28 07:57:50 +0100 |
| commit | 371b84dcb653f241d40265fba9f0d00f7c7e8150 (patch) | |
| tree | 082d13c14548f069d5b28994478916e897949770 /include/tools | |
| parent | 1977138acba04a7b91d73a3041606b2387e72e70 (diff) | |
std::set->o3tl::sorted_vector in MultiSelection
Change-Id: I88a77f4b07e5aaccc42e6fb6e5bd0366f57381a8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104899
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/tools')
| -rw-r--r-- | include/tools/multisel.hxx | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/include/tools/multisel.hxx b/include/tools/multisel.hxx index 3e06a3dce239..176bd9984b53 100644 --- a/include/tools/multisel.hxx +++ b/include/tools/multisel.hxx @@ -25,6 +25,7 @@ #include <vector> #include <set> +#include <o3tl/sorted_vector.hxx> #define SFX_ENDOFSELECTION (-1) @@ -92,18 +93,18 @@ class SAL_WARN_UNUSED TOOLS_DLLPUBLIC StringRangeEnumerator bool setRange( const OUString& i_rNewRange ); bool insertRange( sal_Int32 nFirst, sal_Int32 nLast, bool bSequence ); void insertJoinedRanges( const std::vector< sal_Int32 >& rNumbers ); - bool checkValue( sal_Int32, const std::set< sal_Int32 >* i_pPossibleValues = nullptr ) const; + bool checkValue( sal_Int32, const o3tl::sorted_vector< sal_Int32 >* i_pPossibleValues = nullptr ) const; public: class TOOLS_DLLPUBLIC Iterator { const StringRangeEnumerator* pEnumerator; - const std::set< sal_Int32 >* pPossibleValues; + const o3tl::sorted_vector< sal_Int32 >* pPossibleValues; sal_Int32 nRangeIndex; sal_Int32 nCurrent; friend class StringRangeEnumerator; Iterator( const StringRangeEnumerator* i_pEnum, - const std::set< sal_Int32 >* i_pPossibleValues, + const o3tl::sorted_vector< sal_Int32 >* i_pPossibleValues, sal_Int32 i_nRange, sal_Int32 i_nCurrent ) : pEnumerator( i_pEnum ), pPossibleValues( i_pPossibleValues ) @@ -126,10 +127,10 @@ public: ); sal_Int32 size() const { return mnCount; } - Iterator begin( const std::set< sal_Int32 >* i_pPossibleValues = nullptr ) const; - Iterator end( const std::set< sal_Int32 >* i_pPossibleValues = nullptr ) const; + Iterator begin( const o3tl::sorted_vector< sal_Int32 >* i_pPossibleValues = nullptr ) const; + Iterator end( const o3tl::sorted_vector< sal_Int32 >* i_pPossibleValues = nullptr ) const; - bool hasValue( sal_Int32 nValue, const std::set< sal_Int32 >* i_pPossibleValues = nullptr ) const; + bool hasValue( sal_Int32 nValue, const o3tl::sorted_vector< sal_Int32 >* i_pPossibleValues = nullptr ) const; /** i_rPageRange: the string to be changed into a sequence of numbers @@ -160,7 +161,7 @@ public: sal_Int32 i_nMinNumber, sal_Int32 i_nMaxNumber, sal_Int32 i_nLogicalOffset = -1, - std::set< sal_Int32 > const * i_pPossibleValues = nullptr + o3tl::sorted_vector< sal_Int32 > const * i_pPossibleValues = nullptr ); }; |