diff options
Diffstat (limited to 'package/source/xstor/xstorage.cxx')
-rw-r--r-- | package/source/xstor/xstorage.cxx | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/package/source/xstor/xstorage.cxx b/package/source/xstor/xstorage.cxx index 91c24e148c62..9c0c117f5e35 100644 --- a/package/source/xstor/xstorage.cxx +++ b/package/source/xstor/xstorage.cxx @@ -329,7 +329,7 @@ OStorage_Impl::~OStorage_Impl() else if ( !m_aReadOnlyWrapList.empty() ) { for ( OStorageList_Impl::iterator pStorageIter = m_aReadOnlyWrapList.begin(); - pStorageIter != m_aReadOnlyWrapList.end(); pStorageIter++ ) + pStorageIter != m_aReadOnlyWrapList.end(); ++pStorageIter ) { uno::Reference< embed::XStorage > xTmp = pStorageIter->m_xWeakRef; if ( xTmp.is() ) @@ -349,13 +349,13 @@ OStorage_Impl::~OStorage_Impl() } for ( SotElementList_Impl::iterator pElementIter = m_aChildrenList.begin(); - pElementIter != m_aChildrenList.end(); pElementIter++ ) + pElementIter != m_aChildrenList.end(); ++pElementIter ) delete *pElementIter; m_aChildrenList.clear(); for ( SotElementList_Impl::iterator pDeletedIter = m_aDeletedList.begin(); - pDeletedIter != m_aDeletedList.end(); pDeletedIter++ ) + pDeletedIter != m_aDeletedList.end(); ++pDeletedIter ) delete *pDeletedIter; m_aDeletedList.clear(); @@ -370,7 +370,7 @@ OStorage_Impl::~OStorage_Impl() m_xPackage = uno::Reference< lang::XSingleServiceFactory >(); ::rtl::OUString aPropertyName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "URL" ) ); - for ( sal_Int32 aInd = 0; aInd < m_xProperties.getLength(); aInd++ ) + for ( sal_Int32 aInd = 0; aInd < m_xProperties.getLength(); ++aInd ) { if ( m_xProperties[aInd].Name.equals( aPropertyName ) ) { @@ -452,11 +452,11 @@ void OStorage_Impl::RemoveReadOnlyWrap( OStorage& aStorage ) } OStorageList_Impl::iterator pIterToDelete( pStorageIter ); - pStorageIter++; + ++pStorageIter; m_aReadOnlyWrapList.erase( pIterToDelete ); } else - pStorageIter++; + ++pStorageIter; } } @@ -727,7 +727,7 @@ void OStorage_Impl::CopyToStorage( const uno::Reference< embed::XStorage >& xDes throw embed::InvalidStorageException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() ); for ( SotElementList_Impl::iterator pElementIter = m_aChildrenList.begin(); - pElementIter != m_aChildrenList.end(); pElementIter++ ) + pElementIter != m_aChildrenList.end(); ++pElementIter ) { if ( !(*pElementIter)->m_bIsRemoved ) CopyStorageElement( *pElementIter, xDest, (*pElementIter)->m_aName, bDirect ); @@ -1099,7 +1099,7 @@ void OStorage_Impl::Commit() // remove replaced removed elements for ( SotElementList_Impl::iterator pDeletedIter = m_aDeletedList.begin(); pDeletedIter != m_aDeletedList.end(); - pDeletedIter++ ) + ++pDeletedIter ) { if ( m_nStorageType == embed::StorageFormats::OFOPXML && !(*pDeletedIter)->m_bIsStorage ) @@ -1131,17 +1131,17 @@ void OStorage_Impl::Commit() SotElement_Impl* pToDelete = *pElementIter; - pElementIter++; // to let the iterator be valid it should be increased before removing + ++pElementIter; // to let the iterator be valid it should be increased before removing m_aChildrenList.remove( pToDelete ); delete pToDelete; } else - pElementIter++; + ++pElementIter; } // there should be no more deleted elements - for ( pElementIter = m_aChildrenList.begin(); pElementIter != m_aChildrenList.end(); pElementIter++ ) + for ( pElementIter = m_aChildrenList.begin(); pElementIter != m_aChildrenList.end(); ++pElementIter ) { // if it is a 'duplicate commit' inserted elements must be really inserted to package later // since thay can conflict with renamed elements @@ -1215,7 +1215,7 @@ void OStorage_Impl::Commit() } } - for ( pElementIter = m_aChildrenList.begin(); pElementIter != m_aChildrenList.end(); pElementIter++ ) + for ( pElementIter = m_aChildrenList.begin(); pElementIter != m_aChildrenList.end(); ++pElementIter ) { // now inserted elements can be inserted to the package if ( (*pElementIter)->m_bIsInserted ) @@ -1328,7 +1328,7 @@ void OStorage_Impl::Revert() { SotElement_Impl* pToDelete = *pElementIter; - pElementIter++; // to let the iterator be valid it should be increased before removing + ++pElementIter; // to let the iterator be valid it should be increased before removing m_aChildrenList.remove( pToDelete ); delete pToDelete; @@ -1340,14 +1340,14 @@ void OStorage_Impl::Revert() (*pElementIter)->m_aName = (*pElementIter)->m_aOriginalName; (*pElementIter)->m_bIsRemoved = sal_False; - pElementIter++; + ++pElementIter; } } // return replaced removed elements for ( SotElementList_Impl::iterator pDeletedIter = m_aDeletedList.begin(); pDeletedIter != m_aDeletedList.end(); - pDeletedIter++ ) + ++pDeletedIter ) { m_aChildrenList.push_back( (*pDeletedIter) ); @@ -1407,7 +1407,7 @@ SotElement_Impl* OStorage_Impl::FindElement( const ::rtl::OUString& rName ) ReadContents(); for ( SotElementList_Impl::iterator pElementIter = m_aChildrenList.begin(); - pElementIter != m_aChildrenList.end(); pElementIter++ ) + pElementIter != m_aChildrenList.end(); ++pElementIter ) { if ( (*pElementIter)->m_aName == rName && !(*pElementIter)->m_bIsRemoved ) return *pElementIter; @@ -1543,7 +1543,7 @@ SotElement_Impl* OStorage_Impl::InsertElement( ::rtl::OUString aName, sal_Bool b SotElement_Impl* pDeletedElm = NULL; for ( SotElementList_Impl::iterator pElementIter = m_aChildrenList.begin(); - pElementIter != m_aChildrenList.end(); pElementIter++ ) + pElementIter != m_aChildrenList.end(); ++pElementIter ) { if ( (*pElementIter)->m_aName == aName ) { @@ -1638,7 +1638,7 @@ uno::Sequence< ::rtl::OUString > OStorage_Impl::GetElementNames() sal_uInt32 nInd = 0; for ( SotElementList_Impl::iterator pElementIter = m_aChildrenList.begin(); - pElementIter != m_aChildrenList.end(); pElementIter++ ) + pElementIter != m_aChildrenList.end(); ++pElementIter ) { if ( !(*pElementIter)->m_bIsRemoved ) aElementNames[nInd++] = (*pElementIter)->m_aName; @@ -2040,7 +2040,7 @@ void SAL_CALL OStorage::InternalDispose( sal_Bool bNotifyImpl ) if ( !m_pData->m_aOpenSubComponentsList.empty() ) { for ( WeakComponentList::iterator pCompIter = m_pData->m_aOpenSubComponentsList.begin(); - pCompIter != m_pData->m_aOpenSubComponentsList.end(); pCompIter++ ) + pCompIter != m_pData->m_aOpenSubComponentsList.end(); ++pCompIter ) { uno::Reference< lang::XComponent > xTmp = (*pCompIter); if ( xTmp.is() ) @@ -2101,11 +2101,11 @@ void OStorage::ChildIsDisposed( const uno::Reference< uno::XInterface >& xChild if ( !xTmp.is() || xTmp == xChild ) { WeakComponentList::iterator pIterToRemove = pCompIter; - pCompIter++; + ++pCompIter; m_pData->m_aOpenSubComponentsList.erase( pIterToRemove ); } else - pCompIter++; + ++pCompIter; } } } @@ -2675,7 +2675,7 @@ uno::Reference< embed::XStorage > SAL_CALL OStorage::openStorageElement( pElementIter != pElement->m_pStorage->m_aChildrenList.end(); ) { SotElement_Impl* pElementToDel = (*pElementIter); - pElementIter++; + ++pElementIter; m_pImpl->RemoveElement( pElementToDel ); } @@ -4193,7 +4193,7 @@ void SAL_CALL OStorage::revert() } for ( SotElementList_Impl::iterator pElementIter = m_pImpl->m_aChildrenList.begin(); - pElementIter != m_pImpl->m_aChildrenList.end(); pElementIter++ ) + pElementIter != m_pImpl->m_aChildrenList.end(); ++pElementIter ) { if ( ((*pElementIter)->m_pStorage && ( (*pElementIter)->m_pStorage->m_pAntiImpl || !(*pElementIter)->m_pStorage->m_aReadOnlyWrapList.empty() )) |