summaryrefslogtreecommitdiff
path: root/sw/source
diff options
context:
space:
mode:
authorJustin Luth <justin.luth@collabora.com>2020-03-26 09:33:08 +0300
committerJustin Luth <justin_luth@sil.org>2020-03-28 08:50:08 +0100
commit35b3a3eb001ec8ff8c808ad6d990a583163ad365 (patch)
tree87a63ad86687ceeec7f596c104145fe72315877a /sw/source
parent70adbc53e88e5b99032d63065410716c54b4f96f (diff)
tdf#80635 ww8import:1 take float table CENTER to inlined table
Since SW has problems with floating tables, any unnecessarily floated tables are converted to inline. However, the positioning of the tables is mostly lost. So the choice is either to refuse to inline a strangely positioned table or else to transfer the positioning onto the inlined table. Transferring is easier said than done. But for centered tables, it is easy to copy that. Change-Id: I8a6deaa63c45277c30ffa12613c8ed125a45d607 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91188 Tested-by: Jenkins Reviewed-by: Justin Luth <justin_luth@sil.org>
Diffstat (limited to 'sw/source')
-rw-r--r--sw/source/filter/ww8/ww8par2.cxx9
1 files changed, 9 insertions, 0 deletions
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 6f417543014d..3b1615793482 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -2423,6 +2423,15 @@ void WW8TabDesc::CreateSwTable()
m_xTmpPos.reset(new SwPosition(*m_pIo->m_pPaM->GetPoint()));
+ // Because SW cannot handle multi-page floating frames,
+ // _any unnecessary_ floating tables have been converted to inline.
+ if ( m_pIo->m_xSFlyPara && !m_pIo->m_xSFlyPara->pFlyFormat )
+ {
+ // Get the table orientation from the fly
+ if ( m_pIo->m_xSFlyPara->eHAlign == text::HoriOrientation::CENTER )
+ m_eOri = m_pIo->m_xSFlyPara->eHAlign;
+ }
+
// The table is small: The number of columns is the lowest count of
// columns of the origin, because inserting is faster than deleting.
// The number of rows is the count of bands because (identically)