Merge branch 'master' into feature/gnumake4

Conflicts:
basebmp/prj/d.lst
basebmp/test/basictest.cxx
basebmp/test/makefile.mk
basegfx/inc/basegfx/basegfxdllapi.h
basegfx/inc/basegfx/tools/debugplotter.hxx
basegfx/inc/basegfx/tuple/b2ituple.hxx
basegfx/prj/d.lst
basegfx/source/numeric/makefile.mk
basegfx/source/polygon/makefile.mk
basegfx/source/range/makefile.mk
basegfx/source/raster/makefile.mk
basegfx/source/tuple/makefile.mk
basegfx/source/vector/makefile.mk
basegfx/test/basegfx1d.cxx
basegfx/test/makefile.mk
basegfx/util/makefile.mk
canvas/Library_canvasfactory.mk
canvas/Module_canvas.mk
canvas/prj/build.lst
canvas/prj/d.lst
canvas/source/cairo/cairo_canvashelper_texturefill.cxx
canvas/source/cairo/makefile.mk
canvas/source/tools/makefile.mk
comphelper/qa/string/makefile.mk
cppcanvas/Module_cppcanvas.mk
cppcanvas/inc/cppcanvas/cppcanvasdllapi.h
cppcanvas/prj/build.lst
cppcanvas/prj/d.lst
cppcanvas/source/mtfrenderer/makefile.mk
cppcanvas/util/makefile.mk
i18npool/source/search/makefile.mk
regexp/Library_regexp.mk
regexp/prj/d.lst
sax/CppunitTest_sax.mk
sax/Library_sax.mk
sax/prj/d.lst
sax/qa/cppunit/test_converter.cxx
sax/source/expatwrap/attrlistimpl.hxx
sax/util/makefile.mk
svtools/Library_svt.mk
tools/Executable_sspretty.mk
ucbhelper/prj/d.lst
ucbhelper/source/provider/configureucb.cxx
ucbhelper/source/provider/provconf.cxx
ucbhelper/util/makefile.mk
unotools/Library_utl.mk
unotools/Module_unotools.mk
unotools/Package_inc.mk
unotools/prj/build.lst
vcl/Library_desktop_detector.mk
vcl/Library_vcl.mk
vcl/Library_vclplug_gtk.mk
vcl/aqua/source/gdi/salprn.cxx
vcl/inc/aqua/saldata.hxx
vcl/unx/generic/gdi/salgdi3.cxx

1 files changed, 8 insertions, 6 deletions

diff --git a/canvas/source/factory/cf_service.cxx b/canvas/source/factory/cf_service.cxx
index b2b72620af00..e96f31f5ba7a 100644
--- a/canvas/source/factory/cf_service.cxx
+++ b/canvas/source/factory/cf_service.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -46,7 +47,7 @@
 #include <boost/bind.hpp>
 #include <vector>
 #include <utility>
-#include <functional>
+#include <o3tl/compat_functional.hxx>
 #include <algorithm>
 
 #define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) )
@@ -269,7 +270,7 @@ Sequence<OUString> CanvasFactory::getAvailableServiceNames()
     std::transform(m_aAvailableImplementations.begin(),
                    m_aAvailableImplementations.end(),
                    aServiceNames.getArray(),
-                   std::select1st<AvailPair>());
+                   o3tl::select1st<AvailPair>());
     return aServiceNames;
 }
 
@@ -354,7 +355,7 @@ Reference<XInterface> CanvasFactory::lookupAndUse(
                              boost::bind(&OUString::equals,
                                          boost::cref(serviceName),
                                          boost::bind(
-                                             std::select1st<CachePair>(),
+                                             o3tl::select1st<CachePair>(),
                                              _1)))) != aEnd )
     {
         Reference<XInterface> xCanvas( use( aMatch->second, args, xContext ) );
@@ -370,7 +371,7 @@ Reference<XInterface> CanvasFactory::lookupAndUse(
                                        boost::bind(&OUString::equals,
                                                    boost::cref(serviceName),
                                                    boost::bind(
-                                                       std::select1st<AvailPair>(),
+                                                       o3tl::select1st<AvailPair>(),
                                                        _1)))) == aAvailEnd )
     {
         return Reference<XInterface>();
@@ -383,7 +384,7 @@ Reference<XInterface> CanvasFactory::lookupAndUse(
                                     boost::bind(&OUString::equals,
                                                 boost::cref(serviceName),
                                                 boost::bind(
-                                                    std::select1st<AvailPair>(),
+                                                    o3tl::select1st<AvailPair>(),
                                                     _1)))) == aAAEnd )
     {
         return Reference<XInterface>();
@@ -396,7 +397,7 @@ Reference<XInterface> CanvasFactory::lookupAndUse(
                                        boost::bind(&OUString::equals,
                                                    boost::cref(serviceName),
                                                    boost::bind(
-                                                       std::select1st<AvailPair>(),
+                                                       o3tl::select1st<AvailPair>(),
                                                        _1)))) == aAccelEnd )
     {
         return Reference<XInterface>();
@@ -543,3 +544,4 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
 
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */