diff options
author | RĂ¼diger Timm <rt@openoffice.org> | 2008-04-10 08:26:26 +0000 |
---|---|---|
committer | RĂ¼diger Timm <rt@openoffice.org> | 2008-04-10 08:26:26 +0000 |
commit | 662eebb271e82a5962bf4885ac306af37defebad (patch) | |
tree | 6a889ad97d57a5d4c92850173dd2cb3f148ed2f1 /connectivity | |
parent | ec8e059a9437de33f073afc12842e5bdaa4e188d (diff) |
INTEGRATION: CWS changefileheader (1.42.22); FILE MERGED
2008/04/01 15:08:50 thb 1.42.22.3: #i85898# Stripping all external header guards
2008/04/01 10:53:04 thb 1.42.22.2: #i85898# Stripping all external header guards
2008/03/28 15:23:42 rt 1.42.22.1: #i87441# Change license header to LPGL v3.
Diffstat (limited to 'connectivity')
-rw-r--r-- | connectivity/source/drivers/jdbc/JDriver.cxx | 64 |
1 files changed, 19 insertions, 45 deletions
diff --git a/connectivity/source/drivers/jdbc/JDriver.cxx b/connectivity/source/drivers/jdbc/JDriver.cxx index 4007767200..f84ca99562 100644 --- a/connectivity/source/drivers/jdbc/JDriver.cxx +++ b/connectivity/source/drivers/jdbc/JDriver.cxx @@ -1,72 +1,46 @@ /************************************************************************* * - * OpenOffice.org - a multi-platform office productivity suite + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. * - * $RCSfile: JDriver.cxx,v $ + * OpenOffice.org - a multi-platform office productivity suite * - * $Revision: 1.42 $ + * $RCSfile: JDriver.cxx,v $ + * $Revision: 1.43 $ * - * last change: $Author: rt $ $Date: 2008-01-30 09:47:06 $ + * This file is part of OpenOffice.org. * - * The Contents of this file are made available subject to - * 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. * + * 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). * - * 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 + * 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_connectivity.hxx" - -#ifndef _CONNECTIVITY_JAVA_SQL_DRIVER_HXX_ #include "java/sql/Driver.hxx" -#endif -#ifndef _CONNECTIVITY_JAVA_LANG_OBJECT_HXX_ #include "java/lang/Object.hxx" -#endif -#ifndef _CONNECTIVITY_JAVA_LANG_CLASS_HXX_ #include "java/lang/Class.hxx" -#endif -#ifndef _CONNECTIVITY_JAVA_SQL_DRIVERMANAGER_HXX_ #include "java/sql/DriverManager.hxx" -#endif -#ifndef _CONNECTIVITY_JAVA_SQL_DRIVERPOPERTYINFO_HXX_ #include "java/sql/DriverPropertyInfo.hxx" -#endif -#ifndef _CONNECTIVITY_JAVA_SQL_CONNECTION_HXX_ #include "java/sql/Connection.hxx" -#endif #include "java/util/Property.hxx" -#ifndef _CONNECTIVITY_JAVA_TOOLS_HXX_ #include "java/tools.hxx" -#endif -#ifndef _DBHELPER_DBEXCEPTION_HXX_ #include "connectivity/dbexception.hxx" -#endif -#ifndef INCLUDED_JVMFWK_FRAMEWORK_H #include <jvmfwk/framework.h> -#endif -#ifndef CONNECTIVITY_DIAGNOSE_EX_H #include "diagnose_ex.h" -#endif #include "resource/jdbc_log.hrc" #include <comphelper/componentcontext.hxx> |