Kaydet (Commit) c6994fb8 authored tarafından Julien Nabet's avatar Julien Nabet

Use for-range loops in embeddedobj, embedserv and formula

Change-Id: I56e1bace8ab8312524e681d3865a1a89d523812d
Reviewed-on: https://gerrit.libreoffice.org/51459Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarJulien Nabet <serval2412@yahoo.fr>
üst a57bda77
......@@ -462,12 +462,9 @@ OleComponent::~OleComponent()
} catch( const uno::Exception& ) {}
}
for ( FormatEtcList::iterator aIter = m_pNativeImpl->m_aFormatsList.begin();
aIter != m_pNativeImpl->m_aFormatsList.end();
++aIter )
for (auto const& format : m_pNativeImpl->m_aFormatsList)
{
delete *aIter;
(*aIter) = nullptr;
delete format;
}
m_pNativeImpl->m_aFormatsList.clear();
......
......@@ -90,11 +90,10 @@ HRESULT EmbedDocument_Impl::OLENotifyClosing()
{
AdviseSinkHashMap aAHM(m_aAdviseHashMap);
for ( AdviseSinkHashMapIterator iAdvise = aAHM.begin();
iAdvise != aAHM.end(); iAdvise++ )
for (auto const& advise : aAHM)
{
if ( iAdvise->second )
iAdvise->second->OnClose();
if (advise.second)
advise.second->OnClose();
}
return S_OK;
......@@ -405,12 +404,9 @@ HRESULT EmbedDocument_Impl::SaveObject()
if(m_pClientSite) {
hr = m_pClientSite->SaveObject();
for ( AdviseSinkHashMapIterator iAdvise =
m_aAdviseHashMap.begin();
iAdvise != m_aAdviseHashMap.end();
iAdvise++ )
if ( iAdvise->second )
iAdvise->second->OnSave( );
for (auto const& advise : m_aAdviseHashMap)
if (advise.second)
advise.second->OnSave();
}
else if ( m_aFileName.getLength() && IsDirty() == S_OK )
{
......@@ -440,12 +436,9 @@ HRESULT EmbedDocument_Impl::ShowObject()
void EmbedDocument_Impl::notify( bool bDataChanged )
{
for ( AdviseSinkHashMapIterator iAdvise =
m_aAdviseHashMap.begin();
iAdvise != m_aAdviseHashMap.end();
iAdvise++ )
if ( iAdvise->second )
iAdvise->second->OnViewChange( DVASPECT_CONTENT, -1 );
for (auto const& advise : m_aAdviseHashMap)
if (advise.second)
advise.second->OnViewChange( DVASPECT_CONTENT, -1 );
if ( m_pDAdviseHolder && bDataChanged )
m_pDAdviseHolder->SendOnDataChange( static_cast<IDataObject*>(this), 0, 0 );
......
......@@ -702,10 +702,10 @@ STDMETHODIMP EmbedDocument_Impl::SaveCompleted( IStorage *pStgNew )
&m_pExtStream );
if ( FAILED( hr ) || !m_pExtStream ) return E_OUTOFMEMORY;
for ( AdviseSinkHashMapIterator iAdvise = m_aAdviseHashMap.begin(); iAdvise != m_aAdviseHashMap.end(); iAdvise++ )
for (auto const& advise : m_aAdviseHashMap)
{
if ( iAdvise->second )
iAdvise->second->OnSave();
if ( advise.second )
advise.second->OnSave();
}
return S_OK;
......
......@@ -577,11 +577,11 @@ uno::Sequence< sheet::FormulaOpCodeMapEntry > FormulaCompiler::OpCodeMap::create
// If AddIn functions are present in this mapping, use them, and only those.
if (hasExternals())
{
for (ExternalHashMap::const_iterator it( maExternalHashMap.begin());it != maExternalHashMap.end(); ++it)
for (auto const& elem : maExternalHashMap)
{
FormulaOpCodeMapEntry aEntry;
aEntry.Name = (*it).first;
aEntry.Token.Data <<= (*it).second;
aEntry.Name = elem.first;
aEntry.Token.Data <<= elem.second;
aEntry.Token.OpCode = ocExternal;
aVec.push_back( aEntry);
}
......
......@@ -144,16 +144,12 @@ void FuncPage::UpdateFunctionList(const OUString& aStr)
}
else // LRU-List
{
::std::vector< TFunctionDesc >::iterator aIter = aLRUList.begin();
::std::vector< TFunctionDesc >::iterator aEnd = aLRUList.end();
for ( ; aIter != aEnd; ++aIter )
for (auto const& elem : aLRUList)
{
const IFunctionDescription* pDesc = *aIter;
if (pDesc) // may be null if a function is no longer available
if (elem) // may be null if a function is no longer available
{
m_pLbFunction->SetEntryData(
m_pLbFunction->InsertEntry( pDesc->getFunctionName() ), const_cast<IFunctionDescription *>(pDesc) );
m_pLbFunction->InsertEntry( elem->getFunctionName() ), const_cast<IFunctionDescription *>(elem) );
}
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment