diff options
author | RĂ¼diger Timm <rt@openoffice.org> | 2008-04-10 08:26:57 +0000 |
---|---|---|
committer | RĂ¼diger Timm <rt@openoffice.org> | 2008-04-10 08:26:57 +0000 |
commit | 49bfbd556c68ab93779c13d3a79191b778463b57 (patch) | |
tree | 203be5689480ab567d41852e4768ad66ac70fc87 | |
parent | 18fc1d5a7a1e327b8387047fb7a02f72e44f67ad (diff) |
INTEGRATION: CWS changefileheader (1.23.122); FILE MERGED
2008/04/01 15:08:51 thb 1.23.122.3: #i85898# Stripping all external header guards
2008/04/01 10:53:04 thb 1.23.122.2: #i85898# Stripping all external header guards
2008/03/28 15:23:42 rt 1.23.122.1: #i87441# Change license header to LPGL v3.
-rw-r--r-- | connectivity/source/drivers/jdbc/Object.cxx | 57 |
1 files changed, 19 insertions, 38 deletions
diff --git a/connectivity/source/drivers/jdbc/Object.cxx b/connectivity/source/drivers/jdbc/Object.cxx index 2b314138b1..b5251960a4 100644 --- a/connectivity/source/drivers/jdbc/Object.cxx +++ b/connectivity/source/drivers/jdbc/Object.cxx @@ -1,35 +1,30 @@ /************************************************************************* * - * 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: Object.cxx,v $ + * OpenOffice.org - a multi-platform office productivity suite * - * $Revision: 1.23 $ + * $RCSfile: Object.cxx,v $ + * $Revision: 1.24 $ * - * last change: $Author: hr $ $Date: 2007-06-27 14:36:43 $ + * 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. * ************************************************************************/ @@ -41,27 +36,13 @@ #include "java/lang/Class.hxx" #endif #include "connectivity/CommonTools.hxx" - -#ifndef _COM_SUN_STAR_UNO_EXCEPTION_HPP_ #include <com/sun/star/uno/Exception.hpp> -#endif -#ifndef _CONNECTIVITY_JAVA_TOOLS_HXX_ #include "java/tools.hxx" -#endif -#ifndef _CONNECTIVITY_JAVA_SQL_SQLEXCEPTION_HXX_ #include "java/sql/SQLException.hxx" -#endif -#ifndef _VOS_PROCESS_HXX_ #include <vos/process.hxx> -#endif -#ifndef _VOS_MUTEX_HXX_ #include <vos/mutex.hxx> -#endif #include <osl/thread.h> - -#ifndef _COM_SUN_STAR_UNO_SEQUENCE_HXX_ #include <com/sun/star/uno/Sequence.hxx> -#endif #include "resource/jdbc_log.hrc" |