From baaaee9b1665245e5b4f6a0ef5c949fd3ab32862 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 8 Jul 2020 11:56:36 +0100 Subject: fix fuzzer build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I1c96d177ddf6061e61f4027675e657c2d7fd446e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98367 Tested-by: Jenkins Reviewed-by: Caolán McNamara --- vcl/workben/cgmfuzzer.cxx | 4 ++-- vcl/workben/pptfuzzer.cxx | 4 ++-- vcl/workben/qpwfuzzer.cxx | 4 ++-- vcl/workben/rtffuzzer.cxx | 4 ++-- vcl/workben/slkfuzzer.cxx | 4 ++-- vcl/workben/wmffuzzer.cxx | 4 ++-- vcl/workben/ww2fuzzer.cxx | 4 ++-- vcl/workben/ww6fuzzer.cxx | 3 ++- vcl/workben/ww8fuzzer.cxx | 4 ++-- 9 files changed, 18 insertions(+), 17 deletions(-) (limited to 'vcl/workben') diff --git a/vcl/workben/cgmfuzzer.cxx b/vcl/workben/cgmfuzzer.cxx index 252d538bd14c..d6c35981ef2e 100644 --- a/vcl/workben/cgmfuzzer.cxx +++ b/vcl/workben/cgmfuzzer.cxx @@ -15,7 +15,6 @@ #include extern "C" { -void * emfio_component_getFactory( const char* , void* , void* ); void * sd_component_getFactory( const char* , void* , void* ); void * i18npool_component_getFactory( const char* , void* , void* ); void * ucb_component_getFactory( const char* , void* , void* ); @@ -47,13 +46,13 @@ void * com_sun_star_animations_SequenceTimeContainer_get_implementation( void *, void * com_sun_star_animations_TransitionFilter_get_implementation( void *, void * ); void * com_sun_star_comp_comphelper_OPropertyBag( void *, void * ); void * com_sun_star_comp_uui_UUIInteractionHandler_get_implementation( void *, void * ); +void * emfio_emfreader_XEmfParser_get_implementation( void *, void * ); } const lib_to_factory_mapping * lo_get_factory_map(void) { static lib_to_factory_mapping map[] = { - { "libemfiolo.a", emfio_component_getFactory }, { "libsdlo.a", sd_component_getFactory }, { "libunoxmllo.a", unoxml_component_getFactory }, { "libi18npoollo.a", i18npool_component_getFactory }, @@ -94,6 +93,7 @@ lo_get_constructor_map(void) { "com_sun_star_animations_TransitionFilter_get_implementation", com_sun_star_animations_TransitionFilter_get_implementation }, { "com_sun_star_comp_comphelper_OPropertyBag", com_sun_star_comp_comphelper_OPropertyBag }, { "com_sun_star_comp_uui_UUIInteractionHandler_get_implementation", com_sun_star_comp_uui_UUIInteractionHandler_get_implementation }, + { "emfio_emfreader_XEmfParser_get_implementation", emfio_emfreader_XEmfParser_get_implementation}, { 0, 0 } }; diff --git a/vcl/workben/pptfuzzer.cxx b/vcl/workben/pptfuzzer.cxx index d7f6b73f986e..93cd12a1d870 100644 --- a/vcl/workben/pptfuzzer.cxx +++ b/vcl/workben/pptfuzzer.cxx @@ -15,7 +15,6 @@ #include extern "C" { -void * emfio_component_getFactory( const char* , void* , void* ); void * sd_component_getFactory( const char* , void* , void* ); void * i18npool_component_getFactory( const char* , void* , void* ); void * ucb_component_getFactory( const char* , void* , void* ); @@ -46,13 +45,13 @@ void * com_sun_star_animations_SequenceTimeContainer_get_implementation( void *, void * com_sun_star_animations_TransitionFilter_get_implementation( void *, void * ); void * com_sun_star_comp_comphelper_OPropertyBag( void *, void * ); void * com_sun_star_comp_uui_UUIInteractionHandler_get_implementation( void *, void * ); +void * emfio_emfreader_XEmfParser_get_implementation( void *, void * ); } const lib_to_factory_mapping * lo_get_factory_map(void) { static lib_to_factory_mapping map[] = { - { "libemfiolo.a", emfio_component_getFactory }, { "libsdlo.a", sd_component_getFactory }, { "libunoxmllo.a", unoxml_component_getFactory }, { "libi18npoollo.a", i18npool_component_getFactory }, @@ -92,6 +91,7 @@ lo_get_constructor_map(void) { "com_sun_star_animations_TransitionFilter_get_implementation", com_sun_star_animations_TransitionFilter_get_implementation }, { "com_sun_star_comp_comphelper_OPropertyBag", com_sun_star_comp_comphelper_OPropertyBag }, { "com_sun_star_comp_uui_UUIInteractionHandler_get_implementation", com_sun_star_comp_uui_UUIInteractionHandler_get_implementation }, + { "emfio_emfreader_XEmfParser_get_implementation", emfio_emfreader_XEmfParser_get_implementation}, { 0, 0 } }; diff --git a/vcl/workben/qpwfuzzer.cxx b/vcl/workben/qpwfuzzer.cxx index 0b1fe636240e..6cfecf4f20cd 100644 --- a/vcl/workben/qpwfuzzer.cxx +++ b/vcl/workben/qpwfuzzer.cxx @@ -14,7 +14,6 @@ #include extern "C" { -void * emfio_component_getFactory( const char* , void* , void* ); void * i18npool_component_getFactory( const char* , void* , void* ); void * com_sun_star_i18n_LocaleDataImpl_get_implementation( void *, void * ); @@ -27,13 +26,13 @@ void * com_sun_star_i18n_Collator_get_implementation( void *, void * ); void * com_sun_star_i18n_NativeNumberSupplier_get_implementation( void *, void * ); void * com_sun_star_i18n_NumberFormatCodeMapper_get_implementation( void *, void * ); void * com_sun_star_i18n_Transliteration_get_implementation( void *, void * ); +void * emfio_emfreader_XEmfParser_get_implementation( void *, void * ); } const lib_to_factory_mapping * lo_get_factory_map(void) { static lib_to_factory_mapping map[] = { - { "libemfiolo.a", emfio_component_getFactory }, { "libi18npoollo.a", i18npool_component_getFactory }, { 0, 0 } }; @@ -55,6 +54,7 @@ lo_get_constructor_map(void) { "com_sun_star_i18n_NativeNumberSupplier_get_implementation", com_sun_star_i18n_NativeNumberSupplier_get_implementation }, { "com_sun_star_i18n_NumberFormatCodeMapper_get_implementation", com_sun_star_i18n_NumberFormatCodeMapper_get_implementation }, { "com_sun_star_i18n_Transliteration_get_implementation", com_sun_star_i18n_Transliteration_get_implementation }, + { "emfio_emfreader_XEmfParser_get_implementation", emfio_emfreader_XEmfParser_get_implementation}, { 0, 0 } }; diff --git a/vcl/workben/rtffuzzer.cxx b/vcl/workben/rtffuzzer.cxx index 5f2ac75e83e8..cd68a84eda6c 100644 --- a/vcl/workben/rtffuzzer.cxx +++ b/vcl/workben/rtffuzzer.cxx @@ -15,7 +15,6 @@ #include extern "C" { -void * emfio_component_getFactory( const char* , void* , void* ); void * i18npool_component_getFactory( const char* , void* , void* ); void * com_sun_star_i18n_LocaleDataImpl_get_implementation( void *, void * ); @@ -28,13 +27,13 @@ void * com_sun_star_i18n_NativeNumberSupplier_get_implementation( void *, void * void * com_sun_star_i18n_NumberFormatCodeMapper_get_implementation( void *, void * ); void * com_sun_star_i18n_Transliteration_get_implementation( void *, void * ); void * com_sun_star_comp_Writer_RtfFilter_get_implementation( void *, void * ); +void * emfio_emfreader_XEmfParser_get_implementation( void *, void * ); } const lib_to_factory_mapping * lo_get_factory_map(void) { static lib_to_factory_mapping map[] = { - { "libemfiolo.a", emfio_component_getFactory }, { "libi18npoollo.a", i18npool_component_getFactory }, { 0, 0 } }; @@ -56,6 +55,7 @@ lo_get_constructor_map(void) { "com_sun_star_i18n_NumberFormatCodeMapper_get_implementation", com_sun_star_i18n_NumberFormatCodeMapper_get_implementation }, { "com_sun_star_i18n_Transliteration_get_implementation", com_sun_star_i18n_Transliteration_get_implementation }, { "com_sun_star_comp_Writer_RtfFilter_get_implementation", com_sun_star_comp_Writer_RtfFilter_get_implementation }, + { "emfio_emfreader_XEmfParser_get_implementation", emfio_emfreader_XEmfParser_get_implementation}, { 0, 0 } }; diff --git a/vcl/workben/slkfuzzer.cxx b/vcl/workben/slkfuzzer.cxx index 9b8463bdc4fa..924f1d13294c 100644 --- a/vcl/workben/slkfuzzer.cxx +++ b/vcl/workben/slkfuzzer.cxx @@ -14,7 +14,6 @@ #include extern "C" { -void * emfio_component_getFactory( const char* , void* , void* ); void * i18npool_component_getFactory( const char* , void* , void* ); void * com_sun_star_i18n_LocaleDataImpl_get_implementation( void *, void * ); @@ -27,13 +26,13 @@ void * com_sun_star_i18n_Collator_get_implementation( void *, void * ); void * com_sun_star_i18n_NativeNumberSupplier_get_implementation( void *, void * ); void * com_sun_star_i18n_NumberFormatCodeMapper_get_implementation( void *, void * ); void * com_sun_star_i18n_Transliteration_get_implementation( void *, void * ); +void * emfio_emfreader_XEmfParser_get_implementation( void *, void * ); } const lib_to_factory_mapping * lo_get_factory_map(void) { static lib_to_factory_mapping map[] = { - { "libemfiolo.a", emfio_component_getFactory }, { "libi18npoollo.a", i18npool_component_getFactory }, { 0, 0 } }; @@ -55,6 +54,7 @@ lo_get_constructor_map(void) { "com_sun_star_i18n_NativeNumberSupplier_get_implementation", com_sun_star_i18n_NativeNumberSupplier_get_implementation }, { "com_sun_star_i18n_NumberFormatCodeMapper_get_implementation", com_sun_star_i18n_NumberFormatCodeMapper_get_implementation }, { "com_sun_star_i18n_Transliteration_get_implementation", com_sun_star_i18n_Transliteration_get_implementation }, + { "emfio_emfreader_XEmfParser_get_implementation", emfio_emfreader_XEmfParser_get_implementation}, { 0, 0 } }; diff --git a/vcl/workben/wmffuzzer.cxx b/vcl/workben/wmffuzzer.cxx index 7ce9ff90d569..371798fc9457 100644 --- a/vcl/workben/wmffuzzer.cxx +++ b/vcl/workben/wmffuzzer.cxx @@ -16,17 +16,16 @@ #include extern "C" { -void * emfio_component_getFactory( const char* , void* , void* ); void * com_sun_star_i18n_LocaleDataImpl_get_implementation( void *, void * ); void * com_sun_star_i18n_BreakIterator_Unicode_get_implementation( void *, void * ); void * com_sun_star_i18n_BreakIterator_get_implementation( void *, void * ); +void * emfio_emfreader_XEmfParser_get_implementation( void *, void * ); } const lib_to_factory_mapping * lo_get_factory_map(void) { static lib_to_factory_mapping map[] = { - { "libemfiolo.a", emfio_component_getFactory }, { 0, 0 } }; @@ -40,6 +39,7 @@ lo_get_constructor_map(void) { "com_sun_star_i18n_LocaleDataImpl_get_implementation", com_sun_star_i18n_LocaleDataImpl_get_implementation }, { "com_sun_star_i18n_BreakIterator_Unicode_get_implementation", com_sun_star_i18n_BreakIterator_Unicode_get_implementation }, { "com_sun_star_i18n_BreakIterator_get_implementation", com_sun_star_i18n_BreakIterator_get_implementation }, + { "emfio_emfreader_XEmfParser_get_implementation", emfio_emfreader_XEmfParser_get_implementation}, { 0, 0 } }; diff --git a/vcl/workben/ww2fuzzer.cxx b/vcl/workben/ww2fuzzer.cxx index 24038ae166ed..62ff820bcc79 100644 --- a/vcl/workben/ww2fuzzer.cxx +++ b/vcl/workben/ww2fuzzer.cxx @@ -18,7 +18,6 @@ extern "C" { void * unoxml_component_getFactory( const char* , void* , void* ); void * i18npool_component_getFactory( const char* , void* , void* ); void * ucb_component_getFactory( const char* , void* , void* ); -void * emfio_component_getFactory( const char* , void* , void* ); void * com_sun_star_comp_framework_Desktop_get_implementation( void *, void * ); void * com_sun_star_i18n_LocaleDataImpl_get_implementation( void *, void * ); @@ -35,6 +34,7 @@ void * com_sun_star_comp_uui_UUIInteractionHandler_get_implementation( void *, v void * com_sun_star_i18n_Transliteration_get_implementation( void *, void * ); void * com_sun_star_text_DefaultNumberingProvider_get_implementation( void *, void * ); void * com_sun_star_comp_uri_UriReferenceFactory_get_implementation( void *, void * ); +void * emfio_emfreader_XEmfParser_get_implementation( void *, void * ); } const lib_to_factory_mapping * @@ -43,7 +43,6 @@ lo_get_factory_map(void) static lib_to_factory_mapping map[] = { { "libunoxmllo.a", unoxml_component_getFactory }, { "libi18npoollo.a", i18npool_component_getFactory }, - { "libemfiolo.a", emfio_component_getFactory }, { "libucb1.a", ucb_component_getFactory }, { 0, 0 } }; @@ -70,6 +69,7 @@ lo_get_constructor_map(void) { "com_sun_star_i18n_Transliteration_get_implementation", com_sun_star_i18n_Transliteration_get_implementation }, { "com_sun_star_text_DefaultNumberingProvider_get_implementation", com_sun_star_text_DefaultNumberingProvider_get_implementation }, { "com_sun_star_comp_uri_UriReferenceFactory_get_implementation", com_sun_star_comp_uri_UriReferenceFactory_get_implementation}, + { "emfio_emfreader_XEmfParser_get_implementation", emfio_emfreader_XEmfParser_get_implementation}, { 0, 0 } }; diff --git a/vcl/workben/ww6fuzzer.cxx b/vcl/workben/ww6fuzzer.cxx index 56db11981d54..f0225b20e2ce 100644 --- a/vcl/workben/ww6fuzzer.cxx +++ b/vcl/workben/ww6fuzzer.cxx @@ -18,7 +18,6 @@ extern "C" { void * unoxml_component_getFactory( const char* , void* , void* ); void * i18npool_component_getFactory( const char* , void* , void* ); void * ucb_component_getFactory( const char* , void* , void* ); -void * emfio_component_getFactory( const char* , void* , void* ); void * com_sun_star_comp_framework_Desktop_get_implementation( void *, void * ); void * com_sun_star_i18n_LocaleDataImpl_get_implementation( void *, void * ); @@ -36,6 +35,7 @@ void * com_sun_star_comp_comphelper_OPropertyBag( void *, void * ); void * com_sun_star_i18n_Transliteration_get_implementation( void *, void * ); void * com_sun_star_text_DefaultNumberingProvider_get_implementation( void *, void * ); void * com_sun_star_comp_uri_UriReferenceFactory_get_implementation( void *, void * ); +void * emfio_emfreader_XEmfParser_get_implementation( void *, void * ); } const lib_to_factory_mapping * @@ -72,6 +72,7 @@ lo_get_constructor_map(void) { "com_sun_star_i18n_Transliteration_get_implementation", com_sun_star_i18n_Transliteration_get_implementation }, { "com_sun_star_text_DefaultNumberingProvider_get_implementation", com_sun_star_text_DefaultNumberingProvider_get_implementation }, { "com_sun_star_comp_uri_UriReferenceFactory_get_implementation", com_sun_star_comp_uri_UriReferenceFactory_get_implementation}, + { "emfio_emfreader_XEmfParser_get_implementation", emfio_emfreader_XEmfParser_get_implementation}, { 0, 0 } }; diff --git a/vcl/workben/ww8fuzzer.cxx b/vcl/workben/ww8fuzzer.cxx index d8613afcd1fa..08d2aeb68811 100644 --- a/vcl/workben/ww8fuzzer.cxx +++ b/vcl/workben/ww8fuzzer.cxx @@ -18,7 +18,6 @@ extern "C" { void * unoxml_component_getFactory( const char* , void* , void* ); void * i18npool_component_getFactory( const char* , void* , void* ); void * ucb_component_getFactory( const char* , void* , void* ); -void * emfio_component_getFactory( const char* , void* , void* ); void * com_sun_star_comp_framework_Desktop_get_implementation( void *, void * ); void * com_sun_star_i18n_LocaleDataImpl_get_implementation( void *, void * ); @@ -36,6 +35,7 @@ void * com_sun_star_comp_comphelper_OPropertyBag( void *, void * ); void * com_sun_star_i18n_Transliteration_get_implementation( void *, void * ); void * com_sun_star_text_DefaultNumberingProvider_get_implementation( void *, void * ); void * com_sun_star_comp_uri_UriReferenceFactory_get_implementation( void *, void * ); +void * emfio_emfreader_XEmfParser_get_implementation( void *, void * ); } const lib_to_factory_mapping * @@ -44,7 +44,6 @@ lo_get_factory_map(void) static lib_to_factory_mapping map[] = { { "libunoxmllo.a", unoxml_component_getFactory }, { "libi18npoollo.a", i18npool_component_getFactory }, - { "libemfiolo.a", emfio_component_getFactory }, { "libucb1.a", ucb_component_getFactory }, { 0, 0 } }; @@ -72,6 +71,7 @@ lo_get_constructor_map(void) { "com_sun_star_i18n_Transliteration_get_implementation", com_sun_star_i18n_Transliteration_get_implementation }, { "com_sun_star_text_DefaultNumberingProvider_get_implementation", com_sun_star_text_DefaultNumberingProvider_get_implementation }, { "com_sun_star_comp_uri_UriReferenceFactory_get_implementation", com_sun_star_comp_uri_UriReferenceFactory_get_implementation}, + { "emfio_emfreader_XEmfParser_get_implementation", emfio_emfreader_XEmfParser_get_implementation}, { 0, 0 } }; -- cgit