diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-03-21 17:15:06 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-03-21 17:27:57 +0100 |
| commit | ea92fb2b82a050c24a72c55a484163b07263ab4c (patch) | |
| tree | 61f497b29018ebeebe945ba20ef7e3f72c7ed43e | |
| parent | fb03509d32f79a668622961c7d8d5347f1c4bb0f (diff) | |
fdo#45522: WW8TableInfo::processSwTable: check that table has layout
(cherry picked from commit 5c3dd5af41bc801ee6023513399c01c632dc7779)
Signed-off-by: Michael Stahl <mstahl@redhat.com>
| -rw-r--r-- | sw/inc/swtable.hxx | 2 | ||||
| -rw-r--r-- | sw/source/core/table/swtable.cxx | 7 | ||||
| -rw-r--r-- | sw/source/filter/ww8/WW8TableInfo.cxx | 3 |
3 files changed, 10 insertions, 2 deletions
diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx index fb1d253b3879..73df08c088ea 100644 --- a/sw/inc/swtable.hxx +++ b/sw/inc/swtable.hxx @@ -326,6 +326,8 @@ public: #ifdef DBG_UTIL void CheckConsistency() const; #endif + + bool HasLayout() const; }; class SW_DLLPUBLIC SwTableLine: public SwClient // Client of FrmFmt. diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx index ae36c31f809d..d9612892e23f 100644 --- a/sw/source/core/table/swtable.cxx +++ b/sw/source/core/table/swtable.cxx @@ -2804,6 +2804,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 ); diff --git a/sw/source/filter/ww8/WW8TableInfo.cxx b/sw/source/filter/ww8/WW8TableInfo.cxx index 6171430d5355..095c94b89f31 100644 --- a/sw/source/filter/ww8/WW8TableInfo.cxx +++ b/sw/source/filter/ww8/WW8TableInfo.cxx @@ -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); |