diff options
| author | Szymon Kłos <szymon.klos@collabora.com> | 2017-07-12 15:49:16 +0200 |
|---|---|---|
| committer | Szymon Kłos <szymon.klos@collabora.com> | 2017-07-13 11:36:51 +0200 |
| commit | f8fdf861839d6a39f6d15f56a93108328ab8818c (patch) | |
| tree | c736afd6a1d4aa3d3a4ef1160ef654ebf0acc467 /sw | |
| parent | 367a34cb5fe580e3544a09f74142a6cf2d4c4905 (diff) | |
Make tdf108545_embeddedDocxIcon test universal
Change-Id: Ie0d0520bb725c082710c08aa30ecfe18d0c6cc6b
Reviewed-on: https://gerrit.libreoffice.org/39864
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index 1c41a5fe2813..7cbeb5cf3e68 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -26,6 +26,7 @@ #include <com/sun/star/drawing/PointSequenceSequence.hpp> #include <com/sun/star/drawing/GraphicExportFilter.hpp> #include <com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.hpp> +#include <com/sun/star/embed/Aspects.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/style/BreakType.hpp> #include <com/sun/star/style/XStyleFamiliesSupplier.hpp> @@ -1382,17 +1383,11 @@ DECLARE_OOXMLIMPORT_TEST(testTdf108995, "xml_space.docx") paragraph->getString()); } -#if defined(_WIN32) DECLARE_OOXMLIMPORT_TEST(testTdf108545_embeddedDocxIcon, "tdf108545_embeddedDocxIcon.docx") { - // Check if document shows an icon for embedded docx document - // Due to different fonts used for icon labels on each OS, current checksum is for Windows only uno::Reference<document::XEmbeddedObjectSupplier2> xSupplier(getShape(1), uno::UNO_QUERY); - uno::Reference<graphic::XGraphic> xGraphic = xSupplier->getReplacementGraphic(); - Graphic aGraphic(xGraphic); - CPPUNIT_ASSERT_EQUAL(BitmapChecksum(SAL_CONST_UINT64(733876873106730813)), aGraphic.GetChecksum()); + CPPUNIT_ASSERT_EQUAL(embed::Aspects::MSOLE_ICON, xSupplier->getAspect()); } -#endif DECLARE_OOXMLIMPORT_TEST(testTdf109053, "tdf109053.docx") |