User: hr Date: 05/09/23 04:40:15 Modified: /dba/connectivity/source/drivers/hsqldb/ StorageFileAccess.cxx
Log: 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 File Changes: Directory: /dba/connectivity/source/drivers/hsqldb/ =================================================== File [changed]: StorageFileAccess.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx?r1=1.6&r2=1.7 Delta lines: +3 -3 ------------------- --- StorageFileAccess.cxx 8 Sep 2005 06:06:12 -0000 1.6 +++ StorageFileAccess.cxx 23 Sep 2005 11:40:13 -0000 1.7 @@ -119,7 +119,7 @@ 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_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 @@ 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"); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
