Tag: cws_src680_dba26 User: fs Date: 05/03/15 07:30:59 Modified: /dba/connectivity/source/drivers/hsqldb/ HDriver.cxx, HStorageAccess.cxx, StorageFileAccess.cxx, StorageNativeOutputStream.cxx, hsqldb.xml, makefile.mk /dba/connectivity/source/inc/hsqldb/ HDriver.hxx
Log: reverted parts of the previous change - OJ's patch contained too much code :( File Changes: Directory: /dba/connectivity/source/drivers/hsqldb/ =================================================== File [changed]: HDriver.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/hsqldb/HDriver.cxx?r1=1.7.6.1&r2=1.7.6.2 Delta lines: +6 -27 -------------------- --- HDriver.cxx 15 Mar 2005 15:05:01 -0000 1.7.6.1 +++ HDriver.cxx 15 Mar 2005 15:30:01 -0000 1.7.6.2 @@ -2,9 +2,9 @@ * * $RCSfile: HDriver.cxx,v $ * - * $Revision: 1.7.6.1 $ + * $Revision: 1.7.6.2 $ * - * last change: $Author: fs $ $Date: 2005/03/15 15:05:01 $ + * last change: $Author: fs $ $Date: 2005/03/15 15:30:01 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -58,7 +58,6 @@ * * ************************************************************************/ - #ifndef CONNECTIVITY_HSQLDB_DRIVER_HXX #include "hsqldb/HDriver.hxx" #endif @@ -102,10 +101,6 @@ #include "HTerminateListener.hxx" #endif -#ifndef CONNECTIVITY_HSQLDB_CATALOG_HXX -#include "hsqldb\HCatalog.hxx" -#endif - #ifndef _OSL_FILE_H_ #include <osl/file.h> #endif @@ -304,7 +299,7 @@ } Reference< XComponent> xIfc = new OConnectionWeakWrapper(xOrig,m_xFactory); xConnection.set(xIfc,UNO_QUERY); - m_aConnections.push_back(TWeakPair(WeakReferenceHelper(xOrig),TWeakConnectionPair(sKey,TWeakRefPair(WeakReferenceHelper(xConnection),WeakReferenceHelper())))); + m_aConnections.push_back(TWeakPair(WeakReferenceHelper(xOrig),TWeakConnectionPair(sKey,WeakReferenceHelper(xConnection)))); Reference<XTransactionBroadcaster> xBroad(xStorage,UNO_QUERY); if ( xBroad.is() ) @@ -377,22 +372,6 @@ checkDisposed(ODriverDelegator_BASE::rBHelper.bDisposed); Reference< XTablesSupplier > xTab; - - TWeakPairVector::iterator aEnd = m_aConnections.end(); - for (TWeakPairVector::iterator i = m_aConnections.begin(); aEnd != i; ++i) - { - if ( i->second.second.first.get() == connection.get() ) - { - xTab = Reference< XTablesSupplier >(i->second.second.second.get().get(),UNO_QUERY); - if ( !xTab.is() ) - { - xTab = new OHCatalog(connection); - i->second.second.second = WeakReferenceHelper(xTab); - } - break; - } - } - return xTab; } @@ -415,9 +394,9 @@ //------------------------------------------------------------------------------ Sequence< ::rtl::OUString > ODriverDelegator::getSupportedServiceNames_Static( ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aSNS( 2 ); + Sequence< ::rtl::OUString > aSNS( 1 ); aSNS[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbc.Driver")); - aSNS[1] = ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.Driver"); + // aSNS[1] = ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.Driver"); return aSNS; } //------------------------------------------------------------------ File [changed]: HStorageAccess.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/hsqldb/HStorageAccess.cxx?r1=1.4.14.1&r2=1.4.14.2 Delta lines: +2 -14 -------------------- --- HStorageAccess.cxx 15 Mar 2005 15:05:01 -0000 1.4.14.1 +++ HStorageAccess.cxx 15 Mar 2005 15:30:01 -0000 1.4.14.2 @@ -2,9 +2,9 @@ * * $RCSfile: HStorageAccess.cxx,v $ * - * $Revision: 1.4.14.1 $ + * $Revision: 1.4.14.2 $ * - * last change: $Author: fs $ $Date: 2005/03/15 15:05:01 $ + * last change: $Author: fs $ $Date: 2005/03/15 15:30:01 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -115,12 +115,6 @@ JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_close (JNIEnv * env, jobject obj_this,jstring name, jstring key) { -#if OSL_DEBUG_LEVEL > 1 - { - ::rtl::OUString sKey = StorageContainer::jstring2ustring(env,key); - ::rtl::OUString sName = StorageContainer::jstring2ustring(env,name); - } -#endif ::boost::shared_ptr<StreamHelper> pHelper = StorageContainer::getRegisteredStream(env,name,key); Reference< XOutputStream> xFlush = pHelper.get() ? pHelper->getOutputStream() : Reference< XOutputStream>(); if ( xFlush.is() ) @@ -228,12 +222,6 @@ JNIEXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_read__Ljava_lang_String_2Ljava_lang_String_2_3BII (JNIEnv * env, jobject obj_this,jstring name, jstring key, jbyteArray buffer, jint off, jint len) { -#if OSL_DEBUG_LEVEL > 1 - { - ::rtl::OUString sKey = StorageContainer::jstring2ustring(env,key); - ::rtl::OUString sName = StorageContainer::jstring2ustring(env,name); - } -#endif ::boost::shared_ptr<StreamHelper> pHelper = StorageContainer::getRegisteredStream(env,name,key); Reference< XInputStream> xIn = pHelper.get() ? pHelper->getInputStream() : Reference< XInputStream>(); OSL_ENSURE(xIn.is(),"Input stream is NULL!"); File [changed]: StorageFileAccess.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx?r1=1.3.14.1&r2=1.3.14.2 Delta lines: +3 -25 -------------------- --- StorageFileAccess.cxx 15 Mar 2005 15:05:02 -0000 1.3.14.1 +++ StorageFileAccess.cxx 15 Mar 2005 15:30:01 -0000 1.3.14.2 @@ -2,9 +2,9 @@ * * $RCSfile: StorageFileAccess.cxx,v $ * - * $Revision: 1.3.14.1 $ + * $Revision: 1.3.14.2 $ * - * last change: $Author: fs $ $Date: 2005/03/15 15:05:02 $ + * last change: $Author: fs $ $Date: 2005/03/15 15:30:01 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -145,12 +145,6 @@ 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 - { - ::rtl::OUString sKey = StorageContainer::jstring2ustring(env,key); - ::rtl::OUString sName = StorageContainer::jstring2ustring(env,name); - } -#endif TStorages::mapped_type aStoragePair = StorageContainer::getRegisteredStorage(StorageContainer::jstring2ustring(env,key)); if ( aStoragePair.first.first.is() ) { @@ -180,28 +174,12 @@ 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 - { - ::rtl::OUString sKey = StorageContainer::jstring2ustring(env,key); - ::rtl::OUString sNewName = StorageContainer::jstring2ustring(env,newname); - ::rtl::OUString sOldName = StorageContainer::jstring2ustring(env,oldname); - } -#endif TStorages::mapped_type aStoragePair = StorageContainer::getRegisteredStorage(StorageContainer::jstring2ustring(env,key)); if ( aStoragePair.first.first.is() ) { try { - aStoragePair.first.first->renameElement( - StorageContainer::removeURLPrefix(StorageContainer::jstring2ustring(env,oldname),aStoragePair.first.second) - ,StorageContainer::removeURLPrefix(StorageContainer::jstring2ustring(env,newname),aStoragePair.first.second)); -#if OSL_DEBUG_LEVEL > 1 - { - ::rtl::OUString sNewName = StorageContainer::removeURLPrefix(StorageContainer::jstring2ustring(env,newname),aStoragePair.first.second); - OSL_ENSURE(aStoragePair.first.first->isStreamElement(sNewName),"Stream could not be renamed"); - } -#endif - + aStoragePair.first.first->renameElement(StorageContainer::removeURLPrefix(StorageContainer::jstring2ustring(env,oldname),aStoragePair.first.second),StorageContainer::removeURLPrefix(StorageContainer::jstring2ustring(env,newname),aStoragePair.first.second)); } catch(NoSuchElementException&) { File [changed]: StorageNativeOutputStream.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx?r1=1.3.14.1&r2=1.3.14.2 Delta lines: +2 -6 ------------------- --- StorageNativeOutputStream.cxx 15 Mar 2005 15:05:03 -0000 1.3.14.1 +++ StorageNativeOutputStream.cxx 15 Mar 2005 15:30:02 -0000 1.3.14.2 @@ -2,9 +2,9 @@ * * $RCSfile: StorageNativeOutputStream.cxx,v $ * - * $Revision: 1.3.14.1 $ + * $Revision: 1.3.14.2 $ * - * last change: $Author: fs $ $Date: 2005/03/15 15:05:03 $ + * last change: $Author: fs $ $Date: 2005/03/15 15:30:02 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -208,10 +208,6 @@ JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeOutputStream_flush (JNIEnv * env, jobject obj_this, jstring key, jstring name) { -#if OSL_DEBUG_LEVEL > 1 - ::rtl::OUString sKey = StorageContainer::jstring2ustring(env,key); - ::rtl::OUString sName = StorageContainer::jstring2ustring(env,name); -#endif } // ----------------------------------------------------------------------------- /* File [changed]: hsqldb.xml Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/hsqldb/hsqldb.xml?r1=1.2.50.1&r2=1.2.50.2 Delta lines: +1 -1 ------------------- --- hsqldb.xml 15 Mar 2005 15:05:03 -0000 1.2.50.1 +++ hsqldb.xml 15 Mar 2005 15:30:02 -0000 1.2.50.2 @@ -11,7 +11,7 @@ <loader-name>com.sun.star.loader.SharedLibrary</loader-name> <language>c++</language> <status value="final"/> - <supported-service>com.sun.star.sdbcx.Driver</supported-service> + <supported-service>com.sun.star.sdbc.Driver</supported-service> </component-description> <project-build-dependency>cppuhelper</project-build-dependency> <project-build-dependency>cppu</project-build-dependency> File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/hsqldb/makefile.mk?r1=1.5.14.1&r2=1.5.14.2 Delta lines: +2 -9 ------------------- --- makefile.mk 15 Mar 2005 15:05:04 -0000 1.5.14.1 +++ makefile.mk 15 Mar 2005 15:30:02 -0000 1.5.14.2 @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.5.14.1 $ +# $Revision: 1.5.14.2 $ # -# last change: $Author: fs $ $Date: 2005/03/15 15:05:04 $ +# last change: $Author: fs $ $Date: 2005/03/15 15:30:02 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -87,13 +87,6 @@ $(SLO)$/StorageNativeOutputStream.obj \ $(SLO)$/StorageNativeInputStream.obj \ $(SLO)$/StorageFileAccess.obj \ - $(SLO)$/HTables.obj \ - $(SLO)$/HTable.obj \ - $(SLO)$/HViews.obj \ - $(SLO)$/HCatalog.obj \ - $(SLO)$/HColumns.obj \ - $(SLO)$/HUser.obj \ - $(SLO)$/HUsers.obj \ $(SLO)$/Hservices.obj Directory: /dba/connectivity/source/inc/hsqldb/ =============================================== File [changed]: HDriver.hxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/inc/hsqldb/HDriver.hxx?r1=1.4.14.1&r2=1.4.14.2 Delta lines: +3 -5 ------------------- --- HDriver.hxx 15 Mar 2005 15:05:24 -0000 1.4.14.1 +++ HDriver.hxx 15 Mar 2005 15:30:03 -0000 1.4.14.2 @@ -2,9 +2,9 @@ * * $RCSfile: HDriver.hxx,v $ * - * $Revision: 1.4.14.1 $ + * $Revision: 1.4.14.2 $ * - * last change: $Author: fs $ $Date: 2005/03/15 15:05:24 $ + * last change: $Author: fs $ $Date: 2005/03/15 15:30:03 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -110,9 +110,7 @@ , ::com::sun::star::embed::XTransactionListener > ODriverDelegator_BASE; - typedef ::std::pair< ::com::sun::star::uno::WeakReferenceHelper,::com::sun::star::uno::WeakReferenceHelper> TWeakRefPair; - typedef ::std::pair< ::rtl::OUString ,TWeakRefPair > TWeakConnectionPair; - + typedef ::std::pair< ::rtl::OUString ,::com::sun::star::uno::WeakReferenceHelper > TWeakConnectionPair; typedef ::std::pair< ::com::sun::star::uno::WeakReferenceHelper,TWeakConnectionPair> TWeakPair; typedef ::std::vector< TWeakPair > TWeakPairVector; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
