summaryrefslogtreecommitdiff
path: root/xmlsecurity
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2008-04-10 23:33:39 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2008-04-10 23:33:39 +0000
commit0d076d422bef659b36d9334490d1a5bf7449ef7c (patch)
tree646c8f9483626e955d2460d632ea289394473ee0 /xmlsecurity
parente40dd228dfa8b0ff5bbe5df6d7994198cc08cec1 (diff)
INTEGRATION: CWS changefileheader (1.11.66); FILE MERGED
2008/04/01 16:11:04 thb 1.11.66.3: #i85898# Stripping all external header guards 2008/04/01 13:06:25 thb 1.11.66.2: #i85898# Stripping all external header guards 2008/03/31 16:31:04 rt 1.11.66.1: #i87441# Change license header to LPGL v3.
Diffstat (limited to 'xmlsecurity')
-rw-r--r--xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx56
1 files changed, 18 insertions, 38 deletions
diff --git a/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx
index 5d8e8d52b4dd..00049d2901fc 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx
@@ -1,56 +1,39 @@
/*************************************************************************
*
- * OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * $RCSfile: x509certificate_mscryptimpl.cxx,v $
+ * Copyright 2008 by Sun Microsystems, Inc.
*
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
- * last change: $Author: ihi $ $Date: 2007-04-17 10:25:15 $
+ * $RCSfile: x509certificate_mscryptimpl.cxx,v $
+ * $Revision: 1.12 $
*
- * The Contents of this file are made available subject to
- * the terms of GNU Lesser General Public License Version 2.1.
+ * This file is part of OpenOffice.org.
*
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
*
- * GNU Lesser General Public License Version 2.1
- * =============================================
- * Copyright 2005 by Sun Microsystems, Inc.
- * 901 San Antonio Road, Palo Alto, CA 94303, USA
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License version 2.1, as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
*
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_xmlsecurity.hxx"
-
-#ifndef _SAL_CONFIG_H_
#include <sal/config.h>
-#endif
-
-#ifndef _RTL_UUID_H_
#include <rtl/uuid.h>
-#endif
-
-#ifndef _X509CERTIFICATE_MSCRYPTIMPL_HXX_
#include "x509certificate_mscryptimpl.hxx"
-#endif
-
-#ifndef _CERTIFICATEEXTENSION_XMLSECIMPL_HXX_
#include "certificateextension_xmlsecimpl.hxx"
-#endif
//MM : added by MM
#include "oid.hxx"
@@ -59,10 +42,7 @@
//CP : added by CP
#include <rtl/locale.h>
#include <osl/nlsupport.h>
-
-#ifndef _OSL_PROCESS_H_
#include <osl/process.h>
-#endif
//CP : end