User: vg Date: 05/02/16 07:50:48 Modified: /dba/connectivity/source/drivers/hsqldb/ HStorage.cxx
Log: INTEGRATION: CWS hsqldb2 (1.3.20); FILE MERGED 2005/01/19 07:03:26 oj 1.3.20.1: #i39922# remove db from stream name File Changes: Directory: /dba/connectivity/source/drivers/hsqldb/ =================================================== File [changed]: HStorage.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/hsqldb/HStorage.cxx?r1=1.3&r2=1.4 Delta lines: +29 -4 -------------------- --- HStorage.cxx 11 Nov 2004 15:15:45 -0000 1.3 +++ HStorage.cxx 16 Feb 2005 15:50:45 -0000 1.4 @@ -71,6 +71,7 @@ #ifndef _COMPHELPER_PROCESSFACTORY_HXX_ #include <comphelper/processfactory.hxx> #endif +#include "hsqldb/HStorageMap.hxx" #include <string.h> #include <rtl/logfile.hxx> @@ -82,6 +83,7 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::io; using namespace ::com::sun::star::embed; +using namespace ::com::sun::star::container; using namespace ::com::sun::star::document; using namespace ::osl; //-------------------------------------------------------------------- @@ -175,7 +177,30 @@ m_xStorge = m_xDS->getDocumentSubStorage(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("database")),nMode); if ( !m_xStorge.is() ) throw Exception(); - m_xStream = m_xStorge->openStreamElement(sName,nMode); + try + { + try + { + ::rtl::OUString sOldName = StorageContainer::removeOldURLPrefix(sName); + if ( m_xStorge->isStreamElement(sOldName) ) + { + try + { + m_xStorge->renameElement(sOldName,StorageContainer::removeURLPrefix(sName)); + } + catch(Exception&) + { + } + } + } + catch(NoSuchElementException&) + { + } + m_xStream = m_xStorge->openStreamElement(StorageContainer::removeURLPrefix(sName),nMode); + } + catch(Exception&) + { + } if ( !m_xStream.is() ) throw Exception(); m_xSeek.set(m_xStream,UNO_QUERY); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
