User: rt Date: 05/03/30 03:55:11 Modified: /dba/dbaccess/source/core/dataaccess/ ModelImpl.hxx
Log: INTEGRATION: CWS dba28 (1.2.8); FILE MERGED 2005/03/24 15:50:58 fs 1.2.8.3: #i45314# commitStorage -> commitRootStorage for less confusion 2005/03/23 14:44:47 fs 1.2.8.2: #i45314# +m_sRealFileURL (+createStorageFactory/commitStorage) 2005/03/21 14:35:26 fs 1.2.8.1: copying the changes from CWS dba26 herein, since they're needed to fix i45314 File Changes: Directory: /dba/dbaccess/source/core/dataaccess/ ================================================ File [changed]: ModelImpl.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/ModelImpl.hxx?r1=1.3&r2=1.4 Delta lines: +33 -12 --------------------- --- ModelImpl.hxx 23 Mar 2005 09:45:36 -0000 1.3 +++ ModelImpl.hxx 30 Mar 2005 11:55:09 -0000 1.4 @@ -74,6 +74,9 @@ #ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #endif +#ifndef _COM_SUN_STAR_LANG_XSINGLESERVICEFACTORY_HPP_ +#include <com/sun/star/lang/XSingleServiceFactory.hpp> +#endif #ifndef _COM_SUN_STAR_CONTAINER_XCONTAINERLISTENER_HPP_ #include <com/sun/star/container/XContainerListener.hpp> #endif @@ -222,7 +225,18 @@ ::com::sun::star::uno::WeakReference< ::com::sun::star::container::XNameAccess > m_xForms; ::com::sun::star::uno::WeakReference< ::com::sun::star::container::XNameAccess > m_xReports; + /// the URL the document was loaded from ::rtl::OUString m_sFileURL; + /** the URL which the document should report as it's URL + + This might differ from ->m_sFileURL in case the document was loaded + as part of a crash recovery process. In this case, ->m_sFileURL points to + the temporary file where the DB had been saved to, after a crash. + ->m_sRealFileURL then is the URL of the document which actually had + been recovered. + */ + ::rtl::OUString m_sRealFileURL; + // <properties> ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > m_xNumberFormatsSupplier; @@ -358,6 +372,13 @@ // disposes all elements in m_aStorages, and clears it void disposeStorages() SAL_THROW(()); + /// creates a ->com::sun::star::embed::StorageFactory + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > + createStorageFactory() const; + + /// commits our storage + void commitRootStorage(); + void clearConnections(); ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage> getStorage(); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
