ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

ofz#523387973 Timeout

Browse Source 
Change-Id: Iccc25a6fb069324c271ea0260ca544a6ce84d8b2
Reviewed-on: https://gerrit.collaboraoffice.com/c/core/+/7271
Tested-by: Jenkins CPCI <releng@collaboraoffice.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
(cherry picked from commit 9d51fc581e96737e2460d663e459439c0dd4f396)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/211406
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
This commit is contained in:
Caolán McNamara
2026-09-24 11:29:27 +02:00
committed by Xisco Fauli
parent d3fca73f81
commit 46c767daec
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lotuswordpro/inc/lwpobjid.hxx
+4
View File
@@ -100,6 +100,10 @@ public:
sal_uInt32 GetLow() const ; sal_uInt32 GetLow() const ;
sal_uInt16 GetHigh() const ; sal_uInt16 GetHigh() const ;
sal_uInt64 GetIdentity() const
{
return (static_cast<sal_uInt64>(m_nHigh) << 32) | m_nLow;
}
bool operator == (const LwpObjectID &Other) const; bool operator == (const LwpObjectID &Other) const;
bool operator != (const LwpObjectID &Other) const; bool operator != (const LwpObjectID &Other) const;
lotuswordpro/source/filter/lwpstory.cxx
+3
View File
@@ -127,8 +127,11 @@ void LwpStory::XFConvert(XFContentContainer* pCont)
//Release Lwp Objects //Release Lwp Objects
rtl::Reference<LwpPara> xCur(dynamic_cast<LwpPara*>(GetFirstPara().obj().get())); rtl::Reference<LwpPara> xCur(dynamic_cast<LwpPara*>(GetFirstPara().obj().get()));
rtl::Reference<LwpPara> xNext; rtl::Reference<LwpPara> xNext;
o3tl::sorted_vector<sal_uInt64> aReleased;
while (xCur.is()) while (xCur.is())
{ {
if (!aReleased.insert(xCur->GetObjectID().GetIdentity()).second)
break;
xNext.set(dynamic_cast<LwpPara*>(xCur->GetNext().obj().get())); xNext.set(dynamic_cast<LwpPara*>(xCur->GetNext().obj().get()));
LwpGlobalMgr* pGlobal = LwpGlobalMgr::GetInstance(); LwpGlobalMgr* pGlobal = LwpGlobalMgr::GetInstance();
LwpObjectFactory* pObjMgr = pGlobal->GetLwpObjFactory(); LwpObjectFactory* pObjMgr = pGlobal->GetLwpObjFactory();