[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - 2 commits - canvas/source chart2/source cui/source dbaccess/source drawinglayer/source editeng/source extensions/source reportdesign/source toolkit/source

David Ostrovsky david at ostrovsky.org
Thu Feb 18 15:45:26 UTC 2016 

 canvas/source/opengl/ogl_spritedevicehelper.cxx           |    2 ++
 chart2/source/controller/accessibility/AccessibleBase.cxx |    1 +
 chart2/source/controller/main/ObjectHierarchy.cxx         |    1 +
 cui/source/customize/macropg.cxx                          |    1 +
 dbaccess/source/ui/app/AppControllerDnD.cxx               |    1 +
 dbaccess/source/ui/dlg/DbAdminImpl.cxx                    |    1 +
 dbaccess/source/ui/relationdesign/RelationController.cxx  |    1 +
 drawinglayer/source/primitive2d/baseprimitive2d.cxx       |    5 +++++
 editeng/source/outliner/paralist.cxx                      |    2 ++
 extensions/source/propctrlr/eventhandler.cxx              |    1 +
 extensions/source/propctrlr/propertycomposer.cxx          |    1 +
 reportdesign/source/filter/xml/xmlExport.cxx              |    1 +
 reportdesign/source/ui/inspection/GeometryHandler.cxx     |    1 +
 toolkit/source/helper/formpdfexport.cxx                   |    1 +
 14 files changed, 20 insertions(+)

New commits:
commit 953d064e31f172dad8a2f72da629158ab1097d9c
Author: David Ostrovsky <david at ostrovsky.org>
Date:   Wed Feb 17 23:28:26 2016 +0100

    Fix missing iterator include on MSVC 14.0
    
    Change-Id: I55de612aef52038fd9979426950d4ae4131ca586
    Reviewed-on: https://gerrit.libreoffice.org/22448
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: David Ostrovsky <david at ostrovsky.org>
    (cherry picked from commit a3c70e760fa4203b7e6692f82d1d8a14214af3da)
    Signed-off-by: Michael Stahl <mstahl at redhat.com>

diff --git a/canvas/source/opengl/ogl_spritedevicehelper.cxx b/canvas/source/opengl/ogl_spritedevicehelper.cxx
index 0932e0c..4a40745 100644
--- a/canvas/source/opengl/ogl_spritedevicehelper.cxx
+++ b/canvas/source/opengl/ogl_spritedevicehelper.cxx
@@ -30,6 +30,8 @@
 #include "ogl_canvascustomsprite.hxx"
 #include "ogl_texturecache.hxx"
 
+#include <iterator>
+
 using namespace ::com::sun::star;
 
 static void initContext()
diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx b/chart2/source/controller/accessibility/AccessibleBase.cxx
index ad2da37..350a593 100644
--- a/chart2/source/controller/accessibility/AccessibleBase.cxx
+++ b/chart2/source/controller/accessibility/AccessibleBase.cxx
@@ -51,6 +51,7 @@
 #include <o3tl/functional.hxx>
 
 #include <algorithm>
+#include <iterator>
 
 #include "ChartElementFactory.hxx"
 
diff --git a/chart2/source/controller/main/ObjectHierarchy.cxx b/chart2/source/controller/main/ObjectHierarchy.cxx
index dcb6380..b059f49 100644
--- a/chart2/source/controller/main/ObjectHierarchy.cxx
+++ b/chart2/source/controller/main/ObjectHierarchy.cxx
@@ -34,6 +34,7 @@
 
 #include <map>
 #include <algorithm>
+#include <iterator>
 
 #include <com/sun/star/chart2/XTitled.hpp>
 #include <com/sun/star/chart2/XCoordinateSystemContainer.hpp>
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index 4861380..0b6c87a 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -43,6 +43,7 @@
 #include <comphelper/namedvaluecollection.hxx>
 
 #include <algorithm>
+#include <iterator>
 #include <set>
 
 using namespace ::com::sun::star;
diff --git a/dbaccess/source/ui/app/AppControllerDnD.cxx b/dbaccess/source/ui/app/AppControllerDnD.cxx
index cc71d6b..151ad46 100644
--- a/dbaccess/source/ui/app/AppControllerDnD.cxx
+++ b/dbaccess/source/ui/app/AppControllerDnD.cxx
@@ -68,6 +68,7 @@
 #include "dbexchange.hxx"
 #include "UITools.hxx"
 #include <algorithm>
+#include <iterator>
 #include <svtools/treelistbox.hxx>
 #include <com/sun/star/sdb/XReportDocumentsSupplier.hpp>
 #include <com/sun/star/sdb/XFormDocumentsSupplier.hpp>
diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
index 91ae318..7d9a004 100644
--- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx
+++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
@@ -69,6 +69,7 @@
 #include <osl/mutex.hxx>
 
 #include <algorithm>
+#include <iterator>
 #include <functional>
 #include <o3tl/functional.hxx>
 
diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx b/dbaccess/source/ui/relationdesign/RelationController.cxx
index 29a71be..c5e17da 100644
--- a/dbaccess/source/ui/relationdesign/RelationController.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationController.cxx
@@ -19,6 +19,7 @@
 
 #include <sal/config.h>
 
+#include <iterator>
 #include <map>
 
 #include "dbu_reghelper.hxx"
diff --git a/drawinglayer/source/primitive2d/baseprimitive2d.cxx b/drawinglayer/source/primitive2d/baseprimitive2d.cxx
index 1d62d6f..5dc8fc6 100644
--- a/drawinglayer/source/primitive2d/baseprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/baseprimitive2d.cxx
@@ -19,6 +19,7 @@
 
 #include <sal/config.h>
 
+#include <iterator>
 #include <utility>
 
 #include <drawinglayer/primitive2d/baseprimitive2d.hxx>
diff --git a/editeng/source/outliner/paralist.cxx b/editeng/source/outliner/paralist.cxx
index 5c0a2c2..3912f58 100644
--- a/editeng/source/outliner/paralist.cxx
+++ b/editeng/source/outliner/paralist.cxx
@@ -26,6 +26,8 @@
 #include <osl/diagnose.h>
 #include <tools/debug.hxx>
 
+#include <iterator>
+
 ParagraphData::ParagraphData()
 : nDepth( -1 )
 , mnNumberingStartValue( -1 )
diff --git a/extensions/source/propctrlr/eventhandler.cxx b/extensions/source/propctrlr/eventhandler.cxx
index eea5124..2b33358 100644
--- a/extensions/source/propctrlr/eventhandler.cxx
+++ b/extensions/source/propctrlr/eventhandler.cxx
@@ -69,6 +69,7 @@
 
 #include <map>
 #include <algorithm>
+#include <iterator>
 #include <o3tl/functional.hxx>
 
 extern "C" void SAL_CALL createRegistryInfo_EventHandler()
diff --git a/extensions/source/propctrlr/propertycomposer.cxx b/extensions/source/propctrlr/propertycomposer.cxx
index 9c99e8c..74e60b4 100644
--- a/extensions/source/propctrlr/propertycomposer.cxx
+++ b/extensions/source/propctrlr/propertycomposer.cxx
@@ -26,6 +26,7 @@
 
 #include <functional>
 #include <algorithm>
+#include <iterator>
 #include <map>
 
 
diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx
index 24b964f..2b77fe1 100644
--- a/reportdesign/source/filter/xml/xmlExport.cxx
+++ b/reportdesign/source/filter/xml/xmlExport.cxx
@@ -58,6 +58,7 @@
 
 #include <boost/bind.hpp>
 
+#include <iterator>
 
 namespace rptxml
 {
diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx
index fab5cc5..47a6d4e 100644
--- a/reportdesign/source/ui/inspection/GeometryHandler.cxx
+++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx
@@ -19,6 +19,7 @@
 
 #include <sal/config.h>
 
+#include <iterator>
 #include <map>
 
 #include "GeometryHandler.hxx"
diff --git a/toolkit/source/helper/formpdfexport.cxx b/toolkit/source/helper/formpdfexport.cxx
index be2eadd..b3a9f0a 100644
--- a/toolkit/source/helper/formpdfexport.cxx
+++ b/toolkit/source/helper/formpdfexport.cxx
@@ -39,6 +39,7 @@
 
 #include <functional>
 #include <algorithm>
+#include <iterator>
 
 
 namespace toolkitform
commit da52cb3e002909d033f7095845dd65d9c7727ea3
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Dec 15 13:19:51 2015 +0100

    Missing include
    
    Change-Id: Iac9006292bfdb1b56e213346188245a205146803
    (cherry picked from commit 3dc76dc72e14a48787664d6f005bbe61dd3767f0)
    Signed-off-by: Michael Stahl <mstahl at redhat.com>

diff --git a/drawinglayer/source/primitive2d/baseprimitive2d.cxx b/drawinglayer/source/primitive2d/baseprimitive2d.cxx
index aba65aa..1d62d6f 100644
--- a/drawinglayer/source/primitive2d/baseprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/baseprimitive2d.cxx
@@ -17,6 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/config.h>
+
+#include <utility>
+
 #include <drawinglayer/primitive2d/baseprimitive2d.hxx>
 #include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx>
 #include <drawinglayer/geometry/viewinformation2d.hxx>

More information about the Libreoffice-commits mailing list