INTEGRATION: CWS changefileheader (1.2.26); FILE MERGED

2008/04/01 13:00:11 thb 1.2.26.2: #i85898# Stripping all external header guards
2008/03/31 15:33:14 rt 1.2.26.1: #i87441# Change license header to LPGL v3.

2 files changed, 52 insertions, 74 deletions

diff --git a/uui/source/sslwarndlg.hxx b/uui/source/sslwarndlg.hxx
index 1a59303f3bed..d9b465309486 100644
--- a/uui/source/sslwarndlg.hxx
+++ b/uui/source/sslwarndlg.hxx
@@ -1,36 +1,31 @@
 /*************************************************************************
 *
-*  OpenOffice.org - a multi-platform office productivity suite
-*
-*  $RCSfile: sslwarndlg.hxx,v $
-*
-*  $Revision: 1.2 $
-*
-*  last change: $Author: rt $ $Date: 2007-11-07 10:11:19 $
-*
-*  The Contents of this file are made available subject to
-*  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
-*    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
-*
+ * 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
+ *
+ * $RCSfile: sslwarndlg.hxx,v $
+ * $Revision: 1.3 $
+ *
+ * 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.
+ *
+ * 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).
+ *
+ * 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.
+ *
 ************************************************************************/
 #ifndef UUI_SSLWARN_HXX
 #define UUI_SSLWARN_HXX
@@ -40,17 +35,11 @@
 
 #include <vcl/fixed.hxx>
 #include <vcl/button.hxx>
-
-#ifndef _COM_SUN_STAR_SECURITY_XCERTIFICATE_HPP_
 #include <com/sun/star/security/XCertificate.hpp>
-#endif
 #ifndef _COM_SUN_STAR_XML_CRYPTO_XXSECURITYENVIRONMENT_HPP_
 #include <com/sun/star/xml/crypto/XSecurityEnvironment.hpp>
 #endif
-
-#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#endif
 
 namespace cssu = com::sun::star::uno;
 namespace dcss = ::com::sun::star;
diff --git a/uui/source/unknownauthdlg.hxx b/uui/source/unknownauthdlg.hxx
index 6a714b422330..7541f324c763 100644
--- a/uui/source/unknownauthdlg.hxx
+++ b/uui/source/unknownauthdlg.hxx
@@ -1,36 +1,31 @@
 /*************************************************************************
 *
-*  OpenOffice.org - a multi-platform office productivity suite
-*
-*  $RCSfile: unknownauthdlg.hxx,v $
-*
-*  $Revision: 1.2 $
-*
-*  last change: $Author: rt $ $Date: 2007-11-07 10:12:10 $
-*
-*  The Contents of this file are made available subject to
-*  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
-*    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
-*
+ * 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
+ *
+ * $RCSfile: unknownauthdlg.hxx,v $
+ * $Revision: 1.3 $
+ *
+ * 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.
+ *
+ * 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).
+ *
+ * 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.
+ *
 ************************************************************************/
 #ifndef UUI_UNKNOWNAUTH_HXX
 #define UUI_UNKNOWNAUTH_HXX
@@ -40,17 +35,11 @@
 
 #include <vcl/fixed.hxx>
 #include <vcl/button.hxx>
-
-#ifndef _COM_SUN_STAR_SECURITY_XCERTIFICATE_HPP_
 #include <com/sun/star/security/XCertificate.hpp>
-#endif
 #ifndef _COM_SUN_STAR_XML_CRYPTO_XXSECURITYENVIRONMENT_HPP_
 #include <com/sun/star/xml/crypto/XSecurityEnvironment.hpp>
 #endif
-
-#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#endif
 
 namespace cssu = com::sun::star::uno;
 namespace dcss = ::com::sun::star;