[Libreoffice-commits] core.git: Branch 'feature/perf-mail-merge' - sw/inc

[Jan-Marek Glogowski]

 sw/inc/docary.hxx   |   10 +++++-----
 sw/inc/pagedesc.hxx |    8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 9a73c824001851443050b8e5f70d9a65e4813b7f
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date:   Thu Aug 25 13:38:32 2016 +0200

    fixup windows?
    
    Change-Id: Ifa210ec07a411a57d69b746f5ea360da2e0a28eb

diff --git a/sw/inc/docary.hxx b/sw/inc/docary.hxx
index 5cade21..93def1f 100644
--- a/sw/inc/docary.hxx
+++ b/sw/inc/docary.hxx
@@ -174,17 +174,17 @@ class SW_DLLPUBLIC SwFrameFormats : public SwFormatsBase
 
     typedef SwFrameFormatsBase::nth_index<0>::type ByPos;
     typedef SwFrameFormatsBase::nth_index<1>::type ByTypeAndName;
-    typedef typename ByPos::iterator iterator;
+    typedef ByPos::iterator iterator;
 
     SwFrameFormatsBase   m_Array;
     ByPos               &m_PosIndex;
     ByTypeAndName       &m_TypeAndNameIndex;
 
 public:
-    typedef typename ByPos::const_iterator const_iterator;
-    typedef typename ByTypeAndName::const_iterator const_range_iterator;
-    typedef typename SwFrameFormatsBase::size_type size_type;
-    typedef typename SwFrameFormatsBase::value_type value_type;
+    typedef ByPos::const_iterator const_iterator;
+    typedef ByTypeAndName::const_iterator const_range_iterator;
+    typedef SwFrameFormatsBase::size_type size_type;
+    typedef SwFrameFormatsBase::value_type value_type;
 
     SwFrameFormats();
     // frees all SwFrameFormat!
diff --git a/sw/inc/pagedesc.hxx b/sw/inc/pagedesc.hxx
index 29deaf4..13eb80b 100644
--- a/sw/inc/pagedesc.hxx
+++ b/sw/inc/pagedesc.hxx
@@ -395,7 +395,7 @@ class SwPageDescs
 
     typedef SwPageDescsBase::nth_index<0>::type ByPos;
     typedef SwPageDescsBase::nth_index<1>::type ByName;
-    typedef typename ByPos::iterator iterator;
+    typedef ByPos::iterator iterator;
 
     iterator find_( const OUString &name ) const;
 
@@ -404,9 +404,9 @@ class SwPageDescs
     ByName           &m_NameIndex;
 
 public:
-    typedef typename ByPos::const_iterator const_iterator;
-    typedef typename SwPageDescsBase::size_type size_type;
-    typedef typename SwPageDescsBase::value_type value_type;
+    typedef ByPos::const_iterator const_iterator;
+    typedef SwPageDescsBase::size_type size_type;
+    typedef SwPageDescsBase::value_type value_type;
 
     SwPageDescs();