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.
This commit is contained in:
Rüdiger Timm
2008-04-10 23:33:39 +00:00
parent e40dd228df
commit 0d076d422b

View File

@@ -1,56 +1,39 @@
/************************************************************************* /*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* Copyright 2008 by Sun Microsystems, Inc.
* *
* OpenOffice.org - a multi-platform office productivity suite * OpenOffice.org - a multi-platform office productivity suite
* *
* $RCSfile: x509certificate_mscryptimpl.cxx,v $ * $RCSfile: x509certificate_mscryptimpl.cxx,v $
* $Revision: 1.12 $
* *
* $Revision: 1.11 $ * This file is part of OpenOffice.org.
* *
* last change: $Author: ihi $ $Date: 2007-04-17 10:25:15 $ * 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.
* *
* The Contents of this file are made available subject to * OpenOffice.org is distributed in the hope that it will be useful,
* the terms of GNU Lesser General Public License Version 2.1.
*
*
* GNU Lesser General Public License Version 2.1
* =============================================
* Copyright 2005 by Sun Microsystems, Inc.
* 901 San Antonio Road, Palo Alto, CA 94303, USA
*
* 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 * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* Lesser General Public License for more details. * GNU Lesser General Public License version 3 for more details
* (a copy is included in the LICENSE file that accompanied this code).
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public License
* License along with this library; if not, write to the Free Software * version 3 along with OpenOffice.org. If not, see
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, * <http://www.openoffice.org/license.html>
* MA 02111-1307 USA * for a copy of the LGPLv3 License.
* *
************************************************************************/ ************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove // MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_xmlsecurity.hxx" #include "precompiled_xmlsecurity.hxx"
#ifndef _SAL_CONFIG_H_
#include <sal/config.h> #include <sal/config.h>
#endif
#ifndef _RTL_UUID_H_
#include <rtl/uuid.h> #include <rtl/uuid.h>
#endif
#ifndef _X509CERTIFICATE_MSCRYPTIMPL_HXX_
#include "x509certificate_mscryptimpl.hxx" #include "x509certificate_mscryptimpl.hxx"
#endif
#ifndef _CERTIFICATEEXTENSION_XMLSECIMPL_HXX_
#include "certificateextension_xmlsecimpl.hxx" #include "certificateextension_xmlsecimpl.hxx"
#endif
//MM : added by MM //MM : added by MM
#include "oid.hxx" #include "oid.hxx"
@@ -59,10 +42,7 @@
//CP : added by CP //CP : added by CP
#include <rtl/locale.h> #include <rtl/locale.h>
#include <osl/nlsupport.h> #include <osl/nlsupport.h>
#ifndef _OSL_PROCESS_H_
#include <osl/process.h> #include <osl/process.h>
#endif
//CP : end //CP : end