dev/null                                           |binary
 sw/qa/extras/layout/data/tdf147485-forcepoint.docx |binary
 sw/qa/extras/layout/layout.cxx                     |    7 +------
 3 files changed, 1 insertion(+), 6 deletions(-)

New commits:
commit 46784e03d978cfab8aa5aff74eb15b177dbb82f1
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Fri Aug 12 14:20:28 2022 +0100
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Sat Aug 13 11:12:05 2022 +0200

    complete the FIXME for the font substitution
    
    Change-Id: I9527bce0276f2aa77331f5bb16b21fc6c4402944
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138201
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/sw/qa/extras/layout/data/tdf147485-forcepoint.doc 
b/sw/qa/extras/layout/data/tdf147485-forcepoint.doc
deleted file mode 100644
index cb630efb8717..000000000000
Binary files a/sw/qa/extras/layout/data/tdf147485-forcepoint.doc and /dev/null 
differ
diff --git a/sw/qa/extras/layout/data/tdf147485-forcepoint.docx 
b/sw/qa/extras/layout/data/tdf147485-forcepoint.docx
new file mode 100644
index 000000000000..d245e4be3db7
Binary files /dev/null and b/sw/qa/extras/layout/data/tdf147485-forcepoint.docx 
differ
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index d775962ffe26..438321555e89 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -3486,16 +3486,11 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testForcepoint103)
     createSwWebDoc(DATA_DIRECTORY, "forcepoint103.html");
 }
 
-// FIXME: The font substitution of the bugdoc causes crash in Linux builds,
-// in addition this example file originally was a docx so check system type
-// until that issue is not fixed:
-#ifndef SAL_UNX
 //just care it doesn't crash/assert
 CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf147485Forcepoint)
 {
-    createSwDoc(DATA_DIRECTORY, "tdf147485-forcepoint.doc");
+    createSwDoc(DATA_DIRECTORY, "tdf147485-forcepoint.docx");
 }
-#endif
 
 CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf118058)
 {

Reply via email to