diff options
| -rw-r--r-- | package/source/xstor/xstorage.cxx | 6 | ||||
| -rw-r--r-- | package/source/xstor/xstorage.hxx | 9 |
2 files changed, 8 insertions, 7 deletions
diff --git a/package/source/xstor/xstorage.cxx b/package/source/xstor/xstorage.cxx index fc538b62fe9e..d57feb57ba8b 100644 --- a/package/source/xstor/xstorage.cxx +++ b/package/source/xstor/xstorage.cxx @@ -317,7 +317,7 @@ OStorage_Impl::~OStorage_Impl() } else if ( !m_aReadOnlyWrapList.empty() ) { - for ( OStorageList_Impl::iterator pStorageIter = m_aReadOnlyWrapList.begin(); + for ( StorageHoldersType::iterator pStorageIter = m_aReadOnlyWrapList.begin(); pStorageIter != m_aReadOnlyWrapList.end(); ++pStorageIter ) { uno::Reference< embed::XStorage > xTmp = pStorageIter->m_xWeakRef; @@ -416,7 +416,7 @@ void OStorage_Impl::SetReadOnlyWrap( OStorage& aStorage ) void OStorage_Impl::RemoveReadOnlyWrap( OStorage& aStorage ) { - for ( OStorageList_Impl::iterator pStorageIter = m_aReadOnlyWrapList.begin(); + for ( StorageHoldersType::iterator pStorageIter = m_aReadOnlyWrapList.begin(); pStorageIter != m_aReadOnlyWrapList.end();) { uno::Reference< embed::XStorage > xTmp = pStorageIter->m_xWeakRef; @@ -430,7 +430,7 @@ void OStorage_Impl::RemoveReadOnlyWrap( OStorage& aStorage ) AddLog( rException.Message ); } - OStorageList_Impl::iterator pIterToDelete( pStorageIter ); + StorageHoldersType::iterator pIterToDelete( pStorageIter ); ++pStorageIter; m_aReadOnlyWrapList.erase( pIterToDelete ); } diff --git a/package/source/xstor/xstorage.hxx b/package/source/xstor/xstorage.hxx index 00d4a0bd3024..b7bb5beed730 100644 --- a/package/source/xstor/xstorage.hxx +++ b/package/source/xstor/xstorage.hxx @@ -50,6 +50,8 @@ #include "mutexholder.hxx" +#include <list> + namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } @@ -89,7 +91,6 @@ public: ~SotElement_Impl(); }; -#include <list> typedef ::std::list< SotElement_Impl* > SotElementList_Impl; // Main storage implementation @@ -115,15 +116,15 @@ struct StorageHolder_Impl } }; -typedef ::std::list< StorageHolder_Impl > OStorageList_Impl; - class SwitchablePersistenceStream; struct OStorage_Impl { + typedef std::list<StorageHolder_Impl> StorageHoldersType; + SotMutexHolderRef m_rMutexRef; OStorage* m_pAntiImpl; // only valid if external references exists - OStorageList_Impl m_aReadOnlyWrapList; // only valid if readonly external reference exists + StorageHoldersType m_aReadOnlyWrapList; // only valid if readonly external reference exists sal_Int32 m_nStorageMode; // open mode ( read/write/trunc/nocreate ) bool m_bIsModified; // only modified elements will be sent to the original content |