diff options
author | RĂ¼diger Timm <rt@openoffice.org> | 2008-04-10 23:11:15 +0000 |
---|---|---|
committer | RĂ¼diger Timm <rt@openoffice.org> | 2008-04-10 23:11:15 +0000 |
commit | 924f289210852841610f45b151e677cc7f371078 (patch) | |
tree | 6af731e688c7401e9c9cf1d61435a2921235ce30 /xmlsecurity/source/dialogs/certificatechooser.cxx | |
parent | 36b0830d8eb38465731030640c7a56ba64e9a057 (diff) |
INTEGRATION: CWS changefileheader (1.11.66); FILE MERGED
2008/04/01 16:10:54 thb 1.11.66.3: #i85898# Stripping all external header guards
2008/04/01 13:06:18 thb 1.11.66.2: #i85898# Stripping all external header guards
2008/03/31 16:30:56 rt 1.11.66.1: #i87441# Change license header to LPGL v3.
Diffstat (limited to 'xmlsecurity/source/dialogs/certificatechooser.cxx')
-rw-r--r-- | xmlsecurity/source/dialogs/certificatechooser.cxx | 50 |
1 files changed, 18 insertions, 32 deletions
diff --git a/xmlsecurity/source/dialogs/certificatechooser.cxx b/xmlsecurity/source/dialogs/certificatechooser.cxx index 0a0508d5a09b..8e618d786fcb 100644 --- a/xmlsecurity/source/dialogs/certificatechooser.cxx +++ b/xmlsecurity/source/dialogs/certificatechooser.cxx @@ -1,35 +1,30 @@ /************************************************************************* * - * OpenOffice.org - a multi-platform office productivity suite + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * $RCSfile: certificatechooser.cxx,v $ + * Copyright 2008 by Sun Microsystems, Inc. * - * $Revision: 1.11 $ + * OpenOffice.org - a multi-platform office productivity suite * - * last change: $Author: rt $ $Date: 2007-04-26 08:17:03 $ + * $RCSfile: certificatechooser.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. * ************************************************************************/ @@ -39,24 +34,15 @@ #include <xmlsecurity/certificatechooser.hxx> #include <xmlsecurity/certificateviewer.hxx> #include <xmlsecurity/biginteger.hxx> - -#ifndef _COM_SUN_STAR_XML_CRYPTO_XSECURITYENVIRONMENT_HPP_ #include <com/sun/star/xml/crypto/XSecurityEnvironment.hpp> -#endif - -#ifndef _COMPHELPER_SEQUENCE_HXX_ #include <comphelper/sequence.hxx> -#endif #include <com/sun/star/security/NoPasswordException.hpp> #include <com/sun/star/security/CertificateCharacters.hpp> #include <dialogs.hrc> #include <resourcemanager.hxx> - -#ifndef _SV_MSGBOX_HXX #include <vcl/msgbox.hxx> -#endif /* HACK: disable some warnings for MS-C */ #ifdef _MSC_VER |