diff --git a/0001-disable-libe-book-support.patch b/0001-disable-libe-book-support.patch index 296dd17..0cda888 100644 --- a/0001-disable-libe-book-support.patch +++ b/0001-disable-libe-book-support.patch @@ -90,9 +90,9 @@ index db6afdf..e6ea0f5 100644 $(eval $(call gb_Library_add_exception_objects,wpftwriter,\ writerperfect/source/writer/AbiWordImportFilter \ - writerperfect/source/writer/EBookImportFilter \ - writerperfect/source/writer/ImportFilterBase \ writerperfect/source/writer/MSWorksImportFilter \ writerperfect/source/writer/MWAWImportFilter \ + writerperfect/source/writer/WordPerfectImportFilter \ diff --git a/writerperfect/qa/unit/WpftWriterFilterTest.cxx b/writerperfect/qa/unit/WpftWriterFilterTest.cxx index 904daab..fb44878 100644 --- a/writerperfect/qa/unit/WpftWriterFilterTest.cxx @@ -117,16 +117,18 @@ index 05f6542..831bc38 100644 #include "WordPerfectImportFilter.hxx" #include "MSWorksImportFilter.hxx" #include "MWAWImportFilter.hxx" -@@ -52,9 +51,6 @@ static cppu::ImplementationEntry const services[] = { - { &MWAWImportFilter_createInstance, &MWAWImportFilter_getImplementationName, - &MWAWImportFilter_getSupportedServiceNames, - &cppu::createSingleComponentFactory, 0, 0 }, -- { &EBookImportFilter_createInstance, &EBookImportFilter_getImplementationName, -- &EBookImportFilter_getSupportedServiceNames, -- &cppu::createSingleComponentFactory, 0, 0 }, - { 0, 0, 0, 0, 0, 0 } }; +@@ -52,11 +51,6 @@ static cppu::ImplementationEntry const services[] = { + &MWAWImportFilter_getSupportedServiceNames, + &cppu::createSingleComponentFactory, 0, 0 + }, +- { +- &EBookImportFilter_createInstance, &EBookImportFilter_getImplementationName, +- &EBookImportFilter_getSupportedServiceNames, +- &cppu::createSingleComponentFactory, 0, 0 +- }, + { 0, 0, 0, 0, 0, 0 } + }; - } -- 1.9.3 diff --git a/0001-disable-swui-test-on-RHEL-7.patch b/0001-disable-swui-test-on-RHEL-7.patch index c22940c..1cb5d46 100644 --- a/0001-disable-swui-test-on-RHEL-7.patch +++ b/0001-disable-swui-test-on-RHEL-7.patch @@ -17,16 +17,16 @@ index 53a19bb..6702d9f 100644 $(eval $(call gb_Module_add_slowcheck_targets,sw,\ - CppunitTest_sw_uwriter \ CppunitTest_sw_htmlexport \ + CppunitTest_sw_htmlimport \ CppunitTest_sw_macros_test \ - CppunitTest_sw_ooxmlexport \ @@ -60,7 +59,6 @@ $(eval $(call gb_Module_add_slowcheck_targets,sw,\ CppunitTest_sw_rtfimport \ CppunitTest_sw_odfexport \ CppunitTest_sw_odfimport \ - CppunitTest_sw_uiwriter \ + CppunitTest_sw_mailmerge \ + CppunitTest_sw_globalfilter \ )) - - ifneq ($(DISABLE_CVE_TESTS),TRUE) -- 1.9.3