basctl/source/basicide/basides1.cxx | 16 +++++-----
basctl/source/inc/basidesh.hxx | 1
embedserv/source/embed/ed_ioleobject.cxx | 2 -
embedserv/source/inc/embeddoc.hxx | 1
extensions/source/ole/oleobjw.cxx | 3 -
extensions/source/ole/unoobjw.cxx | 3 -
jvmfwk/plugins/sunmajor/pluginlib/util.cxx | 14 +++-----
sc/source/core/data/formulacell.cxx | 7 +---
sdext/source/minimizer/pagecollector.cxx | 11 ++----
svx/source/smarttags/SmartTagMgr.cxx | 10 ++----
sw/source/core/inc/movedfwdfrmsbyobjpos.hxx | 1
sw/source/core/layout/movedfwdfrmsbyobjpos.cxx | 6 +--
sw/source/filter/inc/msfilter.hxx | 1
sw/source/filter/ww8/writerhelper.cxx | 6 +--
sw/source/filter/ww8/writerhelper.hxx | 2 -
sw/source/filter/ww8/writerwordglue.cxx | 10 ++----
sw/source/filter/ww8/wrtw8esh.cxx | 16 +++++-----
sw/source/filter/ww8/wrtw8nds.cxx | 4 +-
sw/source/filter/ww8/wrtww8.hxx | 3 -
sw/source/filter/ww8/ww8atr.cxx | 8 ++---
sw/source/filter/ww8/ww8par.hxx | 1
sw/source/filter/ww8/ww8par5.cxx | 4 +-
xmlhelp/source/cxxhelp/provider/resultsetbase.hxx | 1
xmlsecurity/source/dialogs/resourcemanager.cxx | 8 +----
xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx | 10 +++---
xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx | 1
26 files changed, 61 insertions(+), 89 deletions(-)
New commits:
commit 20c4a9ce69e73a182d60718e9b52510d66c8f20e
Author: Arkadiy Illarionov <qar...@gmail.com>
Date: Tue Jun 26 00:37:36 2018 +0300
tdf#96099 Remove some trivial container iterator typedefs
Change-Id: Ifec98748d55ff6aca64c425c50c2cf2650f61591
Reviewed-on: https://gerrit.libreoffice.org/56422
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/basctl/source/basicide/basides1.cxx
b/basctl/source/basicide/basides1.cxx
index da1c86f1872d..02110e9c2632 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -153,13 +153,13 @@ void Shell::ExecuteSearch( SfxRequest& rReq )
{
// search other modules...
bool bChangeCurWindow = false;
- WindowTableIt it;
- for (it = aWindowTable.begin(); it != aWindowTable.end();
++it)
+ auto it = aWindowTable.cbegin();
+ for ( ; it != aWindowTable.cend(); ++it)
if (it->second == pCurWin)
break;
- if (it != aWindowTable.end())
+ if (it != aWindowTable.cend())
++it;
- BaseWindow* pWin = it != aWindowTable.end() ?
it->second.get() : nullptr;
+ BaseWindow* pWin = it != aWindowTable.cend() ?
it->second.get() : nullptr;
bool bSearchedFromStart = false;
while ( !nFound && !bCanceled && ( pWin ||
!bSearchedFromStart ) )
@@ -176,8 +176,8 @@ void Shell::ExecuteSearch( SfxRequest& rReq )
xQueryBox->set_default_response(RET_YES);
if (xQueryBox->run() == RET_YES)
{
- it = aWindowTable.begin();
- if ( it != aWindowTable.end() )
+ it = aWindowTable.cbegin();
+ if ( it != aWindowTable.cend() )
pWin = it->second;
bSearchedFromStart = true;
}
@@ -201,9 +201,9 @@ void Shell::ExecuteSearch( SfxRequest& rReq )
}
if ( pWin && ( pWin != pCurWin ) )
{
- if ( it != aWindowTable.end() )
+ if ( it != aWindowTable.cend() )
++it;
- pWin = it != aWindowTable.end() ? it->second.get()
: nullptr;
+ pWin = it != aWindowTable.cend() ?
it->second.get() : nullptr;
}
else
pWin = nullptr;
diff --git a/basctl/source/inc/basidesh.hxx b/basctl/source/inc/basidesh.hxx
index b6e8909efa65..5bf56c915afb 100644
--- a/basctl/source/inc/basidesh.hxx
+++ b/basctl/source/inc/basidesh.hxx
@@ -55,7 +55,6 @@ class Shell :
{
public:
typedef std::map<sal_uInt16, VclPtr<BaseWindow> > WindowTable;
- typedef WindowTable::const_iterator WindowTableIt;
private:
friend class JavaDebuggingListenerImpl;
diff --git a/embedserv/source/embed/ed_ioleobject.cxx
b/embedserv/source/embed/ed_ioleobject.cxx
index ed1e734b45ac..b5821b3546a4 100644
--- a/embedserv/source/embed/ed_ioleobject.cxx
+++ b/embedserv/source/embed/ed_ioleobject.cxx
@@ -299,7 +299,7 @@ STDMETHODIMP EmbedDocument_Impl::Advise( IAdviseSink
*pAdvSink, DWORD *pdwConnec
STDMETHODIMP EmbedDocument_Impl::Unadvise( DWORD dwConnection )
{
- AdviseSinkHashMapIterator iAdvise = m_aAdviseHashMap.find( dwConnection );
+ auto iAdvise = m_aAdviseHashMap.find( dwConnection );
if ( iAdvise != m_aAdviseHashMap.end() )
{
iAdvise->second->Release();
diff --git a/embedserv/source/inc/embeddoc.hxx
b/embedserv/source/inc/embeddoc.hxx
index 1d6a28bae946..488b142bc1a8 100644
--- a/embedserv/source/inc/embeddoc.hxx
+++ b/embedserv/source/inc/embeddoc.hxx
@@ -32,7 +32,6 @@
#include "docholder.hxx"
typedef std::unordered_map< DWORD, IAdviseSink* > AdviseSinkHashMap;
-typedef std::unordered_map< DWORD, IAdviseSink* >::iterator
AdviseSinkHashMapIterator;
class GDIMetaFile;
class CIIAObj;
diff --git a/extensions/source/ole/oleobjw.cxx
b/extensions/source/ole/oleobjw.cxx
index 73ef6bd60df1..4d6180f09797 100644
--- a/extensions/source/ole/oleobjw.cxx
+++ b/extensions/source/ole/oleobjw.cxx
@@ -99,8 +99,7 @@ IUnknownWrapper::~IUnknownWrapper()
#endif
// remove entries in global maps
- typedef std::unordered_map<sal_uIntPtr, sal_uIntPtr>::iterator IT;
- IT it= WrapperToAdapterMap.find( reinterpret_cast<sal_uIntPtr>(xIntRoot));
+ auto it= WrapperToAdapterMap.find(
reinterpret_cast<sal_uIntPtr>(xIntRoot));
if( it != WrapperToAdapterMap.end())
{
sal_uIntPtr adapter= it->second;
diff --git a/extensions/source/ole/unoobjw.cxx
b/extensions/source/ole/unoobjw.cxx
index c0c33b92eff3..af4a20d2db95 100644
--- a/extensions/source/ole/unoobjw.cxx
+++ b/extensions/source/ole/unoobjw.cxx
@@ -1437,10 +1437,9 @@ bool InterfaceOleWrapper::getInvocationInfoForCall(
DISPID id, InvocationInfo&
// m_nameToDispIdMap can contain several names for one DISPID but only
one is
// the exact one. If there's no m_xExactName and therefore no exact
name then
// there's only one entry in the map.
- typedef NameToIdMap::const_iterator cit;
OUString sMemberName;
- for(cit ci1= m_nameToDispIdMap.begin(); ci1 !=
m_nameToDispIdMap.end(); ++ci1)
+ for(auto ci1= m_nameToDispIdMap.cbegin(); ci1 !=
m_nameToDispIdMap.cend(); ++ci1)
{
if( (*ci1).second == id) // iterator is a pair< OUString, DISPID>
{
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
index dfa4653054cc..99feb5f157bc 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
@@ -891,9 +891,7 @@ rtl::Reference<VendorBase> getJREInfoByPath(
static vector<OUString> vecBadPaths;
static map<OUString, rtl::Reference<VendorBase> > mapJREs;
- typedef map<OUString, rtl::Reference<VendorBase> >::const_iterator MapIt;
OUString sFilePath;
- typedef vector<OUString>::const_iterator cit_path;
vector<pair<OUString, OUString> > props;
OUString sResolvedDir = resolveDirPath(path);
@@ -908,7 +906,7 @@ rtl::Reference<VendorBase> getJREInfoByPath(
//For example, a sun JDK contains <jdk>/bin/java and <jdk>/jre/bin/java.
//When <jdk>/bin/java has been found then we need not find
<jdk>/jre/bin/java.
//Otherwise we would execute java two times for every JDK found.
- MapIt entry2 = find_if(mapJREs.begin(), mapJREs.end(),
+ auto entry2 = find_if(mapJREs.cbegin(), mapJREs.cend(),
SameOrSubDirJREMap(sResolvedDir));
if (entry2 != mapJREs.end())
{
@@ -945,21 +943,21 @@ rtl::Reference<VendorBase> getJREInfoByPath(
if (sFilePath.isEmpty())
{
//The file path (to java exe) is not valid
- cit_path ifull = find(vecBadPaths.begin(), vecBadPaths.end(),
sFullPath);
- if (ifull == vecBadPaths.end())
+ auto ifull = find(vecBadPaths.cbegin(), vecBadPaths.cend(),
sFullPath);
+ if (ifull == vecBadPaths.cend())
{
vecBadPaths.push_back(sFullPath);
}
continue;
}
- cit_path ifile = find(vecBadPaths.begin(), vecBadPaths.end(),
sFilePath);
- if (ifile != vecBadPaths.end())
+ auto ifile = find(vecBadPaths.cbegin(), vecBadPaths.cend(),
sFilePath);
+ if (ifile != vecBadPaths.cend())
{
continue;
}
- MapIt entry = mapJREs.find(sFilePath);
+ auto entry = mapJREs.find(sFilePath);
if (entry != mapJREs.end())
{
JFW_TRACE2("JRE found again (detected before): " << sFilePath);
diff --git a/sc/source/core/data/formulacell.cxx
b/sc/source/core/data/formulacell.cxx
index edc8e004706f..e489f60936b7 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -353,10 +353,9 @@ bool
lcl_checkIfAdjacent(
const ScAddress& rPos, const deque<formula::FormulaToken*>& rReferences,
const DimensionSelector aWhich)
{
- typedef deque<formula::FormulaToken*>::const_iterator Iter;
- Iter aBegin(rReferences.begin());
- Iter aEnd(rReferences.end());
- Iter aBegin1(aBegin);
+ auto aBegin(rReferences.cbegin());
+ auto aEnd(rReferences.cend());
+ auto aBegin1(aBegin);
++aBegin1;
--aEnd;
return std::equal(aBegin, aEnd, aBegin1, AdjacentByReference(rPos,
aWhich));
diff --git a/sdext/source/minimizer/pagecollector.cxx
b/sdext/source/minimizer/pagecollector.cxx
index 874bbf0a9150..ca634e560a76 100644
--- a/sdext/source/minimizer/pagecollector.cxx
+++ b/sdext/source/minimizer/pagecollector.cxx
@@ -109,9 +109,6 @@ void PageCollector::CollectNonCustomShowPages( const
css::uno::Reference< css::f
void PageCollector::CollectMasterPages( const Reference< XModel >& rxModel,
std::vector< PageCollector::MasterPageEntity >& rMasterPageList )
{
- typedef std::vector< MasterPageEntity > MasterPageList;
- typedef MasterPageList::iterator MasterPageIter;
-
try
{
// generating list of all master pages
@@ -120,8 +117,8 @@ void PageCollector::CollectMasterPages( const Reference<
XModel >& rxModel, std:
for ( sal_Int32 i = 0; i < xMasterPages->getCount(); i++ )
{
Reference< XDrawPage > xMasterPage( xMasterPages->getByIndex( i ),
UNO_QUERY_THROW );
- MasterPageIter aIter( rMasterPageList.begin() );
- MasterPageIter aEnd ( rMasterPageList.end() );
+ auto aIter( rMasterPageList.begin() );
+ auto aEnd ( rMasterPageList.end() );
while( aIter != aEnd )
{
if ( aIter->xMasterPage == xMasterPage )
@@ -144,8 +141,8 @@ void PageCollector::CollectMasterPages( const Reference<
XModel >& rxModel, std:
{
Reference< XMasterPageTarget > xMasterPageTarget(
xDrawPages->getByIndex( j ), UNO_QUERY_THROW );
Reference< XDrawPage > xMasterPage(
xMasterPageTarget->getMasterPage(), UNO_QUERY_THROW );
- MasterPageIter aIter( rMasterPageList.begin() );
- MasterPageIter aEnd ( rMasterPageList.end() );
+ auto aIter( rMasterPageList.begin() );
+ auto aEnd ( rMasterPageList.end() );
while( aIter != aEnd )
{
if ( aIter->xMasterPage == xMasterPage )
diff --git a/svx/source/smarttags/SmartTagMgr.cxx
b/svx/source/smarttags/SmartTagMgr.cxx
index 26234e7e4505..2265ffd6aa84 100644
--- a/svx/source/smarttags/SmartTagMgr.cxx
+++ b/svx/source/smarttags/SmartTagMgr.cxx
@@ -143,8 +143,6 @@ void SmartTagMgr::RecognizeTextRange(const Reference<
text::XTextRange>& xRange,
}
-typedef std::multimap < OUString, ActionReference >::const_iterator
SmartTagMapIter;
-
void SmartTagMgr::GetActionSequences( std::vector< OUString >& rSmartTagTypes,
Sequence < Sequence< Reference<
smarttags::XSmartTagAction > > >& rActionComponentsSequence,
Sequence < Sequence< sal_Int32 > >&
rActionIndicesSequence ) const
@@ -162,10 +160,10 @@ void SmartTagMgr::GetActionSequences( std::vector<
OUString >& rSmartTagTypes,
Sequence< sal_Int32 > aIndices( nNumberOfActionRefs );
sal_uInt16 i = 0;
- SmartTagMapIter aActionsIter;
- SmartTagMapIter aEnd = maSmartTagMap.upper_bound( rSmartTagType );
+ auto aActionsIter = maSmartTagMap.lower_bound( rSmartTagType );
+ auto aEnd = maSmartTagMap.upper_bound( rSmartTagType );
- for ( aActionsIter = maSmartTagMap.lower_bound( rSmartTagType );
aActionsIter != aEnd; ++aActionsIter )
+ for ( ; aActionsIter != aEnd; ++aActionsIter )
{
aActions[ i ] = (*aActionsIter).second.mxSmartTagAction;
aIndices[ i++ ] = (*aActionsIter).second.mnSmartTagIndex;
@@ -182,7 +180,7 @@ OUString SmartTagMgr::GetSmartTagCaption( const OUString&
rSmartTagType, const c
{
OUString aRet;
- SmartTagMapIter aLower = maSmartTagMap.lower_bound( rSmartTagType );
+ auto aLower = maSmartTagMap.lower_bound( rSmartTagType );
if ( aLower != maSmartTagMap.end() )
{
diff --git a/sw/source/core/inc/movedfwdfrmsbyobjpos.hxx
b/sw/source/core/inc/movedfwdfrmsbyobjpos.hxx
index aec68040cbea..98b3f3f288a9 100644
--- a/sw/source/core/inc/movedfwdfrmsbyobjpos.hxx
+++ b/sw/source/core/inc/movedfwdfrmsbyobjpos.hxx
@@ -28,7 +28,6 @@ class SwTextFrame;
class SwRowFrame;
typedef std::map< const SwTextNode*, const sal_uInt32 > NodeMap;
-typedef std::map< const SwTextNode*, const sal_uInt32 >::const_iterator
NodeMapIter;
typedef NodeMap::value_type NodeMapEntry;
class SwMovedFwdFramesByObjPos
diff --git a/sw/source/core/layout/movedfwdfrmsbyobjpos.cxx
b/sw/source/core/layout/movedfwdfrmsbyobjpos.cxx
index c57d2f830361..0ba8984d4765 100644
--- a/sw/source/core/layout/movedfwdfrmsbyobjpos.cxx
+++ b/sw/source/core/layout/movedfwdfrmsbyobjpos.cxx
@@ -53,7 +53,7 @@ bool SwMovedFwdFramesByObjPos::FrameMovedFwdByObjPos( const
SwTextFrame& _rTextF
{
// sw_redlinehide: assumption: this wants to uniquely identify all
// SwTextFrame belonging to the same paragraph, so just use first one as
key
- NodeMapIter aIter = maMovedFwdFrames.find( _rTextFrame.GetTextNodeFirst()
);
+ auto aIter = maMovedFwdFrames.find( _rTextFrame.GetTextNodeFirst() );
if ( maMovedFwdFrames.end() != aIter )
{
_ornToPageNum = (*aIter).second;
@@ -70,10 +70,8 @@ bool SwMovedFwdFramesByObjPos::DoesRowContainMovedFwdFrame(
const SwRowFrame& _r
const sal_uInt32 nPageNumOfRow =
_rRowFrame.FindPageFrame()->GetPhyPageNum();
- NodeMapIter aIter = maMovedFwdFrames.begin();
- for ( ; aIter != maMovedFwdFrames.end(); ++aIter )
+ for ( const auto & rEntry : maMovedFwdFrames )
{
- const NodeMapEntry& rEntry = *aIter;
if ( rEntry.second >= nPageNumOfRow )
{
SwIterator<SwTextFrame, SwTextNode, sw::IteratorMode::UnwrapMulti>
aFrameIter(*rEntry.first);
diff --git a/sw/source/filter/inc/msfilter.hxx
b/sw/source/filter/inc/msfilter.hxx
index c9c1a142aadf..9cd6dec4455f 100644
--- a/sw/source/filter/inc/msfilter.hxx
+++ b/sw/source/filter/inc/msfilter.hxx
@@ -281,7 +281,6 @@ namespace sw
{
public:
typedef std::map<InsertedTableClient *, SwNodeIndex *> TableMap;
- typedef TableMap::iterator TableMapIter;
void DelAndMakeTableFrames();
void InsertTable(SwTableNode &rTableNode, SwPaM &rPaM);
explicit InsertedTablesManager(const SwDoc &rDoc);
diff --git a/sw/source/filter/ww8/writerhelper.cxx
b/sw/source/filter/ww8/writerhelper.cxx
index 3c07721e2564..2ce34d4f8d98 100644
--- a/sw/source/filter/ww8/writerhelper.cxx
+++ b/sw/source/filter/ww8/writerhelper.cxx
@@ -416,7 +416,7 @@ namespace sw
const SfxPoolItem *SearchPoolItems(const ww8::PoolItems &rItems,
sal_uInt16 eType)
{
- ww8::cPoolItemIter aIter = rItems.find(eType);
+ auto aIter = rItems.find(eType);
if (aIter != rItems.end())
return aIter->second;
return nullptr;
@@ -865,8 +865,8 @@ namespace sw
{
if (!mbHasRoot)
return;
- TableMapIter aEnd = maTables.end();
- for (TableMapIter aIter = maTables.begin(); aIter != aEnd; ++aIter)
+ auto aEnd = maTables.end();
+ for (auto aIter = maTables.begin(); aIter != aEnd; ++aIter)
{
// If already a layout exists, then the BoxFrames must
recreated at this table
SwTableNode *pTable = aIter->first->GetTableNode();
diff --git a/sw/source/filter/ww8/writerhelper.hxx
b/sw/source/filter/ww8/writerhelper.hxx
index 28a76c3097cc..f91f32baa5fe 100644
--- a/sw/source/filter/ww8/writerhelper.hxx
+++ b/sw/source/filter/ww8/writerhelper.hxx
@@ -67,8 +67,6 @@ namespace ww8
typedef std::vector<SwTextFormatColl *> ParaStyles;
/// STL container of SfxPoolItems (Attributes)
typedef std::map<sal_uInt16, const SfxPoolItem *, sw::util::ItemSort>
PoolItems;
- /// STL const iterator for ParaStyles
- typedef PoolItems::const_iterator cPoolItemIter;
/** Make exporting a Writer Frame easy
diff --git a/sw/source/filter/ww8/writerwordglue.cxx
b/sw/source/filter/ww8/writerwordglue.cxx
index 0444d89745e8..16d0336fbb55 100644
--- a/sw/source/filter/ww8/writerwordglue.cxx
+++ b/sw/source/filter/ww8/writerwordglue.cxx
@@ -551,11 +551,9 @@ namespace sw
typedef std::pair<int32_t, bool> DirEntry;
typedef std::vector<DirEntry> DirChanges;
- typedef DirChanges::const_iterator cDirIter;
typedef std::pair<sal_Int32, sal_uInt16> ScriptEntry;
typedef std::vector<ScriptEntry> ScriptChanges;
- typedef ScriptChanges::const_iterator cScriptIter;
DirChanges aDirChanges;
ScriptChanges aScripts;
@@ -606,11 +604,11 @@ namespace sw
nScript = g_pBreakIt->GetBreakIter()->getScriptType(rText,
nPos);
}
- cDirIter aBiDiEnd = aDirChanges.end();
- cScriptIter aScriptEnd = aScripts.end();
+ auto aBiDiEnd = aDirChanges.cend();
+ auto aScriptEnd = aScripts.cend();
- cDirIter aBiDiIter = aDirChanges.begin();
- cScriptIter aScriptIter = aScripts.begin();
+ auto aBiDiIter = aDirChanges.cbegin();
+ auto aScriptIter = aScripts.cbegin();
bool bCharIsRTL = bParaIsRTL;
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx
b/sw/source/filter/ww8/wrtw8esh.cxx
index 75d480e4cb5b..2949accdce54 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -639,16 +639,16 @@ void PlcDrawObj::WritePlc( WW8Export& rWrt ) const
WW8Fib& rFib = *rWrt.pFib;
WW8_CP nCpOffs = GetCpOffset(rFib);
- cDrawObjIter aEnd = maDrawObjs.end();
- cDrawObjIter aIter;
+ auto aEnd = maDrawObjs.cend();
+ auto aIter = maDrawObjs.cbegin();
- for (aIter = maDrawObjs.begin(); aIter < aEnd; ++aIter)
+ for ( ; aIter < aEnd; ++aIter)
SwWW8Writer::WriteLong(*rWrt.pTableStrm, aIter->mnCp - nCpOffs);
SwWW8Writer::WriteLong(*rWrt.pTableStrm, rFib.m_ccpText +
rFib.m_ccpFootnote +
rFib.m_ccpHdr + rFib.m_ccpEdn + rFib.m_ccpTxbx + rFib.m_ccpHdrTxbx
+ 1);
- for (aIter = maDrawObjs.begin(); aIter < aEnd; ++aIter)
+ for (aIter = maDrawObjs.cbegin(); aIter < aEnd; ++aIter)
{
// write the fspa-struct
const ww8::Frame &rFrameFormat = aIter->maContent;
@@ -2266,8 +2266,8 @@ SwEscherEx::SwEscherEx(SvStream* pStrm, WW8Export&
rWW8Wrt)
MakeZOrderArrAndFollowIds(pSdrObjs->GetObjArr(), aSorted);
sal_uInt32 nShapeId=0;
- DrawObjPointerIter aEnd = aSorted.end();
- for (DrawObjPointerIter aIter = aSorted.begin(); aIter != aEnd;
++aIter)
+ auto aEnd = aSorted.end();
+ for (auto aIter = aSorted.begin(); aIter != aEnd; ++aIter)
{
sal_Int32 nBorderThick=0;
DrawObj *pObj = (*aIter);
@@ -2857,8 +2857,8 @@ sal_Int32 SwEscherEx::WriteFlyFrame(const DrawObj &rObj,
sal_uInt32 &rShapeId,
sal_uInt16 FindPos(const SwFrameFormat &rFormat, unsigned int nHdFtIndex,
DrawObjPointerVector &rPVec)
{
- DrawObjPointerIter aEnd = rPVec.end();
- for (DrawObjPointerIter aIter = rPVec.begin(); aIter != aEnd; ++aIter)
+ auto aEnd = rPVec.end();
+ for (auto aIter = rPVec.begin(); aIter != aEnd; ++aIter)
{
const DrawObj *pObj = (*aIter);
OSL_ENSURE(pObj, "Impossible");
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx
b/sw/source/filter/ww8/wrtw8nds.cxx
index 50216cf52d63..a063825432ad 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -495,8 +495,8 @@ void SwWW8AttrIter::OutAttr( sal_Int32 nSwPos, bool bRuby ,
bool bWriteCombChars
if( rNd.GetpSwpHints() == nullptr )
m_rExport.SetCurItemSet(&aExportSet);
- ww8::cPoolItemIter aEnd = aRangeItems.end();
- for ( ww8::cPoolItemIter aI = aRangeItems.begin(); aI != aEnd; ++aI )
+ auto aEnd = aRangeItems.cend();
+ for ( auto aI = aRangeItems.cbegin(); aI != aEnd; ++aI )
{
if ( !bRuby || !lcl_isFontsizeItem( *aI->second ) )
aExportItems[aI->first] = aI->second;
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index 4db4d19550ff..a60b21f12c86 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -360,10 +360,7 @@ public:
};
typedef std::vector<DrawObj> DrawObjVector;
-typedef DrawObjVector::const_iterator cDrawObjIter;
-
typedef std::vector<DrawObj *> DrawObjPointerVector;
-typedef DrawObjPointerVector::iterator DrawObjPointerIter;
class PlcDrawObj // PC for DrawObjects and Text-/OLE-/GRF-Boxes
{
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index c45a7d9546c1..003afcb5cf1c 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -208,8 +208,8 @@ bool WW8Export::CollapseScriptsforWordOk( sal_uInt16
nScript, sal_uInt16 nWhich
void MSWordExportBase::ExportPoolItemsToCHP( ww8::PoolItems &rItems,
sal_uInt16 nScript, const SvxFontItem *pFont, bool bWriteCombChars )
{
- ww8::cPoolItemIter aEnd = rItems.end();
- for ( ww8::cPoolItemIter aI = rItems.begin(); aI != aEnd; ++aI )
+ auto aEnd = rItems.cend();
+ for ( auto aI = rItems.cbegin(); aI != aEnd; ++aI )
{
const SfxPoolItem *pItem = aI->second;
sal_uInt16 nWhich = pItem->Which();
@@ -296,8 +296,8 @@ void MSWordExportBase::OutputItemSet( const SfxItemSet&
rSet, bool bPapFormat, b
ExportPoolItemsToCHP(aItems, nScript, nullptr);
if ( bPapFormat )
{
- ww8::cPoolItemIter aEnd = aItems.end();
- for ( ww8::cPoolItemIter aI = aItems.begin(); aI != aEnd; ++aI )
+ auto aEnd = aItems.cend();
+ for ( auto aI = aItems.cbegin(); aI != aEnd; ++aI )
{
pItem = aI->second;
sal_uInt16 nWhich = pItem->Which();
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index 37d74e6c0d26..c22b79841e0a 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -1127,7 +1127,6 @@ private:
main logic of the filter itself.
*/
std::deque<WW8FieldEntry> m_aFieldStack;
- typedef std::deque<WW8FieldEntry>::const_iterator mycFieldIter;
/*
A stack of open footnotes. Should only be one in it at any time.
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index fdfdc2cd085f..9173f37edfaf 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -871,8 +871,8 @@ long SwWW8ImplReader::Read_Field(WW8PLCFManResult* pRes)
bool bNested = false;
if (!m_aFieldStack.empty())
{
- mycFieldIter aEnd = m_aFieldStack.end();
- for(mycFieldIter aIter = m_aFieldStack.begin(); aIter != aEnd; ++aIter)
+ auto aEnd = m_aFieldStack.cend();
+ for(auto aIter = m_aFieldStack.cbegin(); aIter != aEnd; ++aIter)
{
bNested = !AcceptableNestedField(aIter->mnFieldId);
if (bNested)
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx
b/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx
index 1e40736f8bc9..127b4ec0bdfd 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx
@@ -382,7 +382,6 @@ namespace chelp {
typedef std::vector< css::uno::Reference< css::ucb::XContentIdentifier
> > IdentSet;
typedef std::vector< css::uno::Reference< css::sdbc::XRow > >
ItemSet;
- typedef std::vector< OUString >
PathSet;
IdentSet m_aIdents;
ItemSet m_aItems;
diff --git a/xmlsecurity/source/dialogs/resourcemanager.cxx
b/xmlsecurity/source/dialogs/resourcemanager.cxx
index 102466a8159f..a47cedc3d260 100644
--- a/xmlsecurity/source/dialogs/resourcemanager.cxx
+++ b/xmlsecurity/source/dialogs/resourcemanager.cxx
@@ -83,10 +83,9 @@ namespace XmlSec
{
vector< pair< OUString, OUString > > vecAttrValueOfDN =
parseDN(rRawString);
OUStringBuffer s1, s2;
- typedef vector< pair < OUString, OUString > >::const_iterator CIT;
- for (CIT i = vecAttrValueOfDN.begin(); i < vecAttrValueOfDN.end(); ++i)
+ for (auto i = vecAttrValueOfDN.cbegin(); i < vecAttrValueOfDN.cend();
++i)
{
- if (i != vecAttrValueOfDN.begin())
+ if (i != vecAttrValueOfDN.cbegin())
{
s1.append(',');
s2.append('\n');
@@ -312,8 +311,7 @@ vector< pair< OUString, OUString> > parseDN(const OUString&
rRawString)
while ( aIDs[i] )
{
OUString sPartId = OUString::createFromAscii( aIDs[i++] );
- typedef vector< pair < OUString, OUString > >::const_iterator CIT;
- for (CIT idn = vecAttrValueOfDN.begin(); idn !=
vecAttrValueOfDN.end(); ++idn)
+ for (auto idn = vecAttrValueOfDN.cbegin(); idn !=
vecAttrValueOfDN.cend(); ++idn)
{
if (idn->first == sPartId)
{
diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
index 0be004a60a3d..7fb84e177dfa 100644
--- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
@@ -113,7 +113,7 @@ SecurityEnvironment_NssImpl::~SecurityEnvironment_NssImpl()
{
PK11_SetPasswordFunc( nullptr ) ;
- for (CIT_SLOTS i = m_Slots.begin(); i != m_Slots.end(); i++)
+ for (auto i = m_Slots.cbegin(); i != m_Slots.cend(); i++)
{
PK11_FreeSlot(*i);
}
@@ -185,7 +185,7 @@ const Sequence< sal_Int8>&
SecurityEnvironment_NssImpl::getUnoTunnelId() {
OUString SecurityEnvironment_NssImpl::getSecurityEnvironmentInformation()
{
OUStringBuffer buff;
- for (CIT_SLOTS is = m_Slots.begin(); is != m_Slots.end(); ++is)
+ for (auto is = m_Slots.cbegin(); is != m_Slots.cend(); ++is)
{
buff.append(OUString::createFromAscii(PK11_GetTokenName(*is)));
buff.append("\n");
@@ -291,7 +291,7 @@ SecurityEnvironment_NssImpl::getPersonalCertificates()
updateSlots();
//firstly, we try to find private keys in slot
- for (CIT_SLOTS is = m_Slots.begin(); is != m_Slots.end(); ++is)
+ for (auto is = m_Slots.cbegin(); is != m_Slots.cend(); ++is)
{
PK11SlotInfo *slot = *is;
SECKEYPrivateKeyList* priKeyList ;
@@ -765,7 +765,7 @@ sal_Int32
SecurityEnvironment_NssImpl::getCertificateCharacters(
}
if(priKey == nullptr)
{
- for (CIT_SLOTS is = m_Slots.begin(); is != m_Slots.end(); ++is)
+ for (auto is = m_Slots.cbegin(); is != m_Slots.cend(); ++is)
{
priKey = PK11_FindPrivateKeyFromCert(*is,
const_cast<CERTCertificate*>(cert), nullptr);
if (priKey)
@@ -832,7 +832,7 @@ xmlSecKeysMngrPtr
SecurityEnvironment_NssImpl::createKeysManager() {
std::unique_ptr<PK11SlotInfo*[]> sarSlots(new PK11SlotInfo*[cSlots]);
PK11SlotInfo** slots = sarSlots.get();
int count = 0;
- for (CIT_SLOTS islots = m_Slots.begin();islots != m_Slots.end(); ++islots,
++count)
+ for (auto islots = m_Slots.cbegin();islots != m_Slots.cend(); ++islots,
++count)
slots[count] = *islots;
xmlSecKeysMngrPtr pKeysMngr = xmlSecKeysMngrCreate();
diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx
b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx
index 4f5c924a3a03..c61ade4ab876 100644
--- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx
+++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx
@@ -53,7 +53,6 @@ class SecurityEnvironment_NssImpl : public
::cppu::WeakImplHelper<
private:
std::list< PK11SlotInfo* > m_Slots;
- typedef std::list< PK11SlotInfo* >::const_iterator CIT_SLOTS;
/// The last used certificate which has the private key for signing.
css::uno::Reference<css::security::XCertificate> m_xSigningCertificate;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
