diff options
| author | Adam Co <rattles2013@gmail.com> | 2013-10-17 11:48:31 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2013-11-05 16:22:49 +0100 |
| commit | 57c54792781cc9befe3a65a97b37fa85f89da0ae (patch) | |
| tree | 729e09641bb3ddccb620dd5443d5cfc707d6d897 /sw/source/filter/ww8/WW8TableInfo.hxx | |
| parent | f689578dc4f3a77f6a3e72bbf32adf88a2c55526 (diff) | |
fdo#69644 - fix docx export of wrong number and width of columns
When the DOCX exporter exported a table, it filled the table
column definitions with the column sizes of the FIRST row only.
This was ok for tables that have the same columns on all rows,
but for more complex tables with different cell widths - the
filter exported the wrong number of columns and the wrong width.
A followup fix would fix the rounding problems there still are
with the column widths that are exported in the table
definition.
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Change-Id: Ie95dfe60b1c1811776433e457ca04e728623e01e
Reviewed-on: https://gerrit.libreoffice.org/6290
Diffstat (limited to 'sw/source/filter/ww8/WW8TableInfo.hxx')
| -rw-r--r-- | sw/source/filter/ww8/WW8TableInfo.hxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sw/source/filter/ww8/WW8TableInfo.hxx b/sw/source/filter/ww8/WW8TableInfo.hxx index 92fe35d47bb0..894a29bee866 100644 --- a/sw/source/filter/ww8/WW8TableInfo.hxx +++ b/sw/source/filter/ww8/WW8TableInfo.hxx @@ -104,7 +104,8 @@ public: TableBoxVectorPtr getTableBoxesOfRow(); WidthsPtr getWidthsOfRow(); - GridColsPtr getGridColsOfRow(AttributeOutputBase & rBase); + WidthsPtr getColumnWidthsBasedOnAllRows(); + GridColsPtr getGridColsOfRow(AttributeOutputBase & rBase, bool calculateColumnsFromAllRows = false); RowSpansPtr getRowSpansOfRow(); #ifdef DBG_UTIL |