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

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Wed Dec 12 08:50:53 UTC 2018


 sw/source/ui/config/optload.cxx  |    3 ---
 sw/source/uibase/inc/optload.hxx |    1 -
 2 files changed, 4 deletions(-)

New commits:
commit 7fd8c82af1ce2a61ccb5c61c7596bf2a42b9f111
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Dec 11 17:19:02 2018 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Dec 12 09:50:25 2018 +0100

    m_DelEntryList is unused
    
    since...
    
    commit 08da15cabdcef60191f4ed98ed694eba3e35b5e1
    Author: Jakub Trzebiatowski <ubap.dev at gmail.com>
    Date:   Fri Mar 11 20:58:34 2016 +0100
    
        tdf#90855 Improve the 'Insert Bookmark' dialog
    
    Change-Id: Iabe462ddcfc2ea1a0eaeafe0d126f87158db97fd
    Reviewed-on: https://gerrit.libreoffice.org/64987
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx
index 43ab57535bec..4b763ec85ee7 100644
--- a/sw/source/ui/config/optload.cxx
+++ b/sw/source/ui/config/optload.cxx
@@ -982,9 +982,6 @@ void CaptionComboBox::RemoveEntryAt(sal_Int32 const nPos)
     // Remove old element
     ComboBox::RemoveEntryAt(nPos);
 
-    // Don't add new entries to the list
-    // add to DelEntryList
-    m_DelEntryList.push_back(m_EntryList[nPos]);
     m_EntryList.erase(m_EntryList.begin() + nPos);
 }
 
diff --git a/sw/source/uibase/inc/optload.hxx b/sw/source/uibase/inc/optload.hxx
index 881c3a61d135..cf7b270d3a24 100644
--- a/sw/source/uibase/inc/optload.hxx
+++ b/sw/source/uibase/inc/optload.hxx
@@ -102,7 +102,6 @@ public:
 class CaptionComboBox : public ComboBox
 {
     std::vector<OUString> m_EntryList;
-    std::vector<OUString> m_DelEntryList;
     OUString const        aDefault;
 
     void InsertSorted(OUString const& rEntry);


More information about the Libreoffice-commits mailing list