diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-03-14 12:11:13 +0100 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2014-03-17 13:55:54 +0000 |
commit | e6006b5c91c8f6852a1b8b1b7ed1c5e7b4975a68 (patch) | |
tree | 108ece8d7055c6d66a98a26f46d142335807f037 /svx | |
parent | b85f07986dc005ea0a74baa3d14ee0fd1ec99609 (diff) |
RTF import: 3 drawing-object fixes:
This bring back the fdo#fdo42407 bugdoc to the state where it was around
4.0.
- fix dobxpage before dptxbx
The problem was that dobxpage arrived first, set HoriOrientRelation to
FRAME, then dptxbx tried to apply defaults, which overwrote the already
set HoriOrientRelation. Fix this by only applying properties which are
not set yet.
(cherry picked from commit 7c53577f325e5260c538f9ca42cda54ca1a24b7a)
- anchor drawing objects at-character by default
(cherry picked from commit d05b67a7b9448c67c3a923ecb33dac74b52dd192)
- fix ordering of old-style dhght in case of equal values
Commit 1eaab77c718ffa254068ae6032862dfb5a03db67 (fdo#60722 import
RTF_SHPZ, 2013-03-06) changed how we handle z-order, in case two shapes
have the same value. Turns out for drawing-objects the order is the
opposite in this situation.
So fix this by adding a new mode, that keeps the original testcase happy
without breaking older documents.
(cherry picked from commit e4fe3610eb17c441217c80536f0acf4123abd683)
Change-Id: Ib2d284cefc3c0dce40ac2e516ba260d6cd04ce43
Reviewed-on: https://gerrit.libreoffice.org/8621
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'svx')
0 files changed, 0 insertions, 0 deletions