[Libreoffice-commits] core.git: basctl/inc basctl/source canvas/source chart2/source connectivity/source dbaccess/source extensions/source forms/inc forms/source include/o3tl o3tl/README reportdesign/source sd/inc sd/source svx/inc svx/source
Thorsten Behrens
Thorsten.Behrens at CIB.de
Mon Aug 17 09:38:55 PDT 2015
basctl/inc/pch/precompiled_basctl.hxx | 2
basctl/source/dlged/dlgedobj.cxx | 2
canvas/source/factory/cf_service.cxx | 2
chart2/source/controller/accessibility/AccessibleBase.cxx | 2
chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx | 2
chart2/source/inc/ContainerHelper.hxx | 2
chart2/source/model/template/ChartTypeManager.cxx | 2
connectivity/source/commontools/TSortIndex.cxx | 2
connectivity/source/commontools/TTableHelper.cxx | 2
dbaccess/source/core/dataaccess/documentevents.cxx | 2
dbaccess/source/ui/browser/genericcontroller.cxx | 2
dbaccess/source/ui/dlg/DbAdminImpl.cxx | 2
extensions/source/propctrlr/eformshelper.cxx | 2
extensions/source/propctrlr/eventhandler.cxx | 2
extensions/source/propctrlr/genericpropertyhandler.cxx | 2
forms/inc/pch/precompiled_frm.hxx | 2
forms/source/xforms/convert.cxx | 2
forms/source/xforms/datatyperepository.cxx | 2
include/o3tl/compat_functional.hxx | 65 ----------
include/o3tl/functional.hxx | 65 ++++++++++
o3tl/README | 7 -
reportdesign/source/ui/inspection/GeometryHandler.cxx | 2
sd/inc/pch/precompiled_sd.hxx | 2
sd/source/ui/tools/PropertySet.cxx | 1
svx/inc/pch/precompiled_svxcore.hxx | 2
svx/source/form/formcontroller.cxx | 2
26 files changed, 91 insertions(+), 91 deletions(-)
New commits:
commit ad1f0d1f1a195a00cf2ec2848745fdc6186bfbb1
Author: Thorsten Behrens <Thorsten.Behrens at CIB.de>
Date: Mon Aug 17 14:40:17 2015 +0200
o3tl: rename compat_functional header
After the cleanup, the stuff there really stands on its own (and the
remaining usage of select1st/2nd is more descriptive than lambdas).
Change-Id: I0aba131d5dc550189f8130d167dc94167e404540
Reviewed-on: https://gerrit.libreoffice.org/17806
Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
diff --git a/basctl/inc/pch/precompiled_basctl.hxx b/basctl/inc/pch/precompiled_basctl.hxx
index ec4fc38..0ae4276 100644
--- a/basctl/inc/pch/precompiled_basctl.hxx
+++ b/basctl/inc/pch/precompiled_basctl.hxx
@@ -112,7 +112,7 @@
#include <framework/documentundoguard.hxx>
#include <initializer_list>
#include <map>
-#include <o3tl/compat_functional.hxx>
+#include <o3tl/functional.hxx>
#include <officecfg/Office/Common.hxx>
#include <osl/diagnose.h>
#include <osl/file.hxx>
diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx
index f43879c..9e4ab9b 100644
--- a/basctl/source/dlged/dlgedobj.cxx
+++ b/basctl/source/dlged/dlgedobj.cxx
@@ -39,7 +39,7 @@
#include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
#include <com/sun/star/script/XScriptEventsSupplier.hpp>
#include <com/sun/star/table/CellAddress.hpp>
-#include <o3tl/compat_functional.hxx>
+#include <o3tl/functional.hxx>
#include <unotools/sharedunocomponent.hxx>
#include <vcl/svapp.hxx>
diff --git a/canvas/source/factory/cf_service.cxx b/canvas/source/factory/cf_service.cxx
index 9d1d2b2..3a8130d 100644
--- a/canvas/source/factory/cf_service.cxx
+++ b/canvas/source/factory/cf_service.cxx
@@ -38,7 +38,7 @@
#include <cppuhelper/supportsservice.hxx>
#include <osl/mutex.hxx>
#include <osl/process.h>
-#include <o3tl/compat_functional.hxx>
+#include <o3tl/functional.hxx>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx b/chart2/source/controller/accessibility/AccessibleBase.cxx
index d092640..c14f9da 100644
--- a/chart2/source/controller/accessibility/AccessibleBase.cxx
+++ b/chart2/source/controller/accessibility/AccessibleBase.cxx
@@ -48,7 +48,7 @@
#include <vcl/window.hxx>
#include <vcl/graph.hxx>
#include <vcl/settings.hxx>
-#include <o3tl/compat_functional.hxx>
+#include <o3tl/functional.hxx>
#include <algorithm>
diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
index d89abcc..d356bea 100644
--- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
@@ -66,7 +66,7 @@
#include <vector>
#include <algorithm>
#include <functional>
-#include <o3tl/compat_functional.hxx>
+#include <o3tl/functional.hxx>
using namespace ::com::sun::star;
using namespace ::com::sun::star::chart;
diff --git a/chart2/source/inc/ContainerHelper.hxx b/chart2/source/inc/ContainerHelper.hxx
index 7e6f68e..4f3232b 100644
--- a/chart2/source/inc/ContainerHelper.hxx
+++ b/chart2/source/inc/ContainerHelper.hxx
@@ -25,7 +25,7 @@
#include <algorithm>
#include <functional>
-#include <o3tl/compat_functional.hxx>
+#include <o3tl/functional.hxx>
namespace chart
{
diff --git a/chart2/source/model/template/ChartTypeManager.cxx b/chart2/source/model/template/ChartTypeManager.cxx
index 69218d1..f166c6d 100644
--- a/chart2/source/model/template/ChartTypeManager.cxx
+++ b/chart2/source/model/template/ChartTypeManager.cxx
@@ -45,7 +45,7 @@
#include <algorithm>
#include <iterator>
#include <functional>
-#include <o3tl/compat_functional.hxx>
+#include <o3tl/functional.hxx>
using namespace ::com::sun::star;
diff --git a/connectivity/source/commontools/TSortIndex.cxx b/connectivity/source/commontools/TSortIndex.cxx
index 9e3632d..11638fe 100644
--- a/connectivity/source/commontools/TSortIndex.cxx
+++ b/connectivity/source/commontools/TSortIndex.cxx
@@ -20,7 +20,7 @@
#include "TSortIndex.hxx"
#include <algorithm>
#include <iterator>
-#include <o3tl/compat_functional.hxx>
+#include <o3tl/functional.hxx>
using namespace connectivity;
diff --git a/connectivity/source/commontools/TTableHelper.cxx b/connectivity/source/commontools/TTableHelper.cxx
index 30c6a1b..fd58514 100644
--- a/connectivity/source/commontools/TTableHelper.cxx
+++ b/connectivity/source/commontools/TTableHelper.cxx
@@ -37,7 +37,7 @@
#include <unotools/sharedunocomponent.hxx>
#include "TConnection.hxx"
-#include <o3tl/compat_functional.hxx>
+#include <o3tl/functional.hxx>
#include <iterator>
#include <set>
diff --git a/dbaccess/source/core/dataaccess/documentevents.cxx b/dbaccess/source/core/dataaccess/documentevents.cxx
index 40c0d18..c4e947a 100644
--- a/dbaccess/source/core/dataaccess/documentevents.cxx
+++ b/dbaccess/source/core/dataaccess/documentevents.cxx
@@ -26,7 +26,7 @@
#include <algorithm>
#include <functional>
-#include <o3tl/compat_functional.hxx>
+#include <o3tl/functional.hxx>
namespace dbaccess
{
diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx
index a290a0b..5a9fd738 100644
--- a/dbaccess/source/ui/browser/genericcontroller.cxx
+++ b/dbaccess/source/ui/browser/genericcontroller.cxx
@@ -58,7 +58,7 @@
#include <com/sun/star/util/XModifiable.hpp>
#include <rtl/ustring.hxx>
#include <algorithm>
-#include <o3tl/compat_functional.hxx>
+#include <o3tl/functional.hxx>
#include <boost/scoped_ptr.hpp>
#include <cppuhelper/implbase1.hxx>
#include <limits>
diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
index 2fe9262..f32ae28 100644
--- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx
+++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
@@ -70,7 +70,7 @@
#include <algorithm>
#include <functional>
-#include <o3tl/compat_functional.hxx>
+#include <o3tl/functional.hxx>
namespace dbaui
{
diff --git a/extensions/source/propctrlr/eformshelper.cxx b/extensions/source/propctrlr/eformshelper.cxx
index a767288..a569055 100644
--- a/extensions/source/propctrlr/eformshelper.cxx
+++ b/extensions/source/propctrlr/eformshelper.cxx
@@ -34,7 +34,7 @@
#include <functional>
#include <algorithm>
-#include <o3tl/compat_functional.hxx>
+#include <o3tl/functional.hxx>
namespace pcr
{
diff --git a/extensions/source/propctrlr/eventhandler.cxx b/extensions/source/propctrlr/eventhandler.cxx
index f030e64..19a3f6e 100644
--- a/extensions/source/propctrlr/eventhandler.cxx
+++ b/extensions/source/propctrlr/eventhandler.cxx
@@ -68,7 +68,7 @@
#include <map>
#include <algorithm>
-#include <o3tl/compat_functional.hxx>
+#include <o3tl/functional.hxx>
extern "C" void SAL_CALL createRegistryInfo_EventHandler()
{
diff --git a/extensions/source/propctrlr/genericpropertyhandler.cxx b/extensions/source/propctrlr/genericpropertyhandler.cxx
index de94363..7cee505 100644
--- a/extensions/source/propctrlr/genericpropertyhandler.cxx
+++ b/extensions/source/propctrlr/genericpropertyhandler.cxx
@@ -41,7 +41,7 @@
#include <tools/debug.hxx>
#include <algorithm>
-#include <o3tl/compat_functional.hxx>
+#include <o3tl/functional.hxx>
extern "C" void SAL_CALL createRegistryInfo_GenericPropertyHandler()
{
diff --git a/forms/inc/pch/precompiled_frm.hxx b/forms/inc/pch/precompiled_frm.hxx
index 829ed3b..f73772c 100644
--- a/forms/inc/pch/precompiled_frm.hxx
+++ b/forms/inc/pch/precompiled_frm.hxx
@@ -282,7 +282,7 @@
#include <limits>
#include <list>
#include <memory>
-#include <o3tl/compat_functional.hxx>
+#include <o3tl/functional.hxx>
#include <ooo/vba/XVBAToOOEventDescGen.hpp>
#include <osl/diagnose.h>
#include <osl/file.hxx>
diff --git a/forms/source/xforms/convert.cxx b/forms/source/xforms/convert.cxx
index 1933daf..0ca3e80 100644
--- a/forms/source/xforms/convert.cxx
+++ b/forms/source/xforms/convert.cxx
@@ -23,7 +23,7 @@
#include "unohelper.hxx"
#include <algorithm>
#include <functional>
-#include <o3tl/compat_functional.hxx>
+#include <o3tl/functional.hxx>
#include <rtl/math.hxx>
#include <rtl/ustrbuf.hxx>
#include <osl/diagnose.h>
diff --git a/forms/source/xforms/datatyperepository.cxx b/forms/source/xforms/datatyperepository.cxx
index 8bb0123..f2f4ed4 100644
--- a/forms/source/xforms/datatyperepository.cxx
+++ b/forms/source/xforms/datatyperepository.cxx
@@ -29,7 +29,7 @@
#include <functional>
#include <algorithm>
-#include <o3tl/compat_functional.hxx>
+#include <o3tl/functional.hxx>
namespace xforms
{
diff --git a/include/o3tl/compat_functional.hxx b/include/o3tl/functional.hxx
similarity index 100%
rename from include/o3tl/compat_functional.hxx
rename to include/o3tl/functional.hxx
diff --git a/o3tl/README b/o3tl/README
index 9a222f5..7900e70 100644
--- a/o3tl/README
+++ b/o3tl/README
@@ -24,6 +24,7 @@ Represents a range of integer or iterator values.
[git:o3tl/inc/o3tl/vector_pool.hxx]
Simple vector-based memory pool allocator.
-[git:o3tl/inc/o3tl/compat_functional.hxx]
-Some more templates. Contains also templates from STLport's functional header that are not part of the
-C++ standard (STLport has been replaced by direct use of the C++ STL in LibreOffice).
+[git:o3tl/inc/o3tl/functional.hxx]
+Some more templates, leftovers in spirit of STLport's old functional
+header that are not part of the C++ standard (STLport has been
+replaced by direct use of the C++ STL in LibreOffice).
diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx
index 1a5bcf3..064248c 100644
--- a/reportdesign/source/ui/inspection/GeometryHandler.cxx
+++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx
@@ -103,7 +103,7 @@
#include "dlgpage.hxx"
#include "helpids.hrc"
#include <toolkit/helper/convert.hxx>
-#include <o3tl/compat_functional.hxx>
+#include <o3tl/functional.hxx>
#define DATA_OR_FORMULA 0
#define FUNCTION 1
diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx
index 62ab27d..ea9a234 100644
--- a/sd/inc/pch/precompiled_sd.hxx
+++ b/sd/inc/pch/precompiled_sd.hxx
@@ -472,7 +472,7 @@
#include <memory>
#include <new>
#include <numeric>
-#include <o3tl/compat_functional.hxx>
+#include <o3tl/functional.hxx>
#include <officecfg/Office/Common.hxx>
#include <officecfg/Office/Impress.hxx>
#include <osl/diagnose.h>
diff --git a/sd/source/ui/tools/PropertySet.cxx b/sd/source/ui/tools/PropertySet.cxx
index dd1e650..0640b03 100644
--- a/sd/source/ui/tools/PropertySet.cxx
+++ b/sd/source/ui/tools/PropertySet.cxx
@@ -19,7 +19,6 @@
#include "tools/PropertySet.hxx"
#include <algorithm>
-#include <o3tl/compat_functional.hxx>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
diff --git a/svx/inc/pch/precompiled_svxcore.hxx b/svx/inc/pch/precompiled_svxcore.hxx
index 88b47f3..febf7c0 100644
--- a/svx/inc/pch/precompiled_svxcore.hxx
+++ b/svx/inc/pch/precompiled_svxcore.hxx
@@ -610,7 +610,7 @@
#include <map>
#include <math.h>
#include <memory>
-#include <o3tl/compat_functional.hxx>
+#include <o3tl/functional.hxx>
#include <o3tl/numeric.hxx>
#include <osl/diagnose.h>
#include <osl/endian.h>
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx
index c907601..683ad82 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -89,7 +89,7 @@
#include <algorithm>
-#include <o3tl/compat_functional.hxx>
+#include <o3tl/functional.hxx>
using namespace ::com::sun::star;
using namespace ::comphelper;
More information about the Libreoffice-commits
mailing list