summaryrefslogtreecommitdiff
path: root/extensions
diff options
context:
space:
mode:
authorArkadiy Illarionov <qarkai@gmail.com>2018-06-26 00:37:36 +0300
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-06-26 09:29:25 +0200
commit20c4a9ce69e73a182d60718e9b52510d66c8f20e (patch)
treedde947221cfa9d662156416f01c0e4cbf4614c04 /extensions
parentaecd51754ec00faef7ad8f742d5e3cdbab470436 (diff)
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.grandin@collabora.co.uk>
Diffstat (limited to 'extensions')
-rw-r--r--extensions/source/ole/oleobjw.cxx3
-rw-r--r--extensions/source/ole/unoobjw.cxx3
2 files changed, 2 insertions, 4 deletions
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>
{