63 lines
2.8 KiB
Diff
63 lines
2.8 KiB
Diff
diff -Naur old/emfio/qa/cppunit/emf/EmfImportTest.cxx new/emfio/qa/cppunit/emf/EmfImportTest.cxx
|
|
--- old/emfio/qa/cppunit/emf/EmfImportTest.cxx 2020-09-01 17:49:30.507785893 +0300
|
|
+++ new/emfio/qa/cppunit/emf/EmfImportTest.cxx 2020-09-02 17:11:38.044957760 +0300
|
|
@@ -95,6 +95,7 @@
|
|
|
|
void Test::TestDrawString()
|
|
{
|
|
+#if HAVE_MORE_FONTS
|
|
// This unit checks for a correct import of an EMF+ file with only one DrawString Record
|
|
// Since the text is undecorated the optimal choice is a simpletextportion primitive
|
|
|
|
@@ -112,6 +113,7 @@
|
|
assertXPath(pDocument, "/primitive2D/metafile/transform/transform/textsimpleportion", "text", "TEST");
|
|
assertXPath(pDocument, "/primitive2D/metafile/transform/transform/textsimpleportion", "fontcolor", "#000000");
|
|
assertXPath(pDocument, "/primitive2D/metafile/transform/transform/textsimpleportion", "familyname", "CALIBRI");
|
|
+#endif
|
|
}
|
|
|
|
void Test::TestDrawStringTransparent()
|
|
--- old/sw/qa/extras/rtfexport/rtfexport.cxx 2020-09-01 17:49:31.499807284 +0300
|
|
+++ new/sw/qa/extras/rtfexport/rtfexport.cxx 2020-09-07 15:20:31.778385604 +0300
|
|
@@ -48,11 +48,16 @@
|
|
"math-mso2007.rtf", "math-nary.rtf", "math-rad.rtf",
|
|
"math-vertical-stacks.rtf", "math-runs.rtf",
|
|
};
|
|
- std::vector<const char*> vBlacklist(aBlacklist, aBlacklist + SAL_N_ELEMENTS(aBlacklist));
|
|
|
|
+ bool notfound = true;
|
|
+ int len = sizeof(aBlacklist) / sizeof (aBlacklist[0]);
|
|
+ for (int i = 0; i < len; i++) {
|
|
+ if (!strcmp(aBlacklist[i], filename)) {
|
|
+ notfound = false;
|
|
+ }
|
|
+ }
|
|
// If the testcase is stored in some other format, it's pointless to test.
|
|
- return (OString(filename).endsWith(".rtf")
|
|
- && std::find(vBlacklist.begin(), vBlacklist.end(), filename) == vBlacklist.end());
|
|
+ return (OString(filename).endsWith(".rtf") && notfound);
|
|
}
|
|
|
|
virtual void postLoad(const char* pFilename) override
|
|
--- old/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx 2020-09-01 17:49:31.527807889 +0300
|
|
+++ new/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx 2020-09-07 15:52:29.199799547 +0300
|
|
@@ -48,10 +48,16 @@
|
|
"math-escape.docx",
|
|
"math-mso2k7.docx",
|
|
};
|
|
- std::vector<const char*> vBlacklist(aBlacklist, aBlacklist + SAL_N_ELEMENTS(aBlacklist));
|
|
|
|
+ bool notfound = true;
|
|
+ int len = sizeof(aBlacklist) / sizeof (aBlacklist[0]);
|
|
+ for (int i = 0; i < len; i++) {
|
|
+ if (!strcmp(aBlacklist[i], filename)) {
|
|
+ notfound = false;
|
|
+ }
|
|
+ }
|
|
// If the testcase is stored in some other format, it's pointless to test.
|
|
- return (OString(filename).endsWith(".docx") && std::find(vBlacklist.begin(), vBlacklist.end(), filename) == vBlacklist.end());
|
|
+ return (OString(filename).endsWith(".docx") && notfound);
|
|
}
|
|
|
|
/**
|