[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - sw/source

[Caolán McNamara]

 sw/source/ui/index/swuiidxmrk.cxx |   25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

New commits:
commit c4c6ad9cacc09c40fb47ebd98450d3aad91bfb41
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Jul 27 09:10:29 2016 +0100

    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 at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx
index 2419980..66f152d 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();