User: vg Date: 05/02/16 07:52:15 Modified: /dba/connectivity/source/drivers/hsqldb/ StorageFileAccess.cxx
Log: INTEGRATION: CWS hsqldb2 (1.2.20); FILE MERGED 2005/01/19 07:03:30 oj 1.2.20.1: #i39922# remove db from stream name 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.2&r2=1.3 Delta lines: +30 -12 --------------------- --- StorageFileAccess.cxx 9 Nov 2004 12:09:13 -0000 1.2 +++ StorageFileAccess.cxx 16 Feb 2005 15:52:12 -0000 1.3 @@ -96,12 +96,30 @@ JNIEXPORT jboolean JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess_isStreamElement (JNIEnv * env, jobject obj_this,jstring key, jstring name) { - Reference< XStorage> xStorage = StorageContainer::getRegisteredStorage(StorageContainer::jstring2ustring(env,key)); - if ( xStorage.is() ) + TStorages::mapped_type aStoragePair = StorageContainer::getRegisteredStorage(StorageContainer::jstring2ustring(env,key)); + if ( aStoragePair.first.first.is() ) { try { - return xStorage->isStreamElement(StorageContainer::removeURLPrefix(StorageContainer::jstring2ustring(env,name))); + ::rtl::OUString sName = StorageContainer::jstring2ustring(env,name); + try + { + ::rtl::OUString sOldName = StorageContainer::removeOldURLPrefix(sName); + if ( aStoragePair.first.first->isStreamElement(sOldName) ) + { + try + { + aStoragePair.first.first->renameElement(sOldName,StorageContainer::removeURLPrefix(sName,aStoragePair.first.second)); + } + catch(Exception&) + { + } + } + } + catch(NoSuchElementException&) + { + } + return aStoragePair.first.first->isStreamElement(StorageContainer::removeURLPrefix(sName,aStoragePair.first.second)); } catch(NoSuchElementException&) { @@ -130,12 +148,12 @@ JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess_removeElement (JNIEnv * env, jobject obj_this,jstring key, jstring name) { - Reference< XStorage> xStorage = StorageContainer::getRegisteredStorage(StorageContainer::jstring2ustring(env,key)); - if ( xStorage.is() ) + TStorages::mapped_type aStoragePair = StorageContainer::getRegisteredStorage(StorageContainer::jstring2ustring(env,key)); + if ( aStoragePair.first.first.is() ) { try { - xStorage->removeElement(StorageContainer::removeURLPrefix(StorageContainer::jstring2ustring(env,name))); + aStoragePair.first.first->removeElement(StorageContainer::removeURLPrefix(StorageContainer::jstring2ustring(env,name),aStoragePair.first.second)); } catch(NoSuchElementException&) { @@ -163,12 +181,12 @@ JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess_renameElement (JNIEnv * env, jobject obj_this,jstring key, jstring oldname, jstring newname) { - Reference< XStorage> xStorage = StorageContainer::getRegisteredStorage(StorageContainer::jstring2ustring(env,key)); - if ( xStorage.is() ) + TStorages::mapped_type aStoragePair = StorageContainer::getRegisteredStorage(StorageContainer::jstring2ustring(env,key)); + if ( aStoragePair.first.first.is() ) { try { - xStorage->renameElement(StorageContainer::removeURLPrefix(StorageContainer::jstring2ustring(env,oldname)),StorageContainer::removeURLPrefix(StorageContainer::jstring2ustring(env,newname))); + aStoragePair.first.first->renameElement(StorageContainer::removeURLPrefix(StorageContainer::jstring2ustring(env,oldname),aStoragePair.first.second),StorageContainer::removeURLPrefix(StorageContainer::jstring2ustring(env,newname),aStoragePair.first.second)); } catch(NoSuchElementException&) { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
