mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tuck this typedef inside struct scope where it's used.

Browse Source 
Change-Id: I2e225fb7afc58f1763e2fc4b9155aafc0e487f34
This commit is contained in:
Kohei Yoshida 2014-06-09 12:49:55 -04:00
parent 019617d590
commit acf56987b0
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package/source/xstor/xstorage.cxx
View File

@ -317,7 +317,7 @@ OStorage_Impl::~OStorage_Impl()
} }
else if ( !m_aReadOnlyWrapList.empty() ) 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 ) pStorageIter != m_aReadOnlyWrapList.end(); ++pStorageIter )
{ {
uno::Reference< embed::XStorage > xTmp = pStorageIter->m_xWeakRef; uno::Reference< embed::XStorage > xTmp = pStorageIter->m_xWeakRef;
@ -416,7 +416,7 @@ void OStorage_Impl::SetReadOnlyWrap( OStorage& aStorage )
void OStorage_Impl::RemoveReadOnlyWrap( 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();) pStorageIter != m_aReadOnlyWrapList.end();)
{ {
uno::Reference< embed::XStorage > xTmp = pStorageIter->m_xWeakRef; uno::Reference< embed::XStorage > xTmp = pStorageIter->m_xWeakRef;
@ -430,7 +430,7 @@ void OStorage_Impl::RemoveReadOnlyWrap( OStorage& aStorage )
AddLog( rException.Message ); AddLog( rException.Message );
} }
OStorageList_Impl::iterator pIterToDelete( pStorageIter ); StorageHoldersType::iterator pIterToDelete( pStorageIter );
++pStorageIter; ++pStorageIter;
m_aReadOnlyWrapList.erase( pIterToDelete ); m_aReadOnlyWrapList.erase( pIterToDelete );
} }

9
package/source/xstor/xstorage.hxx
View File

@ -50,6 +50,8 @@
#include "mutexholder.hxx" #include "mutexholder.hxx"
#include <list>
namespace com { namespace sun { namespace star { namespace uno { namespace com { namespace sun { namespace star { namespace uno {
class XComponentContext; class XComponentContext;
} } } } } } } }
@ -89,7 +91,6 @@ public:
~SotElement_Impl(); ~SotElement_Impl();
}; };
#include <list>
typedef ::std::list< SotElement_Impl* > SotElementList_Impl; typedef ::std::list< SotElement_Impl* > SotElementList_Impl;
// Main storage implementation // Main storage implementation
@ -115,15 +116,15 @@ struct StorageHolder_Impl
} }
}; };
typedef ::std::list< StorageHolder_Impl > OStorageList_Impl;
class SwitchablePersistenceStream; class SwitchablePersistenceStream;
struct OStorage_Impl struct OStorage_Impl
{ {
typedef std::list<StorageHolder_Impl> StorageHoldersType;
SotMutexHolderRef m_rMutexRef; SotMutexHolderRef m_rMutexRef;
OStorage* m_pAntiImpl; // only valid if external references exists 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 ) sal_Int32 m_nStorageMode; // open mode ( read/write/trunc/nocreate )
bool m_bIsModified; // only modified elements will be sent to the original content bool m_bIsModified; // only modified elements will be sent to the original content