diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-01-15 12:38:26 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-01-15 12:38:26 +0000 |
| commit | 474184dc7a7f6c0527b782678be5f5f2e14d2cf8 (patch) | |
| tree | 01effd1158a4d1c40e96bd5f4ace73aee88d70b4 /connectivity | |
| parent | 279e72d71a03faa8bbb0f23f892a7966643b2d3a (diff) | |
INTEGRATION: CWS dba22b (1.9.110); FILE MERGED
2006/12/13 08:48:39 fs 1.9.110.1: renamed Statement.* to JStatement.*, to prevent debugger conflicts with dbaccess-located files with the same name
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/source/inc/java/sql/PreparedStatement.hxx | 6 | ||||
| -rw-r--r-- | connectivity/source/inc/java/sql/ResultSet.hxx | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/connectivity/source/inc/java/sql/PreparedStatement.hxx b/connectivity/source/inc/java/sql/PreparedStatement.hxx index ae0393075fe4..4200a080d1be 100644 --- a/connectivity/source/inc/java/sql/PreparedStatement.hxx +++ b/connectivity/source/inc/java/sql/PreparedStatement.hxx @@ -4,9 +4,9 @@ * * $RCSfile: PreparedStatement.hxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: hr $ $Date: 2006-06-20 02:03:56 $ + * last change: $Author: vg $ $Date: 2007-01-15 13:38:08 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -36,7 +36,7 @@ #define _CONNECTIVITY_JAVA_SQL_PREPAREDSTATEMENT_HXX_ #ifndef _CONNECTIVITY_JAVA_SQL_STATEMENT_HXX_ -#include "java/sql/Statement.hxx" +#include "java/sql/JStatement.hxx" #endif #ifndef _COM_SUN_STAR_SDBC_XPREPAREDSTATEMENT_HPP_ #include <com/sun/star/sdbc/XPreparedStatement.hpp> diff --git a/connectivity/source/inc/java/sql/ResultSet.hxx b/connectivity/source/inc/java/sql/ResultSet.hxx index 85166d7ba495..c01ee5634f32 100644 --- a/connectivity/source/inc/java/sql/ResultSet.hxx +++ b/connectivity/source/inc/java/sql/ResultSet.hxx @@ -4,9 +4,9 @@ * * $RCSfile: ResultSet.hxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: hr $ $Date: 2006-06-20 02:04:08 $ + * last change: $Author: vg $ $Date: 2007-01-15 13:38:26 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -75,7 +75,7 @@ #include "connectivity/CommonTools.hxx" #endif #ifndef _CONNECTIVITY_JAVA_SQL_STATEMENT_HXX_ -#include "java/sql/Statement.hxx" +#include "java/sql/JStatement.hxx" #endif #ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ #include <com/sun/star/lang/XServiceInfo.hpp> |