strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ofz#24404 row insert attempt in table with same table already in the row

Browse source 
Change-Id: I0f52de029600b182e479af3bdf56da7ea2c2ef01
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99691
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Caolán McNamara 2020-07-29 13:51:14 +01:00
parent b18a2228ad
commit b1dc1c740e
3 changed files with 21 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lotuswordpro/inc/xfilter/xfcontentcontainer.hxx
View file

@ -125,6 +125,8 @@ public:
*/
virtual void ToXml(IXFStream *pStrm) override;
bool HierarchyContains(const XFContent *pContent) const;
private:
std::vector< rtl::Reference<XFContent> > m_aContents;
};

18
lotuswordpro/source/filter/xfilter/xfcontentcontainer.cxx
View file

@ -80,6 +80,24 @@ void XFContentContainer::Add(const OUString& text)
Add(xTC.get());
}
bool XFContentContainer::HierarchyContains(const XFContent *pContent) const
{
if (pContent == this)
return true;
for (int i = 0, nCount = GetCount(); i < nCount; i++)
{
rtl::Reference<XFContent> xContent = GetContent(i);
if (xContent.get() == pContent)
return true;
const XFContentContainer *pChildCont = dynamic_cast<const XFContentContainer*>(xContent.get());
if (pChildCont && pChildCont->HierarchyContains(pContent))
return true;
}
return false;
}
int XFContentContainer::GetCount() const
{
return m_aContents.size();

2
lotuswordpro/source/filter/xfilter/xftable.cxx
View file

@ -88,7 +88,7 @@ void XFTable::AddRow(rtl::Reference<XFRow> const & rRow)
for (sal_Int32 i = 0; i < rRow->GetCellCount(); ++i)
{
XFCell* pFirstCell = rRow->GetCell(i + 1); //starts at 1, not 0
if (pFirstCell->GetSubTable() == this)
if (pFirstCell->GetSubTable() == this || pFirstCell->HierarchyContains(this))
throw std::runtime_error("table is a subtable of itself");
}