diff options
author | Michael Stahl <Michael.Stahl@cib.de> | 2020-10-01 17:31:21 +0200 |
---|---|---|
committer | Michael Stahl <michael.stahl@cib.de> | 2020-10-05 19:37:50 +0200 |
commit | e366c928819c44b5c253c45dca6dae40b71c9808 (patch) | |
tree | 57ad0dd8bdb3e819fe4d3155a839504c57345ca3 /sw/inc/swtable.hxx | |
parent | 2ad4e77a0f266ae6e6fccaebb1d080d2880bdac3 (diff) |
sw: ODF import: convert the simplest sub-tables to rowspan tables
Before OOo 2.3, CWS swnewtable, Writer represented complex table
structures as sub-tables, i.e. <table:table table:is-sub-table="true">.
Try to convert these to the modern rowspan tables, which export to
non-ODF formats much easier.
There are some cases where the result is going to look different, or
where further work is required to adapt other things in the document;
leave these alone for now.
Change-Id: I6a6c497089ef886826484d2d723bf57c72f95b14
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103773
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
Diffstat (limited to 'sw/inc/swtable.hxx')
-rw-r--r-- | sw/inc/swtable.hxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx index 66a1795ce183..9694db0113ef 100644 --- a/sw/inc/swtable.hxx +++ b/sw/inc/swtable.hxx @@ -168,6 +168,7 @@ private: void AdjustWidths( const long nOld, const long nNew ); void NewSetTabCols( Parm &rP, const SwTabCols &rNew, const SwTabCols &rOld, const SwTableBox *pStart, bool bCurRowOnly ); + void ConvertSubtableBox(sal_uInt16 const nRow, sal_uInt16 const nBox); public: @@ -340,6 +341,9 @@ public: #endif bool HasLayout() const; + + bool CanConvertSubtables() const; + void ConvertSubtables(); }; /// SwTableLine is one table row in the document model. |