diff options
author | Caolán McNamara <caolanm@redhat.com> | 2017-12-18 10:03:48 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2017-12-19 10:02:00 +0100 |
commit | 386a73e0b76032b4992829bfdf9965854351b230 (patch) | |
tree | 615e5aa9ec83e3c8f99299d39c2aee32a5c81c6a /svx/source | |
parent | 5f103b6f03bf9de16c0cc8d33a9a7082f05563f3 (diff) |
remove a CONTAINER_APPEND use
Change-Id: I266a1741581a06a995c8cb012dcb18a32a38026d
Reviewed-on: https://gerrit.libreoffice.org/46699
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'svx/source')
-rw-r--r-- | svx/source/form/filtnav.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index 8a280a0a4a1a..37a91bf0d4e3 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -198,14 +198,14 @@ public: class FmFilterInsertedHint : public FmFilterHint { - sal_uLong m_nPos; // Position relative to the parent of the data + size_t m_nPos; // Position relative to the parent of the data public: - FmFilterInsertedHint(FmFilterData* pData, sal_uLong nRelPos) + FmFilterInsertedHint(FmFilterData* pData, size_t nRelPos) :FmFilterHint(pData) ,m_nPos(nRelPos){} - sal_uLong GetPos() const { return m_nPos; } + size_t GetPos() const { return m_nPos; } }; class FmFilterRemovedHint : public FmFilterHint @@ -710,18 +710,18 @@ void FmFilterModel::AppendFilterItems( FmFormItem& _rFormItem ) } } - void FmFilterModel::Insert(const ::std::vector<FmFilterData*>::iterator& rPos, FmFilterData* pData) { + size_t nPos; ::std::vector<FmFilterData*>& rItems = pData->GetParent()->GetChildren(); - sal_uLong nPos = rPos == rItems.end() ? CONTAINER_APPEND : rPos - rItems.begin(); - if (nPos == CONTAINER_APPEND) + if (rPos == rItems.end()) { + nPos = rItems.size(); rItems.push_back(pData); - nPos = rItems.size() - 1; } else { + nPos = rPos - rItems.begin(); rItems.insert(rPos, pData); } |