[Libreoffice-commits] core.git: xmlsecurity/source

[Stephan Bergmann]

 xmlsecurity/source/xmlsec/nss/secerror.cxx                    |    1 
 xmlsecurity/source/xmlsec/nss/secerror.hxx                    |    5 +
 xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx |   12 ---
 xmlsecurity/source/xmlsec/nss/xsec_nss.cxx                    |    1 
 xmlsecurity/source/xmlsec/xsec_xmlsec.cxx                     |    7 -
 xmlsecurity/source/xmlsec/xsec_xmlsec.hxx                     |   37 ++++++++++
 6 files changed, 45 insertions(+), 18 deletions(-)

New commits:
commit bfed8b9c9b76ea8eca7c4938d86b3a6ea6436b6e
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Apr 14 16:00:03 2014 +0200

    Clean up function declarations
    
    Change-Id: I448e0cf2abeeafb0f6266baeb95705b3a11705a4

diff --git a/xmlsecurity/source/xmlsec/nss/secerror.cxx b/xmlsecurity/source/xmlsec/nss/secerror.cxx
index eab5b5e..5aaf4e1 100644
--- a/xmlsecurity/source/xmlsec/nss/secerror.cxx
+++ b/xmlsecurity/source/xmlsec/nss/secerror.cxx
@@ -19,6 +19,7 @@
 
 
 #include "secerr.h"
+#include "secerror.hxx"
 #include "sslerr.h"
 #include "nspr.h"
 #include "nss.h"
diff --git a/xmlsecurity/source/xmlsec/nss/secerror.hxx b/xmlsecurity/source/xmlsec/nss/secerror.hxx
index 8d02873..ded3f19 100644
--- a/xmlsecurity/source/xmlsec/nss/secerror.hxx
+++ b/xmlsecurity/source/xmlsec/nss/secerror.hxx
@@ -20,6 +20,11 @@
 #ifndef _XSECERROR_HXX_
 #define _XSECERROR_HXX_
 
+#include <sal/config.h>
+
+#include <certt.h>
+#include <nspr.h>
+
 const char *
 getCertError(PRErrorCode errNum);
 
diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
index 85844e4..91b59e3 100644
--- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
@@ -75,18 +75,6 @@ struct UsageDescription
     : usage( i_usage )
     , description( i_description )
     {}
-
-    UsageDescription( const UsageDescription& aDescription )
-    : usage( aDescription.usage )
-    , description( aDescription.description )
-    {}
-
-    UsageDescription& operator =( const UsageDescription& aDescription )
-    {
-        usage = aDescription.usage;
-        description = aDescription.description;
-        return *this;
-    }
 };
 
 
diff --git a/xmlsecurity/source/xmlsec/nss/xsec_nss.cxx b/xmlsecurity/source/xmlsec/nss/xsec_nss.cxx
index 53bea64..1ad2903 100644
--- a/xmlsecurity/source/xmlsec/nss/xsec_nss.cxx
+++ b/xmlsecurity/source/xmlsec/nss/xsec_nss.cxx
@@ -30,6 +30,7 @@
 #include "xmlsignature_nssimpl.hxx"
 #include "xmlencryption_nssimpl.hxx"
 #include "xmlsecuritycontext_nssimpl.hxx"
+#include "xsec_xmlsec.hxx"
 #include "securityenvironment_nssimpl.hxx"
 
 using namespace ::rtl;
diff --git a/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx b/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx
index c333b35..c07f301 100644
--- a/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx
+++ b/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx
@@ -25,6 +25,7 @@
 #include "serialnumberadapter.hxx"
 #include "xmlelementwrapper_xmlsecimpl.hxx"
 #include "xmldocumentwrapper_xmlsecimpl.hxx"
+#include "xsec_xmlsec.hxx"
 
 using namespace ::cppu;
 using namespace ::com::sun::star::uno;
@@ -33,12 +34,6 @@ using namespace ::com::sun::star::lang;
 extern "C"
 {
 
-extern void* nss_component_getFactory( const sal_Char*, void*, void* );
-
-#if defined( XMLSEC_CRYPTO_MSCRYPTO )
-extern void* mscrypt_component_getFactory( const sal_Char*, void*, void* );
-#endif
-
 SAL_DLLPUBLIC_EXPORT void* SAL_CALL xsec_xmlsec_component_getFactory( const sal_Char* pImplName , void* pServiceManager , void* pRegistryKey )
 {
     void* pRet = 0;
diff --git a/xmlsecurity/source/xmlsec/xsec_xmlsec.hxx b/xmlsecurity/source/xmlsec/xsec_xmlsec.hxx
new file mode 100644
index 0000000..5ecdf4e
--- /dev/null
+++ b/xmlsecurity/source/xmlsec/xsec_xmlsec.hxx
@@ -0,0 +1,37 @@
+/* -*- 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_XMLSECURITY_SOURCE_XMLSEC_XSEC_XMLSEC_HXX
+#define INCLUDED_XMLSECURITY_SOURCE_XMLSEC_XSEC_XMLSEC_HXX
+
+#include <sal/config.h>
+
+extern "C" {
+
+void* nss_component_getFactory( const sal_Char*, void*, void* );
+
+#if defined( XMLSEC_CRYPTO_MSCRYPTO )
+void* mscrypt_component_getFactory( const sal_Char*, void*, void* );
+#endif
+
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */