User: vg      
Date: 05/02/16 07:56:31

Modified:
 /dba/connectivity/source/inc/hsqldb/
  HStorageMap.hxx

Log:
 INTEGRATION: CWS hsqldb2 (1.2.20); FILE MERGED
 2005/01/28 12:21:20 oj 1.2.20.3: #i39922# new interfaces in hsqldb
 2005/01/25 08:44:09 oj 1.2.20.2: #i39922# correct stream handling
 2005/01/19 07:03:57 oj 1.2.20.1: #i39922# remove db from stream name

File Changes:

Directory: /dba/connectivity/source/inc/hsqldb/
===============================================

File [changed]: HStorageMap.hxx
Url: 
http://dba.openoffice.org/source/browse/dba/connectivity/source/inc/hsqldb/HStorageMap.hxx?r1=1.2&r2=1.3
Delta lines:  +23 -7
--------------------
--- HStorageMap.hxx     9 Nov 2004 12:16:07 -0000       1.2
+++ HStorageMap.hxx     16 Feb 2005 15:56:28 -0000      1.3
@@ -64,6 +64,9 @@
 #ifndef _COM_SUN_STAR_EMBED_XSTORAGE_HPP_
 #include <com/sun/star/embed/XStorage.hpp>
 #endif
+#ifndef _COM_SUN_STAR_EMBED_XTRANSACTIONLISTENER_HPP_
+#include <com/sun/star/embed/XTransactionListener.hpp>
+#endif
 #ifndef _COM_SUN_STAR_IO_XSTREAM_HPP_
 #include <com/sun/star/io/XStream.hpp>
 #endif
@@ -107,7 +110,8 @@
 
                
                
DECLARE_STL_USTRINGACCESS_MAP(::boost::shared_ptr<StreamHelper>,TStreamMap);
-               typedef ::std::pair< ::com::sun::star::uno::Reference< 
::com::sun::star::embed::XStorage >, TStreamMap> TStoragePair;
+        typedef ::std::pair< ::com::sun::star::uno::Reference< 
::com::sun::star::embed::XStorage >, ::rtl::OUString > TStorageURLPair;
+               typedef ::std::pair< TStorageURLPair, TStreamMap> TStoragePair;
                DECLARE_STL_USTRINGACCESS_MAP(TStoragePair,TStorages);
                /** contains all storages so far accessed.
                */
@@ -115,21 +119,33 @@
                {
                public:
                        static ::rtl::OUString registerStorage(const 
::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage>& 
_xStorage,const ::rtl::OUString& _sURL);
-                       static ::com::sun::star::uno::Reference< 
::com::sun::star::embed::XStorage> getRegisteredStorage(const ::rtl::OUString& 
_sKey);
-                       static void revokeStorage(const ::rtl::OUString& _sKey);
+            static TStorages::mapped_type getRegisteredStorage(const 
::rtl::OUString& _sKey);
+            static ::rtl::OUString getRegisteredKey(const 
::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage>& 
_xStorage);
+                       static void revokeStorage(const ::rtl::OUString& 
_sKey,const ::com::sun::star::uno::Reference< 
::com::sun::star::embed::XTransactionListener>& _xListener);
 
                        static TStreamMap::mapped_type registerStream(JNIEnv * 
env,jstring name, jstring key,sal_Int32 _nMode);
                        static void revokeStream(JNIEnv * env,jstring name, 
jstring key);
                        static TStreamMap::mapped_type getRegisteredStream( 
JNIEnv * env, jstring name, jstring key);
 
                        static ::rtl::OUString jstring2ustring(JNIEnv * env, 
jstring jstr);
-                       static ::rtl::OUString removeURLPrefix(const 
::rtl::OUString& _sURL);
+                       static ::rtl::OUString removeURLPrefix(const 
::rtl::OUString& _sURL,const ::rtl::OUString& _sFileURL);
+            static ::rtl::OUString removeOldURLPrefix(const ::rtl::OUString& 
_sURL);
                };
        
//........................................................................
        }       // namespace hsqldb
        
//........................................................................
 //........................................................................
 }      // namespace connectivity
+
+#if OSL_DEBUG_LEVEL > 0
+#include <stdio.h>
+#include <process.h>
+
+DECLARE_STL_USTRINGACCESS_MAP(FILE *,TDebugStreamMap);
+
+TDebugStreamMap& getStreams();
+#endif
+
 //........................................................................
 #endif // CONNECTIVI_HSQLDB_HSTORAGEMAP_HXX
 




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to