[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - sw/qa

[Szymon Kłos]

 sw/qa/extras/ooxmlimport/ooxmlimport.cxx |   10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

New commits:
commit 5ed609cb22ceef103ee6a0961914f9bcefd4ca3e
Author: Szymon Kłos <szymon.klos at collabora.com>
Date:   Wed Jul 12 15:49:16 2017 +0200

    Make tdf108545_embeddedDocxIcon test universal
    
    Change-Id: Ie0d0520bb725c082710c08aa30ecfe18d0c6cc6b
    Reviewed-on: https://gerrit.libreoffice.org/39891
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 0f7c5d0101d6..bdeae3b3aaac 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -24,6 +24,8 @@
 #include <com/sun/star/document/XEmbeddedObjectSupplier2.hpp>
 #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>
@@ -1476,17 +1478,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
 
 // tests should only be added to ooxmlIMPORT *if* they fail round-tripping in ooxmlEXPORT