diff options
Diffstat (limited to 'dbaccess/source/core/dataaccess/ModelImpl.hxx')
| -rw-r--r-- | dbaccess/source/core/dataaccess/ModelImpl.hxx | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/dbaccess/source/core/dataaccess/ModelImpl.hxx b/dbaccess/source/core/dataaccess/ModelImpl.hxx index dd194829bb51..4dd72cf5b319 100644 --- a/dbaccess/source/core/dataaccess/ModelImpl.hxx +++ b/dbaccess/source/core/dataaccess/ModelImpl.hxx @@ -162,8 +162,6 @@ private: //============================================================ //= ODatabaseModelImpl //============================================================ -DECLARE_STL_USTRINGACCESS_MAP(::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >,TStorages); - typedef ::utl::SharedUNOComponent< ::com::sun::star::embed::XStorage > SharedStorage; class ODatabaseContext; @@ -201,7 +199,6 @@ private: ::comphelper::SharedMutex m_aMutex; VosMutexFacade m_aMutexFacade; ::std::vector< TContentPtr > m_aContainer; // one for each ObjectType - TStorages m_aStorages; ::sfx2::DocumentMacroMode m_aMacroMode; sal_Int16 m_nImposedMacroExecMode; @@ -261,7 +258,6 @@ public: sal_Bool m_bSuppressVersionColumns : 1; sal_Bool m_bModified : 1; sal_Bool m_bDocumentReadOnly : 1; - sal_Bool m_bDisposingSubStorages; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyAccess > m_xSettings; ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aTableFilter; @@ -286,10 +282,9 @@ public: call. @return <TRUE/> if the storage could be commited, otherwise <FALSE/> */ - sal_Bool commitEmbeddedStorage( sal_Bool _bPreventRootCommits = sal_False ); + bool commitEmbeddedStorage( bool _bPreventRootCommits = false ); - /** commits all storages storages which have been obtained via getStorage - */ + /// commits all sub storages void commitStorages() SAL_THROW(( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException )); @@ -315,7 +310,10 @@ public: inline ::rtl::OUString getURL() const { return m_sDocumentURL; } inline ::rtl::OUString getDocFileLocation() const { return m_sDocFileLocation; } - ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage> getStorage(const ::rtl::OUString& _sStorageName,sal_Int32 nMode = ::com::sun::star::embed::ElementModes::READWRITE); + ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > + getStorage( + const ObjectType _eType, const sal_Int32 _nDesiredMode = ::com::sun::star::embed::ElementModes::READWRITE ); + // helper const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& getNumberFormatsSupplier(); @@ -422,10 +420,6 @@ public: */ TContentPtr& getObjectContainer( const ObjectType _eType ); - /** determines whether the given storage is the storage of our embedded database (named "database"), if any - */ - bool isDatabaseStorage( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& _rxStorage ) const; - /** returns the name of the storage which is used to stored objects of the given type, if applicable */ static ::rtl::OUString |