summaryrefslogtreecommitdiff
path: root/writerfilter/source/dmapper/TrackChangesHandler.hxx
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2016-04-07 16:47:23 +0200
committerAndras Timar <andras.timar@collabora.com>2016-04-12 14:15:50 +0000
commit52f6fb0f4e91ebcd5115e29d25407eeed82992d5 (patch)
treee1f157c8b49f9fa682d45f03e4fe12c3d50eb136 /writerfilter/source/dmapper/TrackChangesHandler.hxx
parent7f4e1a22ed288ff9b257298f36d471b54a20bd72 (diff)
tdf#99140 DOCX import: fix table at the bottom of the page to span over ...
... multiple pages. In short, one more blacklist entry when conversion should not be performed. Conflicts: sw/qa/extras/ooxmlimport/ooxmlimport.cxx Also (because otherwise the first commit would introduce a regression): tdf#99140 DOCX import: fix table horizontal aligment to be 'from left' ... ... when it was 'manual'. Regression from commit c1e563f6efd09cd3463f1b92a3022ae288c92087 (fdo#76741 [DOCX] Table Alignment and width type, 2014-04-04), DOCX import code had to deal with two kinds of horizontal alignment when it came to floating tables: the alignment of the table itself, and the alignment of the float parameters. The problem is, in general it's wanted that the table is aligned according to the floating parameters, but in Writer the "from left" UI setting is described differently for tables and fly frames: tables use LEFT_AND_WIDTH for that, while fly frames use NONE. Fix the problem by touching the default only in case the floating parameters have something that's different from NONE. With this, the width of tables is no longer lost when they are described to be floating ones in the DOCX markup, but FloatingTableConversion() decides to ignore that. (cherry picked from commits d56deaeb2a1e8007e50fc2334f416fddd4e3cde3, c07f04ab422eadba0f2c3c128a0e3ff78e90cdf2, and fd61dee6457a44687f1142dd55bfee6b64fda2ef) Change-Id: I764f02cc58ae1b7af802b81e570e4feaf73ee2c1 Reviewed-on: https://gerrit.libreoffice.org/23987 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'writerfilter/source/dmapper/TrackChangesHandler.hxx')
0 files changed, 0 insertions, 0 deletions