[Libreoffice-commits] core.git: xmlsecurity/inc xmlsecurity/Library_xsec_xmlsec.mk

[Libreoffice Gerrit user]

 xmlsecurity/Library_xsec_xmlsec.mk           |    1 -
 xmlsecurity/inc/gpg/SEInitializer.hxx        |    4 ++--
 xmlsecurity/inc/gpg/xmlsignature_gpgimpl.hxx |    4 ++--
 xmlsecurity/inc/xsecgpgdllapi.h              |   23 -----------------------
 4 files changed, 4 insertions(+), 28 deletions(-)

New commits:
commit 44403d99d878555e0a139931f5b6cf2c7a9df68c
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Wed Dec 12 22:49:33 2018 +0100
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Thu Dec 13 08:56:06 2018 +0100

    Library_xsec_xmlsec: one dll implementation macro is enough
    
    Change-Id: Ie6111c5e29d2fb6d2857c0c51d84b5b720713260
    Reviewed-on: https://gerrit.libreoffice.org/65064
    Tested-by: Jenkins
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>

diff --git a/xmlsecurity/Library_xsec_xmlsec.mk b/xmlsecurity/Library_xsec_xmlsec.mk
index 8efb4911fbbb..27972a2c87bc 100644
--- a/xmlsecurity/Library_xsec_xmlsec.mk
+++ b/xmlsecurity/Library_xsec_xmlsec.mk
@@ -28,7 +28,6 @@ $(eval $(call gb_Library_use_sdk_api,xsec_xmlsec))
 $(eval $(call gb_Library_add_defs,xsec_xmlsec,\
 	-DXMLSEC_NO_XSLT \
 	-DXSECXMLSEC_DLLIMPLEMENTATION \
-	-DXSECGPG_DLLIMPLEMENTATION \
 ))
 
 $(eval $(call gb_Library_set_precompiled_header,xsec_xmlsec,$(SRCDIR)/xmlsecurity/inc/pch/precompiled_xsec_xmlsec))
diff --git a/xmlsecurity/inc/gpg/SEInitializer.hxx b/xmlsecurity/inc/gpg/SEInitializer.hxx
index 7909acc5530b..0b6196e76d8e 100644
--- a/xmlsecurity/inc/gpg/SEInitializer.hxx
+++ b/xmlsecurity/inc/gpg/SEInitializer.hxx
@@ -19,10 +19,10 @@
 #include <com/sun/star/xml/crypto/XXMLSecurityContext.hpp>
 #include <com/sun/star/xml/crypto/XSEInitializer.hpp>
 
-#include <xsecgpgdllapi.h>
+#include <xsecxmlsecdllapi.h>
 #include <cppuhelper/implbase.hxx>
 
-class XSECGPG_DLLPUBLIC SEInitializerGpg : public cppu::WeakImplHelper
+class XSECXMLSEC_DLLPUBLIC SEInitializerGpg : public cppu::WeakImplHelper
 <
     css::xml::crypto::XSEInitializer,
     css::lang::XServiceInfo
diff --git a/xmlsecurity/inc/gpg/xmlsignature_gpgimpl.hxx b/xmlsecurity/inc/gpg/xmlsignature_gpgimpl.hxx
index e5b5099a6730..7779e4b6f003 100644
--- a/xmlsecurity/inc/gpg/xmlsignature_gpgimpl.hxx
+++ b/xmlsecurity/inc/gpg/xmlsignature_gpgimpl.hxx
@@ -22,7 +22,7 @@
 
 #include <sal/config.h>
 #include <rtl/ustring.hxx>
-#include <xsecgpgdllapi.h>
+#include <xsecxmlsecdllapi.h>
 
 #include <cppuhelper/factory.hxx>
 #include <cppuhelper/implbase.hxx>
@@ -36,7 +36,7 @@
 #include <com/sun/star/xml/crypto/XXMLSignatureTemplate.hpp>
 #include <com/sun/star/xml/crypto/XXMLSecurityContext.hpp>
 
-class XSECGPG_DLLPUBLIC XMLSignature_GpgImpl : public ::cppu::WeakImplHelper<
+class XSECXMLSEC_DLLPUBLIC XMLSignature_GpgImpl : public ::cppu::WeakImplHelper<
     css::xml::crypto::XXMLSignature ,
     css::lang::XServiceInfo >
 {
diff --git a/xmlsecurity/inc/xsecgpgdllapi.h b/xmlsecurity/inc/xsecgpgdllapi.h
deleted file mode 100644
index 741c830b74a7..000000000000
--- a/xmlsecurity/inc/xsecgpgdllapi.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_XSECGPGDLLAPI_H
-#define INCLUDED_XMLSECURITY_INC_XSECGPGDLLAPI_H
-
-#include <sal/types.h>
-
-#if defined(XSECGPG_DLLIMPLEMENTATION)
-#define XSECGPG_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
-#else
-#define XSECGPG_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
-#endif
-
-#endif // INCLUDED_XMLSECURITY_INC_XSECGPGDLLAPI_H
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */