clear objects from duplicate ids early

Change-Id: I0caab9e329a465e10bf3ed321c55c287371bd437 (cherry picked from commit 480fb6ca)

clear objects from duplicate ids early
Change-Id: I0caab9e329a465e10bf3ed321c55c287371bd437 (cherry picked from commit 480fb6ca)
08fbd423 · Caolán McNamara · 7b6769e6 · 08fbd423
Kaydet (Commit) 08fbd423 authored Ara 14, 2015 tarafından Caolán McNamara
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 2 deletions

lwpobjfactory.cxx lotuswordpro/source/filter/lwpobjfactory.cxx +7 -2

No files found.
--- a/lotuswordpro/source/filter/lwpobjfactory.cxx
+++ b/lotuswordpro/source/filter/lwpobjfactory.cxx
@@ -665,10 +665,15 @@ rtl::Reference<LwpObject> LwpObjectFactory::CreateObject(sal_uInt32 type, LwpObj
            break;
        }
    }
-    if(newObj.is())
+    if (newObj.is())
    {
        newObj->QuickRead();
-        m_IdToObjList.insert(LwpIdToObjMap::value_type(objHdr.GetID(), newObj));
+        auto result = m_IdToObjList.insert(LwpIdToObjMap::value_type(objHdr.GetID(), newObj));
+        if (!result.second)
+        {
+            SAL_WARN("lwp", "clearing duplicate object");
+            newObj.clear();
+        }
    }

    return newObj;