[Libreoffice-commits] core.git: basic/inc sc/inc sd/inc sd/source sw/inc sw/source vcl/inc vcl/source
Pieter Adriaensen
pieter.ad at gmail.com
Wed Jan 7 06:57:37 PST 2015
basic/inc/pch/precompiled_sb.hxx | 1 -
sc/inc/pch/precompiled_sc.hxx | 1 -
sd/inc/pch/precompiled_sd.hxx | 1 -
sd/source/filter/eppt/pptx-epptooxml.cxx | 1 -
sd/source/ui/slidesorter/view/SlideSorterView.cxx | 1 -
sw/inc/edimp.hxx | 1 -
sw/inc/pch/precompiled_sw.hxx | 1 -
sw/source/core/doc/DocumentLinksAdministrationManager.cxx | 1 -
sw/source/core/doc/docbm.cxx | 1 -
sw/source/core/docnode/ndtbl.cxx | 2 ++
sw/source/core/edit/autofmt.cxx | 1 -
sw/source/core/tox/ToxTextGenerator.cxx | 1 -
vcl/inc/pch/precompiled_vcl.hxx | 1 -
vcl/source/edit/texteng.cxx | 1 -
14 files changed, 2 insertions(+), 13 deletions(-)
New commits:
commit f29bf4635958f7d4b8a22c0825cbcca4858ba037
Author: Pieter Adriaensen <pieter.ad at gmail.com>
Date: Sun Dec 21 12:42:33 2014 +0100
Resolves: fdo#87003 - Kill BOOST_FOREACH
Conflicts:
avmedia/source/framework/modeltools.cxx
basic/source/sbx/sbxbase.cxx
sd/source/filter/eppt/pptx-epptooxml.cxx
svx/qa/unit/svdraw/test_SdrTextObject.cxx
sw/qa/core/uwriter.cxx
sw/source/core/doc/CntntIdxStore.cxx
sw/source/core/doc/DocumentLinksAdministrationManager.cxx
sw/source/core/doc/docnew.cxx
sw/source/core/doc/gctable.cxx
sw/source/core/doc/htmltbl.cxx
sw/source/core/doc/sortopt.cxx
sw/source/core/doc/tblcpy.cxx
sw/source/core/doc/tblrwcl.cxx
sw/source/core/docnode/ndcopy.cxx
sw/source/core/docnode/ndtbl.cxx
sw/source/core/docnode/ndtbl1.cxx
sw/source/core/frmedt/tblsel.cxx
sw/source/core/text/itratr.cxx
sw/source/core/tox/ToxLinkProcessor.cxx
sw/source/filter/xml/xmltble.cxx
Change-Id: Id176d4e052c719c9afdf91ed450de84d8d2bc486
Reviewed-on: https://gerrit.libreoffice.org/13575
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/basic/inc/pch/precompiled_sb.hxx b/basic/inc/pch/precompiled_sb.hxx
index e67f28f..08e6c87 100644
--- a/basic/inc/pch/precompiled_sb.hxx
+++ b/basic/inc/pch/precompiled_sb.hxx
@@ -15,7 +15,6 @@
*/
#include "math.h"
-#include <boost/foreach.hpp>
#include <boost/optional.hpp>
#include <boost/scoped_array.hpp>
#include <boost/scoped_ptr.hpp>
diff --git a/sc/inc/pch/precompiled_sc.hxx b/sc/inc/pch/precompiled_sc.hxx
index 1070123..476dea8 100644
--- a/sc/inc/pch/precompiled_sc.hxx
+++ b/sc/inc/pch/precompiled_sc.hxx
@@ -36,7 +36,6 @@
#include <basic/sbxobj.hxx>
#include <boost/bind.hpp>
#include <boost/checked_delete.hpp>
-#include <boost/foreach.hpp>
#include <boost/noncopyable.hpp>
#include <boost/ptr_container/ptr_vector.hpp>
#include <boost/random.hpp>
diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx
index 27a55f4..992b901 100644
--- a/sd/inc/pch/precompiled_sd.hxx
+++ b/sd/inc/pch/precompiled_sd.hxx
@@ -69,7 +69,6 @@
#include <basic/sbx.hxx>
#include <boost/bind.hpp>
#include <boost/enable_shared_from_this.hpp>
-#include <boost/foreach.hpp>
#include <boost/function.hpp>
#include <boost/limits.hpp>
#include <boost/make_shared.hpp>
diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx
index b27fa08..5bd8383 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <boost/foreach.hpp>
#include <stdio.h>
#include <oox/drawingml/chart/chartconverter.hxx>
#include <oox/token/tokens.hxx>
diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx b/sd/source/ui/slidesorter/view/SlideSorterView.cxx
index 51d1a66..705ca08 100644
--- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx
+++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx
@@ -72,7 +72,6 @@
#ifdef DEBUG_TIMING
#include <vector>
#endif
-#include <boost/foreach.hpp>
using namespace std;
using namespace ::sd::slidesorter::model;
diff --git a/sw/inc/edimp.hxx b/sw/inc/edimp.hxx
index 44d53e8..63ef3d0 100644
--- a/sw/inc/edimp.hxx
+++ b/sw/inc/edimp.hxx
@@ -22,7 +22,6 @@
#include <tools/solar.h>
#include <o3tl/sorted_vector.hxx>
-#include <boost/foreach.hpp>
class SwPaM;
class SwNodeIndex;
diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx
index c52354d..9ac41da 100644
--- a/sw/inc/pch/precompiled_sw.hxx
+++ b/sw/inc/pch/precompiled_sw.hxx
@@ -45,7 +45,6 @@
#include <basic/sbxobj.hxx>
#include <basic/sbxvar.hxx>
#include <boost/bind.hpp>
-#include <boost/foreach.hpp>
#include <boost/function.hpp>
#include <boost/make_shared.hpp>
#include <boost/noncopyable.hpp>
diff --git a/sw/source/core/doc/DocumentLinksAdministrationManager.cxx b/sw/source/core/doc/DocumentLinksAdministrationManager.cxx
index 8505940..5a54951 100644
--- a/sw/source/core/doc/DocumentLinksAdministrationManager.cxx
+++ b/sw/source/core/doc/DocumentLinksAdministrationManager.cxx
@@ -45,7 +45,6 @@
#include <tools/urlobj.hxx>
#include <unotools/charclass.hxx>
-
using namespace ::com::sun::star;
//Helper functions for this file
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index 9567c3a..510c5ac 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -20,7 +20,6 @@
#include <MarkManager.hxx>
#include <bookmrk.hxx>
#include <boost/bind.hpp>
-#include <boost/foreach.hpp>
#include <boost/function.hpp>
#include <cntfrm.hxx>
#include <crossrefbookmark.hxx>
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index eda68f0..c779cea 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -3688,8 +3688,10 @@ static bool lcl_SetAFmtBox( _FndBox & rBox, _SetAFmtTabPara *pSetPara )
}
}
else
+ {
for( _FndLine& rFndLine : rBox.GetLines() )
lcl_SetAFmtLine( rFndLine, pSetPara );
+ }
if (!rBox.GetUpper()->GetUpper()) // a BaseLine
++pSetPara->nCurBox;
diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx
index 1410cac9..4b81d4c 100644
--- a/sw/source/core/edit/autofmt.cxx
+++ b/sw/source/core/edit/autofmt.cxx
@@ -67,7 +67,6 @@
#include <numrule.hxx>
#include <boost/scoped_ptr.hpp>
-#include <boost/foreach.hpp>
using namespace ::com::sun::star;
diff --git a/sw/source/core/tox/ToxTextGenerator.cxx b/sw/source/core/tox/ToxTextGenerator.cxx
index f7ef3f9..56f753f 100644
--- a/sw/source/core/tox/ToxTextGenerator.cxx
+++ b/sw/source/core/tox/ToxTextGenerator.cxx
@@ -41,7 +41,6 @@
#include "svl/itemiter.hxx"
-#include <boost/foreach.hpp>
#include <boost/make_shared.hpp>
#include <cassert>
diff --git a/vcl/inc/pch/precompiled_vcl.hxx b/vcl/inc/pch/precompiled_vcl.hxx
index 484f1e0..77c04e7 100644
--- a/vcl/inc/pch/precompiled_vcl.hxx
+++ b/vcl/inc/pch/precompiled_vcl.hxx
@@ -137,7 +137,6 @@
#include <basegfx/vector/b2dvector.hxx>
#include <basegfx/vector/b2isize.hxx>
#include <boost/bind.hpp>
-#include <boost/foreach.hpp>
#include <boost/make_shared.hpp>
#include <boost/mem_fn.hpp>
#include <boost/optional.hpp>
diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx
index 81a1a0f..effe2af 100644
--- a/vcl/source/edit/texteng.cxx
+++ b/vcl/source/edit/texteng.cxx
@@ -56,7 +56,6 @@
#include <cstdlib>
#include <set>
#include <vector>
-#include <boost/foreach.hpp>
#include <boost/scoped_ptr.hpp>
using namespace ::com::sun::star;
More information about the Libreoffice-commits
mailing list