vcl: Enable testTdf155161 on Windows
It was disabled on Windows from the start, but it passes now thanks to the recent fixes to Windows font code. Change-Id: Id6a824955ef70c42d83f4175105eb313d51aa70c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/208470 Tested-by: Jenkins Reviewed-by: Khaled Hosny <khaled@libreoffice.org>
This commit is contained in:
committed by
Khaled Hosny
parent
e1be5499a1
commit
a89d18c5d0
@@ -51,16 +51,13 @@
|
||||
#include <cmath>
|
||||
#include <libxml/xpathInternals.h>
|
||||
|
||||
#if !defined _WIN32
|
||||
#include <set>
|
||||
static std::ostream& operator<<(std::ostream& rStream, const std::set<rtl::OString>& rSet);
|
||||
#endif
|
||||
|
||||
#include <test/unoapi_test.hxx>
|
||||
|
||||
using namespace ::com::sun::star;
|
||||
|
||||
#if !defined _WIN32
|
||||
static std::ostream& operator<<(std::ostream& rStream, const std::set<OString>& rSet)
|
||||
{
|
||||
rStream << "{ ";
|
||||
@@ -73,7 +70,6 @@ static std::ostream& operator<<(std::ostream& rStream, const std::set<OString>&
|
||||
rStream << " }";
|
||||
return rStream;
|
||||
}
|
||||
#endif
|
||||
|
||||
namespace
|
||||
{
|
||||
@@ -5239,8 +5235,6 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest2, testTdf152246)
|
||||
|
||||
CPPUNIT_TEST_FIXTURE(PdfExportTest2, testTdf155161)
|
||||
{
|
||||
// TODO: We seem to get a fallback font on Windows
|
||||
#ifndef _WIN32
|
||||
vcl::filter::PDFDocument aDocument;
|
||||
loadFromFile(u"tdf155161.odt");
|
||||
save(TestFilter::PDF_WRITER);
|
||||
@@ -5273,7 +5267,6 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest2, testTdf155161)
|
||||
// There must be two fonts
|
||||
std::set<OString> aExpected{ "Cantarell-Regular"_ostr, "Cantarell-Bold"_ostr };
|
||||
CPPUNIT_ASSERT_EQUAL(aExpected, aFontNames);
|
||||
#endif
|
||||
}
|
||||
|
||||
CPPUNIT_TEST_FIXTURE(PdfExportTest2, testTdf48707_1)
|
||||
|
||||
Reference in New Issue
Block a user