[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.0' - avmedia/source desktop/qa desktop/source libreofficekit/qa sc/source sd/qa sd/source sw/qa sw/source

[Andras Timar]

 avmedia/source/framework/modeltools.cxx        |    6 ++++++
 desktop/qa/desktop_lib/test_desktop_lib.cxx    |    6 ++++++
 desktop/source/lib/init.cxx                    |    6 ++++++
 libreofficekit/qa/unit/tiledrendering.cxx      |    6 ++++++
 sc/source/ui/view/viewfun2.cxx                 |    6 ++++++
 sd/qa/unit/tiledrendering/tiledrendering.cxx   |    6 ++++++
 sd/source/ui/view/Outliner.cxx                 |    6 ++++++
 sw/qa/extras/tiledrendering/tiledrendering.cxx |    6 ++++++
 sw/source/uibase/uiview/viewsrch.cxx           |    6 ++++++
 9 files changed, 54 insertions(+)

New commits:
commit 5fb93f268c6a7a9c1aebd0d9e242009e23f854c9
Author: Andras Timar <andras.timar at collabora.com>
Date:   Wed Oct 28 06:06:53 2015 -0700

    guard boost/property_tree/json_parser.hpp on WNT
    
    Change-Id: Ie6de4342b0e6f76076717f1fbdb18adf453ce963

diff --git a/avmedia/source/framework/modeltools.cxx b/avmedia/source/framework/modeltools.cxx
index c42e4c1..2315053 100644
--- a/avmedia/source/framework/modeltools.cxx
+++ b/avmedia/source/framework/modeltools.cxx
@@ -25,7 +25,13 @@
 #include <unotools/ucbstreamhelper.hxx>
 
 #include <boost/property_tree/ptree.hpp>
+#ifdef WNT
+#include <prewin.h>
+#endif
 #include <boost/property_tree/json_parser.hpp>
+#ifdef WNT
+#include <postwin.h>
+#endif
 #include <boost/optional.hpp>
 
 #include <config_features.h>
diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index 71f50ec..bca97f7 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -11,7 +11,13 @@
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/frame/XComponentLoader.hpp>
 
+#ifdef WNT
+#include <prewin.h>
+#endif
 #include <boost/property_tree/json_parser.hpp>
+#ifdef WNT
+#include <postwin.h>
+#endif
 #include <comphelper/processfactory.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/lokhelper.hxx>
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 9962b11..525ea43 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -15,7 +15,13 @@
 
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
+#ifdef WNT
+#include <prewin.h>
+#endif
 #include <boost/property_tree/json_parser.hpp>
+#ifdef WNT
+#include <postwin.h>
+#endif
 
 #define LOK_USE_UNSTABLE_API
 #include <LibreOfficeKit/LibreOfficeKit.h>
diff --git a/libreofficekit/qa/unit/tiledrendering.cxx b/libreofficekit/qa/unit/tiledrendering.cxx
index aa68c72..2cabcc7 100644
--- a/libreofficekit/qa/unit/tiledrendering.cxx
+++ b/libreofficekit/qa/unit/tiledrendering.cxx
@@ -9,7 +9,13 @@
 
 #include <boost/scoped_array.hpp>
 #include <boost/scoped_ptr.hpp>
+#ifdef WNT
+#include <prewin.h>
+#endif
 #include <boost/property_tree/json_parser.hpp>
+#ifdef WNT
+#include <postwin.h>
+#endif
 #include <cppunit/TestFixture.h>
 #include <cppunit/plugin/TestPlugIn.h>
 #include <cppunit/extensions/HelperMacros.h>
diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index 95fd13a..b2ec3fd 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -91,7 +91,13 @@
 #include <boost/scoped_ptr.hpp>
 #include <vector>
 #include <memory>
+#ifdef WNT
+#include <prewin.h>
+#endif
 #include <boost/property_tree/json_parser.hpp>
+#ifdef WNT
+#include <postwin.h>
+#endif
 
 using namespace com::sun::star;
 using ::editeng::SvxBorderLine;
diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx b/sd/qa/unit/tiledrendering/tiledrendering.cxx
index 830911d..8a82295 100644
--- a/sd/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx
@@ -10,7 +10,13 @@
 #include <test/bootstrapfixture.hxx>
 #include <unotest/macros_test.hxx>
 #include <test/xmltesttools.hxx>
+#ifdef WNT
+#include <prewin.h>
+#endif
 #include <boost/property_tree/json_parser.hpp>
+#ifdef WNT
+#include <postwin.h>
+#endif
 #define LOK_USE_UNSTABLE_API
 #include <LibreOfficeKit/LibreOfficeKitEnums.h>
 #include <com/sun/star/frame/Desktop.hpp>
diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index e4c508a..4e18570 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -18,7 +18,13 @@
  */
 
 #include "Outliner.hxx"
+#ifdef WNT
+#include <prewin.h>
+#endif
 #include <boost/property_tree/json_parser.hpp>
+#ifdef WNT
+#include <postwin.h>
+#endif
 #include <vcl/wrkwin.hxx>
 #include <vcl/settings.hxx>
 
diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index 523c9d2..b1dd9cc 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -8,7 +8,13 @@
  */
 
 #include <string>
+#ifdef WNT
+#include <prewin.h>
+#endif
 #include <boost/property_tree/json_parser.hpp>
+#ifdef WNT
+#include <postwin.h>
+#endif
 
 #include <swmodeltestbase.hxx>
 #include <LibreOfficeKit/LibreOfficeKitEnums.h>
diff --git a/sw/source/uibase/uiview/viewsrch.cxx b/sw/source/uibase/uiview/viewsrch.cxx
index 30a2d0c..98d2925 100644
--- a/sw/source/uibase/uiview/viewsrch.cxx
+++ b/sw/source/uibase/uiview/viewsrch.cxx
@@ -22,7 +22,13 @@
 #include <string>
 
 #include <boost/scoped_ptr.hpp>
+#ifdef WNT
+#include <prewin.h>
+#endif
 #include <boost/property_tree/json_parser.hpp>
+#ifdef WNT
+#include <postwin.h>
+#endif
 
 #include <hintids.hxx>