Tag: cws_src680_dba22b User: fs Date: 2006/12/13 00:49:28 Removed: dba/connectivity/source/drivers/jdbc/Statement.cxx
Added: dba/connectivity/source/drivers/jdbc/JStatement.cxx Modified: dba/connectivity/source/drivers/jdbc/JConnection.cxx dba/connectivity/source/drivers/jdbc/ResultSet.cxx dba/connectivity/source/drivers/jdbc/makefile.mk Log: renamed Statement.* to JStatement.*, to prevent debugger conflicts with dbaccess-located files with the same name File Changes: Directory: /dba/connectivity/source/drivers/jdbc/ ================================================= File [changed]: JConnection.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/jdbc/JConnection.cxx?r1=1.1.2.1&r2=1.1.2.2 Delta lines: +4 -4 ------------------- --- JConnection.cxx 5 Dec 2006 14:51:29 -0000 1.1.2.1 +++ JConnection.cxx 13 Dec 2006 08:49:24 -0000 1.1.2.2 @@ -4,9 +4,9 @@ * * $RCSfile: JConnection.cxx,v $ * - * $Revision: 1.1.2.1 $ + * $Revision: 1.1.2.2 $ * - * last change: $Author: fs $ $Date: 2006/12/05 14:51:29 $ + * last change: $Author: fs $ $Date: 2006/12/13 08:49:24 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -46,7 +46,7 @@ #include "java/sql/DatabaseMetaData.hxx" #endif #ifndef _CONNECTIVITY_JAVA_SQL_STATEMENT_HXX_ -#include "java/sql/Statement.hxx" +#include "java/sql/JStatement.hxx" #endif #ifndef _CONNECTIVITY_JAVA_SQL_DRIVER_HXX_ #include "java/sql/Driver.hxx" File [added]: JStatement.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/jdbc/JStatement.cxx?rev=1.1.2.1&content-type=text/vnd.viewcvs-markup Added lines: 0 -------------- File [changed]: ResultSet.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/jdbc/ResultSet.cxx?r1=1.29&r2=1.29.36.1 Delta lines: +4 -4 ------------------- --- ResultSet.cxx 12 Oct 2006 11:30:51 -0000 1.29 +++ ResultSet.cxx 13 Dec 2006 08:49:25 -0000 1.29.36.1 @@ -4,9 +4,9 @@ * * $RCSfile: ResultSet.cxx,v $ * - * $Revision: 1.29 $ + * $Revision: 1.29.36.1 $ * - * last change: $Author: obo $ $Date: 2006/10/12 11:30:51 $ + * last change: $Author: fs $ $Date: 2006/12/13 08:49:25 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -39,7 +39,7 @@ #include "java/sql/ResultSet.hxx" #endif #ifndef _CONNECTIVITY_JAVA_SQL_STATEMENT_HXX_ -#include "java/sql/Statement.hxx" +#include "java/sql/JStatement.hxx" #endif #ifndef _CONNECTIVITY_JAVA_SQL_SQLWARNING_HXX_ #include "java/sql/SQLWarning.hxx" File [removed]: Statement.cxx File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/jdbc/makefile.mk?r1=1.15.210.1&r2=1.15.210.2 Delta lines: +3 -3 ------------------- --- makefile.mk 5 Dec 2006 14:51:29 -0000 1.15.210.1 +++ makefile.mk 13 Dec 2006 08:49:25 -0000 1.15.210.2 @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.15.210.1 $ +# $Revision: 1.15.210.2 $ # -# last change: $Author: fs $ $Date: 2006/12/05 14:51:29 $ +# last change: $Author: fs $ $Date: 2006/12/13 08:49:25 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -68,6 +68,7 @@ $(SLO)$/InputStream.obj \ $(SLO)$/JConnection.obj \ $(SLO)$/JDriver.obj \ + $(SLO)$/JStatement.obj \ $(SLO)$/Object.obj \ $(SLO)$/PreparedStatement.obj \ $(SLO)$/Reader.obj \ @@ -76,7 +77,6 @@ $(SLO)$/ResultSetMetaData.obj \ $(SLO)$/SQLException.obj \ $(SLO)$/SQLWarning.obj \ - $(SLO)$/Statement.obj \ $(SLO)$/String.obj \ $(SLO)$/Throwable.obj \ $(SLO)$/Timestamp.obj \ --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
