diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-12-09 21:32:21 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-12-09 21:32:33 +0000 |
| commit | 66686e443b568ad5aab1b32b3f25eb73487cfef6 (patch) | |
| tree | a652ef355e52db2690aa05d91e74b4d4bf5a921d /lotuswordpro/source/filter/lwpdoc.cxx | |
| parent | a0c4ce340d253d5f197f4e96676225f3f5f216de (diff) | |
guard against infinite recursion on registering styles
Change-Id: Iabedfcce9d8ef21172e6bd0d654f3a258aae97e3
Diffstat (limited to 'lotuswordpro/source/filter/lwpdoc.cxx')
| -rw-r--r-- | lotuswordpro/source/filter/lwpdoc.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lotuswordpro/source/filter/lwpdoc.cxx b/lotuswordpro/source/filter/lwpdoc.cxx index b93f44da0d6d..a343f9ccf1f1 100644 --- a/lotuswordpro/source/filter/lwpdoc.cxx +++ b/lotuswordpro/source/filter/lwpdoc.cxx @@ -224,7 +224,7 @@ void LwpDocument::RegisterStyle() rtl::Reference<LwpObject> pDocSock = GetSocket().obj(); if(pDocSock.is()) { - pDocSock->RegisterStyle(); + pDocSock->DoRegisterStyle(); } } /** @@ -322,7 +322,7 @@ void LwpDocument::RegisterGraphicsStyles() if(pGraphic.is()) { pGraphic->SetFoundry(m_pFoundry); - pGraphic->RegisterStyle(); + pGraphic->DoRegisterStyle(); } } /** @@ -619,7 +619,7 @@ LwpDocument* LwpDocument::GetPreviousDivision() LwpDocument* pDivision = GetFirstDivision(); - while (pDivision) + while (pDivision && pDivision != this) { LwpDocument* pContentDivision = pDivision->GetFirstDivisionWithContentsThatIsNotOLE(); if(pContentDivision) @@ -782,11 +782,11 @@ void LwpDocSock::RegisterStyle() { rtl::Reference<LwpObject> pDoc = GetNext().obj(); if(pDoc.is()) - pDoc->RegisterStyle(); + pDoc->DoRegisterStyle(); pDoc = GetChildHead().obj(); if(pDoc.is()) - pDoc->RegisterStyle(); + pDoc->DoRegisterStyle(); } /** * @descr parse contents of documents plugged |