Kaydet (Commit) 5c3dd5af authored tarafından Caolán McNamara's avatar Caolán McNamara Kaydeden (comit) Michael Stahl

fdo#45522: WW8TableInfo::processSwTable: check that table has layout

üst dfa1983b
......@@ -326,6 +326,8 @@ public:
#ifdef DBG_UTIL
void CheckConsistency() const;
#endif
bool HasLayout() const;
};
class SW_DLLPUBLIC SwTableLine: public SwClient // Client of FrmFmt.
......
......@@ -2800,6 +2800,13 @@ void SwTable::RegisterToFormat( SwFmt& rFmt )
rFmt.Add( this );
}
bool SwTable::HasLayout() const
{
const SwFrmFmt* pFrmFmt = GetFrmFmt();
//a table in a clipboard document doesn't have any layout information
return pFrmFmt && SwIterator<SwTabFrm,SwFmt>::FirstElement(*pFrmFmt);
}
void SwTableLine::RegisterToFormat( SwFmt& rFmt )
{
rFmt.Add( this );
......
......@@ -631,8 +631,7 @@ void WW8TableInfo::processSwTable(const SwTable * pTable)
WW8TableNodeInfo * pPrev = NULL;
SwFrmFmt * pFrmFmt = pTable->GetFrmFmt();
if (pFrmFmt != NULL && pTable->IsTblComplex())
if (pTable->IsTblComplex() && pTable->HasLayout())
{
pPrev = processSwTableByLayout(pTable);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment