merge expwrap into sax library

there is no need for 2 shared libs for such a small module

Change-Id: Id28c9038f3e16931bfb8af3532eca172998da1aa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152374
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

Repository.mk

@@ -408,7 +408,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
 	editeng \
 	$(if $(filter WNT,$(OS)),emser) \
 	evtatt \
-	expwrap \
 	$(call gb_Helper_optional,DBCONNECTIVITY, \
 		flat \
 		file) \

bin/find-mergedlib-can-be-private.py

@@ -34,7 +34,6 @@ merged_libs = { \
     ,"desktop_detector)" \
     ,"drawinglayer" \
     ,"editeng" \
-    ,"expwrap" \
     ,"filterconfig" \
     ,"fsstorage" \
     ,"fwk" \

include/sax/fastparser.hxx

@@ -25,7 +25,7 @@
 #include <cppuhelper/implbase.hxx>
 #include <com/sun/star/lang/XInitialization.hpp>
 
-#include <sax/fastsaxdllapi.h>
+#include <sax/saxdllapi.h>
 #include <memory>
 
 namespace com::sun::star::xml::sax {
@@ -39,7 +39,7 @@ namespace sax_fastparser {
 class FastSaxParserImpl;
 
 // This class implements the external Parser interface
-class FASTSAX_DLLPUBLIC FastSaxParser final
+class SAX_DLLPUBLIC FastSaxParser final
     : public ::cppu::WeakImplHelper<
                 css::lang::XInitialization,
                 css::xml::sax::XFastParser,

include/sax/fastsaxdllapi.h

@@ -1,33 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_SAX_FASTSAXDLLAPI_H
-#define INCLUDED_SAX_FASTSAXDLLAPI_H
-
-#include <sal/types.h>
-
-#if defined FASTSAX_DLLIMPLEMENTATION
-#define FASTSAX_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
-#else
-#define FASTSAX_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
-#endif
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

oox/CppunitTest_oox_tokenmap.mk

@@ -42,7 +42,6 @@ $(eval $(call gb_CppunitTest_use_libraries,oox_tokenmap,\
     cppuhelper \
     docmodel \
     editeng \
-    expwrap \
     drawinglayer \
     msfilter \
     sal \

oox/CppunitTest_oox_vba_compression.mk

@@ -22,7 +22,6 @@ $(eval $(call gb_CppunitTest_use_libraries,oox_vba_compression,\
     cppu \
     cppuhelper \
     editeng \
-    expwrap \
     drawinglayer \
     msfilter \
     sal \

oox/CppunitTest_oox_vba_encryption.mk

@@ -22,7 +22,6 @@ $(eval $(call gb_CppunitTest_use_libraries,oox_vba_encryption,\
     cppu \
     cppuhelper \
     editeng \
-    expwrap \
     drawinglayer \
     msfilter \
     sal \

oox/Library_oox.mk

@@ -46,7 +46,6 @@ $(eval $(call gb_Library_use_libraries,oox,\
     docmodel \
     drawinglayer \
     editeng \
-    expwrap \
     i18nlangtag \
     msfilter \
     sal \

pch/inc/clangfix.hxx

@@ -13,8 +13,6 @@
 // And many of these macros are not actually used. So use them here to silence the warnings.
 // See gb_PrecompiledHeader_ignore_flags_system in solenv/gbuild/PrecompiledHeaders.mk .
 
-#ifdef FASTSAX_DLLIMPLEMENTATION
-#endif
 #ifdef SAX_DLLIMPLEMENTATION
 #endif
 #ifdef SCQAHELPER_DLLIMPLEMENTATION

sax/CppunitTest_sax_parser.mk

@@ -20,7 +20,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sax_parser, \
 	cppu \
 	cppuhelper \
 	unotest \
-	expwrap \
 	sal \
 	sax \
 	test \

sax/Library_expwrap.mk

@@ -1,52 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Library_Library,expwrap))
-
-$(eval $(call gb_Library_set_componentfile,expwrap,sax/source/expatwrap/expwrap,services))
-
-$(eval $(call gb_Library_set_include,expwrap,\
-	-I$(SRCDIR)/sax/inc \
-	$$(INCLUDE) \
-))
-
-$(eval $(call gb_Library_use_common_precompiled_header,expwrap))
-
-$(eval $(call gb_Library_add_defs,expwrap,\
-	-DFASTSAX_DLLIMPLEMENTATION \
-))
-
-$(eval $(call gb_Library_use_sdk_api,expwrap))
-
-$(eval $(call gb_Library_use_externals,expwrap,\
-	boost_headers \
-	libxml2 \
-	expat \
-	zlib \
-))
-
-$(eval $(call gb_Library_use_libraries,expwrap,\
-	comphelper \
-	cppu \
-	cppuhelper \
-	sal \
-	salhelper \
-	sax \
-	tl \
-))
-
-$(eval $(call gb_Library_add_exception_objects,expwrap,\
-	sax/source/expatwrap/sax_expat \
-	sax/source/expatwrap/saxwriter \
-	sax/source/expatwrap/xml2utf \
-	sax/source/fastparser/fastparser \
-	sax/source/fastparser/legacyfastparser \
-))
-
-# vim: set noet sw=4 ts=4:

sax/Library_sax.mk

@@ -9,6 +9,8 @@
 
 $(eval $(call gb_Library_Library,sax))
 
+$(eval $(call gb_Library_set_componentfile,sax,sax/source/expatwrap/expwrap,services))
+
 $(eval $(call gb_Library_set_include,sax,\
 	-I$(SRCDIR)/sax/inc \
 	$$(INCLUDE) \
@@ -20,11 +22,19 @@ $(eval $(call gb_Library_use_common_precompiled_header,sax))
 
 $(eval $(call gb_Library_use_sdk_api,sax))
 
+$(eval $(call gb_Library_use_externals,sax,\
+	boost_headers \
+	libxml2 \
+	expat \
+	zlib \
+))
+
 $(eval $(call gb_Library_use_libraries,sax,\
 	comphelper \
 	cppu \
 	cppuhelper \
 	sal \
+	salhelper \
 	tl \
 ))
 
@@ -33,6 +43,11 @@ $(eval $(call gb_Library_add_defs,sax,\
 ))
 
 $(eval $(call gb_Library_add_exception_objects,sax,\
+	sax/source/expatwrap/sax_expat \
+	sax/source/expatwrap/saxwriter \
+	sax/source/expatwrap/xml2utf \
+	sax/source/fastparser/fastparser \
+	sax/source/fastparser/legacyfastparser \
 	sax/source/tools/converter \
 	sax/source/tools/fastattribs \
 	sax/source/tools/fastserializer \

sax/Module_sax.mk

@@ -10,7 +10,6 @@
 $(eval $(call gb_Module_Module,sax))
 
 $(eval $(call gb_Module_add_targets,sax,\
-	Library_expwrap \
 	Library_sax \
 ))
 

solenv/gbuild/PrecompiledHeaders.mk

@@ -139,7 +139,6 @@ endef
 # So while this is officially tricky, in practice it seems to work to allow PCH reuse if the linktarget
 # has more defines than the PCH was built with, as long as the defines do not affect the PCH.
 gb_PrecompiledHeader_ignore_flags_system := \
--DFASTSAX_DLLIMPLEMENTATION \
 -DSAX_DLLIMPLEMENTATION \
 -DSCQAHELPER_DLLIMPLEMENTATION \
 -DVCLPLUG_WIN_IMPLEMENTATION \

vcl/commonfuzzer.mk

@@ -148,7 +148,6 @@ fuzzer_core_libraries = \
     unoidl \
     reg \
     store \
-    expwrap \
     gcc3_uno \
     salhelper \
     sal \