xmlsecurity: fold Library_xsec_fw into Library_xmlsecurity

That little amount of code hardly justifies a separate library.

Change-Id: Idbb039f38258bc12759fcf6d29328e1afe7443ab
Reviewed-on: https://gerrit.libreoffice.org/49391
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>

15 files changed, 18 insertions, 155 deletions

diff --git a/Repository.mk b/Repository.mk
index 6ba9571c67d3..17dab1319038 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -636,7 +636,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
 	ucppkg1 \
 	unopkgapp \
 	xmlsecurity \
-	xsec_fw \
 	xsec_xmlsec \
 	xstor \
 	$(if $(filter $(OS),MACOSX), \
diff --git a/bin/update_pch b/bin/update_pch
index ffc0ca3ec700..9b04e4cd4470 100755
--- a/bin/update_pch
+++ b/bin/update_pch
@@ -123,7 +123,6 @@ DEFAULTS = \
     'xmloff.xof'                        : ( 1, EXCLUDE, EXCLUDE, INCLUDE), #   4.4
     'xmlscript.xmlscript'               : ( 4, EXCLUDE, EXCLUDE, INCLUDE), #   3.6
     'xmlsecurity.xmlsecurity'           : ( 6, EXCLUDE, INCLUDE, INCLUDE), #   5.1
-    'xmlsecurity.xsec_fw'               : ( 2, EXCLUDE, INCLUDE, EXCLUDE), #   2.7
     'xmlsecurity.xsec_xmlsec'           : ( 2, EXCLUDE, INCLUDE, INCLUDE), #   4.4
     'xmlsecurity.xsec_gpg'              : ( 2, EXCLUDE, INCLUDE, INCLUDE), #   ?
 }
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index b34a286c896b..63e99edbbea2 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -19699,8 +19699,6 @@ xmlsecurity/inc/gpg/xmlsignature_gpgimpl.hxx
 xmlsecurity/inc/macrosecurity.hxx
 xmlsecurity/inc/pch/precompiled_xmlsecurity.cxx
 xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx
-xmlsecurity/inc/pch/precompiled_xsec_fw.cxx
-xmlsecurity/inc/pch/precompiled_xsec_fw.hxx
 xmlsecurity/inc/pch/precompiled_xsec_gpg.cxx
 xmlsecurity/inc/pch/precompiled_xsec_gpg.hxx
 xmlsecurity/inc/pch/precompiled_xsec_xmlsec.cxx
diff --git a/xmlsecurity/Library_xmlsecurity.mk b/xmlsecurity/Library_xmlsecurity.mk
index 1c30ab25817c..a6f4e09d0c45 100644
--- a/xmlsecurity/Library_xmlsecurity.mk
+++ b/xmlsecurity/Library_xmlsecurity.mk
@@ -41,7 +41,6 @@ $(eval $(call gb_Library_use_libraries,xmlsecurity,\
 	vcl \
 	xo \
 	i18nlangtag \
-	xsec_fw \
 	xsec_xmlsec \
 ))
 
