[Libreoffice-commits] core.git: sw/source

[Mike Kaganski (via logerrit)]

 sw/source/core/ole/ndole.cxx |   16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

New commits:
commit 6d9691892b192f7fcecc0a938e929fc40ec208d8
Author:     Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Wed May 11 14:12:04 2022 +0100
Commit:     Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Wed May 11 16:36:05 2022 +0200

    Inline the typedef
    
    ... and simplify SwOLELRUCache::InsertObj a bit
    
    Change-Id: I7461e800ade0e0c3f2a1cd79715cecd5cfc971bc
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134174
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>

diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx
index 0b77de3e3742..d7dd08bb969a 100644
--- a/sw/source/core/ole/ndole.cxx
+++ b/sw/source/core/ole/ndole.cxx
@@ -69,8 +69,7 @@ class SwOLELRUCache
     : private utl::ConfigItem
 {
 private:
-    typedef std::deque<SwOLEObj *> OleObjects_t;
-    OleObjects_t m_OleObjects;
+    std::deque<SwOLEObj *> m_OleObjects;
     sal_Int32 m_nLRU_InitSize;
     static uno::Sequence< OUString > GetPropertyNames();
 
@@ -1226,16 +1225,14 @@ void SwOLELRUCache::Load()
 void SwOLELRUCache::InsertObj( SwOLEObj& rObj )
 {
     SwOLEObj* pObj = &rObj;
-    OleObjects_t::iterator it =
-        std::find(m_OleObjects.begin(), m_OleObjects.end(), pObj);
-    if (it != m_OleObjects.end() && it != m_OleObjects.begin())
+    if (auto const it = std::find(m_OleObjects.begin(), m_OleObjects.end(), 
pObj);
+        it != m_OleObjects.end())
     {
+        if (it == m_OleObjects.begin())
+            return; // Everything is already in place
         // object in cache but is currently not the first in cache
         m_OleObjects.erase(it);
-        it = m_OleObjects.end();
     }
-    if (it != m_OleObjects.end())
-        return;
 
     std::shared_ptr<SwOLELRUCache> xKeepAlive(g_pOLELRU_Cache); // prevent 
delete this
     // try to remove objects if necessary
@@ -1252,8 +1249,7 @@ void SwOLELRUCache::InsertObj( SwOLEObj& rObj )
 
 void SwOLELRUCache::RemoveObj( SwOLEObj& rObj )
 {
-    OleObjects_t::iterator const it =
-        std::find(m_OleObjects.begin(), m_OleObjects.end(), &rObj);
+    auto const it = std::find(m_OleObjects.begin(), m_OleObjects.end(), &rObj);
     if (it != m_OleObjects.end())
     {
         m_OleObjects.erase(it);