diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-04-13 14:33:23 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-04-21 09:14:45 +0200 |
| commit | 841e1a6f3619054ecc9240e061cd83d4e41d1ca9 (patch) | |
| tree | 2ee3989b2d3291c9b276205492d43369827ca3cf /sw | |
| parent | 4354f0e9ef4a5538729a2a6f2d1745e247f6c5cd (diff) | |
remove some old MSVC workarounds
Change-Id: I6abd8aaffb27b3c85df7c0518f7f576be4e32222
Reviewed-on: https://gerrit.libreoffice.org/36660
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/undo/untbl.cxx | 8 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8graf.cxx | 7 |
2 files changed, 3 insertions, 12 deletions
diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx index b3f1a7a87a3c..7d6c81349aa0 100644 --- a/sw/source/core/undo/untbl.cxx +++ b/sw/source/core/undo/untbl.cxx @@ -1053,18 +1053,10 @@ void SaveTable::CreateNew( SwTable& rTable, bool bCreateFrames, } } -#ifdef _MSC_VER -// MSVC 2012 appears very confused and rambles about a declaration of "n" below -#pragma warning (push, 1) -#pragma warning (disable: 4258) -#endif for( SwTableLines::const_iterator it = rTable.GetTabLines().begin() + n; it != rTable.GetTabLines().begin() + nOldLines; ++it ) delete *it; rTable.GetTabLines().erase( rTable.GetTabLines().begin() + n, rTable.GetTabLines().begin() + nOldLines ); -#ifdef _MSC_VER -#pragma warning (pop) -#endif } aParent.GetTabLines().erase( aParent.GetTabLines().begin(), aParent.GetTabLines().begin() + n ); diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx index e3fbbaf62732..d81ce19773fe 100644 --- a/sw/source/filter/ww8/ww8graf.cxx +++ b/sw/source/filter/ww8/ww8graf.cxx @@ -2601,12 +2601,11 @@ SwFrameFormat* SwWW8ImplReader::Read_GrafLayer( long nGrafAnchorCp ) Get the record for top level object, so we can get the word anchoring and wrapping information for it. */ - for (MSDffImportRecords::const_iterator it = aData.begin(); - it != aData.end(); ++it) // MSVC2008 wants const_iterator here??? + for (auto const & it : aData) { - if ((*it)->pObj == pObject) + if (it->pObj == pObject) { - pRecord = it->get(); + pRecord = it.get(); break; } } |