@@ -53,6 +52,15 @@ $(eval $(call gb_Library_add_exception_objects,xmlsecurity,\
 	xmlsecurity/source/dialogs/digitalsignaturesdialog \
 	xmlsecurity/source/dialogs/macrosecurity \
 	xmlsecurity/source/dialogs/resourcemanager \
+	xmlsecurity/source/framework/buffernode \
+	xmlsecurity/source/framework/elementcollector \
+	xmlsecurity/source/framework/elementmark \
+	xmlsecurity/source/framework/saxeventkeeperimpl \
+	xmlsecurity/source/framework/securityengine \
+	xmlsecurity/source/framework/signaturecreatorimpl \
+	xmlsecurity/source/framework/signatureengine \
+	xmlsecurity/source/framework/signatureverifierimpl \
+	xmlsecurity/source/framework/xmlsignaturetemplateimpl \
 	xmlsecurity/source/helper/documentsignaturehelper \
 	xmlsecurity/source/helper/documentsignaturemanager \
 	xmlsecurity/source/helper/ooxmlsecparser \
diff --git a/xmlsecurity/Library_xsec_fw.mk b/xmlsecurity/Library_xsec_fw.mk
deleted file mode 100644
index c205a3f2d684..000000000000
--- a/xmlsecurity/Library_xsec_fw.mk
+++ /dev/null
@@ -1,44 +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,xsec_fw))
-
-$(eval $(call gb_Library_set_include,xsec_fw,\
-	$$(INCLUDE) \
-	-I$(SRCDIR)/xmlsecurity/inc \
-))
-
-$(eval $(call gb_Library_add_defs,xsec_fw,\
-    -DXSECFW_DLLIMPLEMENTATION \
-))
-
-$(eval $(call gb_Library_set_precompiled_header,xsec_fw,$(SRCDIR)/xmlsecurity/inc/pch/precompiled_xsec_fw))
-
-$(eval $(call gb_Library_use_sdk_api,xsec_fw))
-
-$(eval $(call gb_Library_use_libraries,xsec_fw,\
-	comphelper \
-	cppu \
-	cppuhelper \
-	sal \
-))
-
-$(eval $(call gb_Library_add_exception_objects,xsec_fw,\
-	xmlsecurity/source/framework/buffernode \
-	xmlsecurity/source/framework/elementcollector \
-	xmlsecurity/source/framework/elementmark \
-	xmlsecurity/source/framework/saxeventkeeperimpl \
-	xmlsecurity/source/framework/securityengine \
-	xmlsecurity/source/framework/signaturecreatorimpl \
-	xmlsecurity/source/framework/signatureengine \
-	xmlsecurity/source/framework/signatureverifierimpl \
-	xmlsecurity/source/framework/xmlsignaturetemplateimpl \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/xmlsecurity/Module_xmlsecurity.mk b/xmlsecurity/Module_xmlsecurity.mk
index 693abbb80a0f..1ce7364d4ce9 100644
--- a/xmlsecurity/Module_xmlsecurity.mk
+++ b/xmlsecurity/Module_xmlsecurity.mk
@@ -13,7 +13,6 @@ ifeq ($(ENABLE_NSS),TRUE)
 
 $(eval $(call gb_Module_add_targets,xmlsecurity,\
 	Library_xmlsecurity \
-	Library_xsec_fw \
 	Library_xsec_xmlsec \
 	UIConfig_xmlsec \
 ))
diff --git a/xmlsecurity/inc/framework/saxeventkeeperimpl.hxx b/xmlsecurity/inc/framework/saxeventkeeperimpl.hxx
index 4f8a06959a4c..30dfa337c3ef 100644
--- a/xmlsecurity/inc/framework/saxeventkeeperimpl.hxx
+++ b/xmlsecurity/inc/framework/saxeventkeeperimpl.hxx
@@ -30,7 +30,7 @@
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <xsecfwdllapi.h>
+#include <xmlsecuritydllapi.h>
 #include <cppuhelper/implbase.hxx>
 
 class BufferNode;
@@ -40,7 +40,7 @@ class ElementCollector;
 #include <vector>
 #include <memory>
 
-class XSECFW_DLLPUBLIC SAXEventKeeperImpl : public cppu::WeakImplHelper
+class XMLSECURITY_DLLPUBLIC SAXEventKeeperImpl : public cppu::WeakImplHelper
 <
     css::xml::crypto::sax::XSecuritySAXEventKeeper,
     css::xml::crypto::sax::XReferenceResolvedBroadcaster,
diff --git a/xmlsecurity/inc/framework/securityengine.hxx b/xmlsecurity/inc/framework/securityengine.hxx
index b0d0a361324e..dbb4dbfe5777 100644
--- a/xmlsecurity/inc/framework/securityengine.hxx
+++ b/xmlsecurity/inc/framework/securityengine.hxx
@@ -29,9 +29,9 @@
 
 #include <cppuhelper/implbase.hxx>
 
-#include <xsecfwdllapi.h>
+#include <xmlsecuritydllapi.h>
 
-class XSECFW_DLLPUBLIC SecurityEngine : public cppu::WeakImplHelper
+class XMLSECURITY_DLLPUBLIC SecurityEngine : public cppu::WeakImplHelper
 <
     css::xml::crypto::sax::XReferenceResolvedListener,
     css::xml::crypto::sax::XKeyCollector,
diff --git a/xmlsecurity/inc/framework/signaturecreatorimpl.hxx b/xmlsecurity/inc/framework/signaturecreatorimpl.hxx
index 65e9c6a8ee1f..b7fffec12c6c 100644
--- a/xmlsecurity/inc/framework/signaturecreatorimpl.hxx
+++ b/xmlsecurity/inc/framework/signaturecreatorimpl.hxx
@@ -40,7 +40,7 @@ typedef cppu::ImplInheritanceHelper
     css::lang::XServiceInfo
 > SignatureCreatorImpl_Base;
 
-class XSECFW_DLLPUBLIC SignatureCreatorImpl : public SignatureCreatorImpl_Base
+class XMLSECURITY_DLLPUBLIC SignatureCreatorImpl : public SignatureCreatorImpl_Base
 /****** SignatureCreatorImpl.hxx/CLASS SignatureCreatorImpl *******************
  *
  *   NAME
diff --git a/xmlsecurity/inc/framework/signatureengine.hxx b/xmlsecurity/inc/framework/signatureengine.hxx
index 04757035dcbb..62c0c5c5f24f 100644
--- a/xmlsecurity/inc/framework/signatureengine.hxx
+++ b/xmlsecurity/inc/framework/signatureengine.hxx
@@ -35,13 +35,13 @@
 #include <cppuhelper/implbase.hxx>
 #include <rtl/ref.hxx>
 
-#include <xsecfwdllapi.h>
+#include <xmlsecuritydllapi.h>
 #include <framework/securityengine.hxx>
 #include <framework/xmlsignaturetemplateimpl.hxx>
 
 #include <vector>
 
-class XSECFW_DLLPUBLIC SignatureEngine : public cppu::ImplInheritanceHelper
+class XMLSECURITY_DLLPUBLIC SignatureEngine : public cppu::ImplInheritanceHelper
 <
     SecurityEngine,
     css::xml::crypto::sax::XReferenceCollector,
diff --git a/xmlsecurity/inc/framework/signatureverifierimpl.hxx b/xmlsecurity/inc/framework/signatureverifierimpl.hxx
index a1bc82213fb8..d3b8c8e166f6 100644
--- a/xmlsecurity/inc/framework/signatureverifierimpl.hxx
+++ b/xmlsecurity/inc/framework/signatureverifierimpl.hxx
@@ -29,7 +29,7 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <cppuhelper/implbase.hxx>
 
-#include <xsecfwdllapi.h>
+#include <xmlsecuritydllapi.h>
 #include <framework/signatureengine.hxx>
 
 typedef cppu::ImplInheritanceHelper
@@ -40,7 +40,7 @@ typedef cppu::ImplInheritanceHelper
     css::lang::XServiceInfo
 > SignatureVerifierImpl_Base;
 
-class XSECFW_DLLPUBLIC SignatureVerifierImpl : public SignatureVerifierImpl_Base
+class XMLSECURITY_DLLPUBLIC SignatureVerifierImpl : public SignatureVerifierImpl_Base
 /****** SignatureVerifier.hxx/CLASS SignatureVerifierImpl *********************
  *
  *   NAME
diff --git a/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx b/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx
index 3d917fc390d7..c9c58ab1d0a4 100644
--- a/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx
+++ b/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx
@@ -53,7 +53,6 @@
 #include <utility>
 #include <vector>
 #include <xmlsecuritydllapi.h>
-#include <xsecfwdllapi.h>
 #include <boost/optional/optional.hpp>
 #include <osl/diagnose.h>
 #include <osl/doublecheckedlocking.h>
diff --git a/xmlsecurity/inc/pch/precompiled_xsec_fw.cxx b/xmlsecurity/inc/pch/precompiled_xsec_fw.cxx
deleted file mode 100644
index 12648a670ece..000000000000
--- a/xmlsecurity/inc/pch/precompiled_xsec_fw.cxx
+++ /dev/null
@@ -1,12 +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/.
- */
-
-#include "precompiled_xsec_fw.hxx"
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/inc/pch/precompiled_xsec_fw.hxx b/xmlsecurity/inc/pch/precompiled_xsec_fw.hxx
deleted file mode 100644
index 93354b539b0b..000000000000
--- a/xmlsecurity/inc/pch/precompiled_xsec_fw.hxx
+++ /dev/null
@@ -1,60 +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 has been autogenerated by update_pch.sh. It is possible to edit it
- manually (such as when an include file has been moved/renamed/removed). All such
- manual changes will be rewritten by the next run of update_pch.sh (which presumably
- also fixes all possible problems, so it's usually better to use it).
-
- Generated on 2017-09-20 22:55:53 using:
- ./bin/update_pch xmlsecurity xsec_fw --cutoff=2 --exclude:system --include:module --exclude:local
-
- If after updating build fails, use the following command to locate conflicting headers:
- ./bin/update_pch_bisect ./xmlsecurity/inc/pch/precompiled_xsec_fw.hxx "make xmlsecurity.build" --find-conflicts
-*/
-
-#include <cassert>
-#include <config_typesizes.h>
-#include <cstddef>
-#include <cstdlib>
-#include <cstring>
-#include <new>
-#include <ostream>
-#include <sstream>
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-#include <string>
-#include <osl/diagnose.h>
-#include <osl/interlck.h>
-#include <rtl/ref.hxx>
-#include <rtl/string.h>
-#include <rtl/string.hxx>
-#include <rtl/stringutils.hxx>
-#include <rtl/textcvt.h>
-#include <rtl/textenc.h>
-#include <rtl/ustring.h>
-#include <rtl/ustring.hxx>
-#include <rtl/uuid.h>
-#include <sal/config.h>
-#include <sal/detail/log.h>
-#include <sal/log.hxx>
-#include <sal/macros.h>
-#include <sal/saldllapi.h>
-#include <sal/types.h>
-#include <sal/typesizes.h>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/xml/crypto/XXMLSignatureTemplate.hpp>
-#include <com/sun/star/xml/crypto/sax/ConstOfSecurityId.hpp>
-#include <com/sun/star/xml/wrapper/XXMLElementWrapper.hpp>
-#include <comphelper/processfactory.hxx>
-#include <cppuhelper/supportsservice.hxx>
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/inc/xsecfwdllapi.h b/xmlsecurity/inc/xsecfwdllapi.h
deleted file mode 100644
index d6cee81fd1b5..000000000000
--- a/xmlsecurity/inc/xsecfwdllapi.h
+++ /dev/null
@@ -1,23 +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/.
- */
-
-#ifndef INCLUDED_XMLSECURITY_INC_XSECFWDLLAPI_H
-#define INCLUDED_XMLSECURITY_INC_XSECFWDLLAPI_H
-
-#include <sal/types.h>
-
-#if defined(XSECFW_DLLIMPLEMENTATION)
-#define XSECFW_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
-#else
-#define XSECFW_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
-#endif
-
-#endif // INCLUDED_XMLSECURITY_INC_XSECFWDLLAPI_H
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */