diff options
author | Caolán McNamara <caolanm@redhat.com> | 2016-07-27 09:10:29 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-08-03 09:34:46 +0000 |
commit | c4c6ad9cacc09c40fb47ebd98450d3aad91bfb41 (patch) | |
tree | 95daa4222c9058ced0e4e4079a21d64268396e3f | |
parent | ce9bd25b4695ef28910300a48cf75c7546602e59 (diff) |
Resolves: tdf#57978 don't show duplicate index keys in dropdown list
Change-Id: I25e25157063ea4424f770b397d879cb7bfd46bcb
(cherry picked from commit c755336853f20c7b2dd14e9c56eeb441d831be2c)
Reviewed-on: https://gerrit.libreoffice.org/27576
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
-rw-r--r-- | sw/source/ui/index/swuiidxmrk.cxx | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx index 2419980d65ad..66f152d3dd45 100644 --- a/sw/source/ui/index/swuiidxmrk.cxx +++ b/sw/source/ui/index/swuiidxmrk.cxx @@ -193,17 +193,24 @@ void SwIndexMarkPane::InitControls() m_pTypeDCB->InsertEntry( pSh->GetTOXType(TOX_USER, i)->GetTypeName() ); // read keywords primary - std::vector<OUString> aArr; - pSh->GetTOIKeys( TOI_PRIMARY, aArr ); - std::sort(aArr.begin(), aArr.end()); - for (std::vector<OUString>::iterator it = aArr.begin(); it != aArr.end(); ++it) - m_pKey1DCB->InsertEntry( *it ); + { + std::vector<OUString> aArr; + pSh->GetTOIKeys(TOI_PRIMARY, aArr); + std::sort(aArr.begin(), aArr.end()); + auto last = std::unique(aArr.begin(), aArr.end()); + for (auto it = aArr.begin(); it != last; ++it) + m_pKey1DCB->InsertEntry(*it); + } // read keywords secondary - pSh->GetTOIKeys( TOI_SECONDARY, aArr ); - std::sort(aArr.begin(), aArr.end()); - for (std::vector<OUString>::iterator it = aArr.begin(); it != aArr.end(); ++it) - m_pKey2DCB->InsertEntry( *it ); + { + std::vector<OUString> aArr; + pSh->GetTOIKeys( TOI_SECONDARY, aArr ); + std::sort(aArr.begin(), aArr.end()); + auto last = std::unique(aArr.begin(), aArr.end()); + for (auto it = aArr.begin(); it != last; ++it) + m_pKey2DCB->InsertEntry(*it); + } UpdateLanguageDependenciesForPhoneticReading(); |