diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-09-23 10:40:13 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-09-23 10:40:13 +0000 |
| commit | a39fc0aa84bf814068d0c4ca52481f8ccc38bc8c (patch) | |
| tree | 2934831945d8ede1e81338e2fface29a714c5dbd /connectivity | |
| parent | b620344599fc574e8517aa49f832a0139aa7572d (diff) | |
INTEGRATION: CWS dba201b (1.5.38); FILE MERGED
2005/09/21 08:17:27 oj 1.5.38.2: RESYNC: (1.5-1.6); FILE MERGED
2005/07/11 13:56:40 fs 1.5.38.1: merging CWS dba201a into dba201b
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/source/drivers/hsqldb/StorageFileAccess.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx b/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx index 1a934160b56d..8aa77394e9f9 100644 --- a/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx +++ b/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx @@ -4,9 +4,9 @@ * * $RCSfile: StorageFileAccess.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: rt $ $Date: 2005-09-08 06:06:12 $ + * last change: $Author: hr $ $Date: 2005-09-23 11:40:13 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -119,7 +119,7 @@ JNIEXPORT jboolean JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess_removeElement (JNIEnv * env, jobject obj_this,jstring key, jstring name) { -#if OSL_DEBUG_LEVEL > 1 +#ifdef HSQLDB_DBG { ::rtl::OUString sKey = StorageContainer::jstring2ustring(env,key); ::rtl::OUString sName = StorageContainer::jstring2ustring(env,name); @@ -154,7 +154,7 @@ JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess_rem JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess_renameElement (JNIEnv * env, jobject obj_this,jstring key, jstring oldname, jstring newname) { -#if OSL_DEBUG_LEVEL > 1 +#ifdef HSQLDB_DBG { ::rtl::OUString sKey = StorageContainer::jstring2ustring(env,key); ::rtl::OUString sNewName = StorageContainer::jstring2ustring(env,newname); @@ -170,7 +170,7 @@ JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess_ren StorageContainer::removeURLPrefix(StorageContainer::jstring2ustring(env,oldname),aStoragePair.first.second), StorageContainer::removeURLPrefix(StorageContainer::jstring2ustring(env,newname),aStoragePair.first.second) ); -#if OSL_DEBUG_LEVEL > 1 +#ifdef HSQLDB_DBG { ::rtl::OUString sNewName = StorageContainer::removeURLPrefix(StorageContainer::jstring2ustring(env,newname),aStoragePair.first.second); OSL_ENSURE(aStoragePair.first.first->isStreamElement(sNewName),"Stream could not be renamed"); |