INTEGRATION: CWS changefileheader (1.2.372); FILE MERGED

2008/04/01 10:53:37 thb 1.2.372.2: #i85898# Stripping all external header guards 2008/03/28 15:24:30 rt 1.2.372.1: #i87441# Change license header to LPGL v3.

INTEGRATION: CWS changefileheader (1.2.372); FILE MERGED
2008/04/01 10:53:37 thb 1.2.372.2: #i85898# Stripping all external header guards 2008/03/28 15:24:30 rt 1.2.372.1: #i87441# Change license header to LPGL v3.
e8c5bf6e · Rüdiger Timm · 44cbbfc9 · e8c5bf6e · e8c5bf6e · e8c5bf6e
Kaydet (Commit) e8c5bf6e authored Nis 10, 2008 tarafından Rüdiger Timm
3 changed files
--- a/connectivity/source/inc/java/sql/DriverPropertyInfo.hxx
+++ b/connectivity/source/inc/java/sql/DriverPropertyInfo.hxx
 /*************************************************************************
 *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
- *  $RCSfile: DriverPropertyInfo.hxx,v $
+ * Copyright 2008 by Sun Microsystems, Inc.
 *
- *  $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
 *
- *  last change: $Author: rt $ $Date: 2005-09-08 07:21:58 $
+ * $RCSfile: DriverPropertyInfo.hxx,v $
+ * $Revision: 1.3 $
 *
- *  The Contents of this file are made available subject to
+ * This file is part of OpenOffice.org.
- *  the terms of GNU Lesser General Public License Version 2.1.
 *
+ * 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
+ * OpenOffice.org is distributed in the hope that it will be useful,
- *    =============================================
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    Copyright 2005 by Sun Microsystems, Inc.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
+ * 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
+ * You should have received a copy of the GNU Lesser General Public License
- *    modify it under the terms of the GNU Lesser General Public
+ * version 3 along with OpenOffice.org.  If not, see
- *    License version 2.1, as published by the Free Software Foundation.
+ * <http://www.openoffice.org/license.html>
- *
+ * for a copy of the LGPLv3 License.
- *    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
 *
 ************************************************************************/
 #ifndef _CONNECTIVITY_JAVA_SQL_DRIVERPOPERTYINFO_HXX_
 #define _CONNECTIVITY_JAVA_SQL_DRIVERPOPERTYINFO_HXX_
-#ifndef _CONNECTIVITY_JAVA_LANG_OBJECT_HXX_
 #include "java/lang/Object.hxx"
-#endif
-#ifndef _COM_SUN_STAR_SDBC_DRIVERPROPERTYINFO_HPP_
 #include <com/sun/star/sdbc/DriverPropertyInfo.hpp>
-#endif
 namespace connectivity
 {

--- a/connectivity/source/inc/java/sql/SQLException.hxx
+++ b/connectivity/source/inc/java/sql/SQLException.hxx
 /*************************************************************************
 *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
- *  $RCSfile: SQLException.hxx,v $
+ * Copyright 2008 by Sun Microsystems, Inc.
 *
- *  $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
 *
- *  last change: $Author: rt $ $Date: 2005-09-08 07:23:28 $
+ * $RCSfile: SQLException.hxx,v $
+ * $Revision: 1.3 $
 *
- *  The Contents of this file are made available subject to
+ * This file is part of OpenOffice.org.
- *  the terms of GNU Lesser General Public License Version 2.1.
 *
+ * 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
+ * OpenOffice.org is distributed in the hope that it will be useful,
- *    =============================================
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    Copyright 2005 by Sun Microsystems, Inc.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
+ * 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
+ * You should have received a copy of the GNU Lesser General Public License
- *    modify it under the terms of the GNU Lesser General Public
+ * version 3 along with OpenOffice.org.  If not, see
- *    License version 2.1, as published by the Free Software Foundation.
+ * <http://www.openoffice.org/license.html>
- *
+ * for a copy of the LGPLv3 License.
- *    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
 *
 ************************************************************************/
 #ifndef _CONNECTIVITY_JAVA_SQL_SQLEXCEPTION_HXX_
 #define _CONNECTIVITY_JAVA_SQL_SQLEXCEPTION_HXX_
-#ifndef _CONNECTIVITY_JAVA_LANG_EXCEPTION_HXX_
 #include "java/lang/Exception.hxx"
-#endif
-#ifndef _COM_SUN_STAR_SDBC_SQLEXCEPTION_HPP_
 #include <com/sun/star/sdbc/SQLException.hpp>
-#endif
 namespace connectivity
 {

--- a/connectivity/source/inc/java/sql/SQLWarning.hxx
+++ b/connectivity/source/inc/java/sql/SQLWarning.hxx
 /*************************************************************************
 *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
- *  $RCSfile: SQLWarning.hxx,v $
+ * Copyright 2008 by Sun Microsystems, Inc.
 *
- *  $Revision: 1.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
 *
- *  last change: $Author: rt $ $Date: 2005-09-08 07:23:44 $
+ * $RCSfile: SQLWarning.hxx,v $
+ * $Revision: 1.3 $
 *
- *  The Contents of this file are made available subject to
+ * This file is part of OpenOffice.org.
- *  the terms of GNU Lesser General Public License Version 2.1.
 *
+ * 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
+ * OpenOffice.org is distributed in the hope that it will be useful,
- *    =============================================
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    Copyright 2005 by Sun Microsystems, Inc.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
+ * 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
+ * You should have received a copy of the GNU Lesser General Public License
- *    modify it under the terms of the GNU Lesser General Public
+ * version 3 along with OpenOffice.org.  If not, see
- *    License version 2.1, as published by the Free Software Foundation.
+ * <http://www.openoffice.org/license.html>
- *
+ * for a copy of the LGPLv3 License.
- *    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
 *
 ************************************************************************/
 #ifndef _CONNECTIVITY_JAVA_SQL_SQLWARNING_HXX_
 #define _CONNECTIVITY_JAVA_SQL_SQLWARNING_HXX_
-#ifndef _CONNECTIVITY_JAVA_SQL_SQLEXCEPTION_HXX_
 #include "java/sql/SQLException.hxx"
-#endif
 //#ifndef _COM_SUN_STAR_SDBC_SQLWARNING_HPP_
 //#include <com/sun/star/sdbc/SQLWarning.hpp>
 //#endif