diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-03-30 10:55:09 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-03-30 10:55:09 +0000 |
| commit | 8e1f55c2dd41b73f2a5803d97ad83ded3227237b (patch) | |
| tree | 2c803192040f044a545c2a57ff75cda8c5324fde /dbaccess/source/core/dataaccess/ModelImpl.hxx | |
| parent | e226be1a49a4308c790a104be73609707640e573 (diff) | |
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
Diffstat (limited to 'dbaccess/source/core/dataaccess/ModelImpl.hxx')
| -rw-r--r-- | dbaccess/source/core/dataaccess/ModelImpl.hxx | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/dbaccess/source/core/dataaccess/ModelImpl.hxx b/dbaccess/source/core/dataaccess/ModelImpl.hxx index c42b6f0adb95..6382a9c34f17 100644 --- a/dbaccess/source/core/dataaccess/ModelImpl.hxx +++ b/dbaccess/source/core/dataaccess/ModelImpl.hxx @@ -2,9 +2,9 @@ * * $RCSfile: ModelImpl.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: vg $ $Date: 2005-03-23 09:45:36 $ + * last change: $Author: rt $ $Date: 2005-03-30 11:55:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -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 @@ public: ::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 @@ public: // 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(); |