diff options
| author | Andras Timar <andras.timar@collabora.com> | 2015-04-02 13:42:11 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2015-04-14 15:08:09 +0200 |
| commit | 0f7a9012e175d6b7629ae1d78fb4435192016e47 (patch) | |
| tree | 5abd5a22772fc84ae8389ad0dee8d56f0a568667 /sd | |
| parent | b9dc8c566d0e32048b91d1902b8b36f7f9e4d874 (diff) | |
tdf#90403 PPTX import: use real table size
PowerPoint ignores a:ext cx and cy value of p:xfrm, and uses
real table width and height. PowerPoint 2010 saves files where
cx and cy contains good values, but I found files in the wild
whose cx and cy values did not match to actual table width and
height, and there was a visible difference between rendering
of Impress and PowerPoint.
Reviewed-on: https://gerrit.libreoffice.org/15123
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
(cherry picked from commit 037fe3671cbdad51f52d2f69f72f47f463dba7c2)
Conflicts:
oox/source/drawingml/shape.cxx
sd/qa/unit/import-tests.cxx
Change-Id: I3f80c0cea4cac46763d449f918bb78dca1a6562d
Reviewed-on: https://gerrit.libreoffice.org/15133
Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/qa/unit/data/tdf90403.pptx | bin | 0 -> 39815 bytes | |||
| -rw-r--r-- | sd/qa/unit/data/xml/tdf90403_0.xml | 4 | ||||
| -rw-r--r-- | sd/qa/unit/import-tests.cxx | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/sd/qa/unit/data/tdf90403.pptx b/sd/qa/unit/data/tdf90403.pptx Binary files differnew file mode 100644 index 000000000000..fd48d058a260 --- /dev/null +++ b/sd/qa/unit/data/tdf90403.pptx diff --git a/sd/qa/unit/data/xml/tdf90403_0.xml b/sd/qa/unit/data/xml/tdf90403_0.xml new file mode 100644 index 000000000000..297504d4bed3 --- /dev/null +++ b/sd/qa/unit/data/xml/tdf90403_0.xml @@ -0,0 +1,4 @@ +<?xml version="1.0"?> +<XShapes> + <XShape positionX="4233" positionY="3881" sizeX="16932" sizeY="14044" type="com.sun.star.drawing.TableShape" name="Table 1"/> +</XShapes> diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx index 13b23b706b9d..b52fb0cb334f 100644 --- a/sd/qa/unit/import-tests.cxx +++ b/sd/qa/unit/import-tests.cxx @@ -194,6 +194,7 @@ void SdFiltersTest::testDocumentLayout() { "n593612.pptx", "xml/n593612_", -1 }, { "fdo71434.pptx", "xml/fdo71434_", -1 }, { "n902652.pptx", "xml/n902652_", -1 }, + { "tdf90403.pptx", "xml/tdf90403_", -1 }, // { "pptx/n828390.pptx", "pptx/xml/n828390_", PPTX }, // Example }; |