diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-05-03 09:35:58 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-05-05 14:34:33 +0000 |
| commit | c521fcae80f5a7a5d56105e316b2e3d9130001d9 (patch) | |
| tree | b1597d6ba14338ab3105d494528f70236c8a1470 /sw/qa/extras/rtfimport/rtfimport.cxx | |
| parent | 7c4fe800c2b4f5150ff7193a45710304bcdf25f0 (diff) | |
tdf#95707 RTF import: handle device-independent bitmaps
See
<https://msdn.microsoft.com/en-us/library/dd183374%28v=vs.85%29.aspx>
for more info about the header structure that has to be prepended to the
real data to make our BMP import filter happy.
Also: disable a unit test on OS X, that previously passed, but turns out
to be unstable on libreoffice-5-1.
(cherry picked from commit 6bacfc8d95163a3eacc2784660282a8ce7d9a552)
Conflicts:
writerfilter/source/rtftok/rtfdocumentimpl.cxx
Change-Id: Iabdf4cd169b82ea951d1c1b12432d97d61b7af51
Reviewed-on: https://gerrit.libreoffice.org/24656
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/qa/extras/rtfimport/rtfimport.cxx')
| -rw-r--r-- | sw/qa/extras/rtfimport/rtfimport.cxx | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx index 185fba4eef2a..dfbc21d52b0d 100644 --- a/sw/qa/extras/rtfimport/rtfimport.cxx +++ b/sw/qa/extras/rtfimport/rtfimport.cxx @@ -2534,7 +2534,7 @@ DECLARE_RTFIMPORT_TEST(testTdf97035, "tdf97035.rtf") CPPUNIT_ASSERT_EQUAL(sal_Int16(2299), getProperty< uno::Sequence<text::TableColumnSeparator> >(xTableRows->getByIndex(1), "TableColumnSeparators")[0].Position); } -#ifndef WNT +#if !defined(WNT) && !defined(MACOSX) DECLARE_RTFIMPORT_TEST(testTdf90097, "tdf90097.rtf") { // Get the second child of the group shape. @@ -2553,6 +2553,12 @@ DECLARE_RTFIMPORT_TEST(testTdf90097, "tdf90097.rtf") } #endif +DECLARE_RTFIMPORT_TEST(testTdf95707, "tdf95707.rtf") +{ + // Graphic was replaced with a "Read-Error" placeholder. + CPPUNIT_ASSERT(getProperty<OUString>(getShape(1), "GraphicURL") != "vnd.sun.star.GraphicObject:0000000000000000000000000000000000000000"); +} + CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |