diff options
| author | Daniel Robertson <danlrobertson89@gmail.com> | 2015-08-08 00:06:37 -0400 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2015-08-11 22:22:05 +0000 |
| commit | f6595f0b3389ffeefa10035d915a884b02d26c0e (patch) | |
| tree | 773ab4f423f1238c9e4bb8c7c305e0a01feef6de /reportdesign | |
| parent | 7f3e313307e8c99f719654622c97fb742d728e0f (diff) | |
tdf#92459 remove o3tl/compat_functional.hxx
Replace all uses of deprecated features from the o3tl included in
compat_functional.hxx with lambda expressions in connectivity and
reportdesign. The patch should not cause any side effects. The change is
largely cosmetic.
Change-Id: I2042b91bf0fa2b47cce9ea11c97fa4ca6734c5e2
Reviewed-on: https://gerrit.libreoffice.org/17588
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'reportdesign')
| -rw-r--r-- | reportdesign/inc/pch/precompiled_rpt.hxx | 1 | ||||
| -rw-r--r-- | reportdesign/inc/pch/precompiled_rptui.hxx | 1 | ||||
| -rw-r--r-- | reportdesign/source/core/sdr/PropertyForward.cxx | 2 | ||||
| -rw-r--r-- | reportdesign/source/ui/inspection/GeometryHandler.cxx | 6 | ||||
| -rw-r--r-- | reportdesign/source/ui/report/ViewsWindow.cxx | 1 |
5 files changed, 4 insertions, 7 deletions
diff --git a/reportdesign/inc/pch/precompiled_rpt.hxx b/reportdesign/inc/pch/precompiled_rpt.hxx index 5c3dee69aa8c..cdf0f861d92f 100644 --- a/reportdesign/inc/pch/precompiled_rpt.hxx +++ b/reportdesign/inc/pch/precompiled_rpt.hxx @@ -151,7 +151,6 @@ #include <functional> #include <i18nlangtag/languagetag.hxx> #include <i18nlangtag/mslangid.hxx> -#include <o3tl/compat_functional.hxx> #include <osl/diagnose.h> #include <osl/mutex.hxx> #include <osl/thread.h> diff --git a/reportdesign/inc/pch/precompiled_rptui.hxx b/reportdesign/inc/pch/precompiled_rptui.hxx index 00268a8a1ea2..712651d84caa 100644 --- a/reportdesign/inc/pch/precompiled_rptui.hxx +++ b/reportdesign/inc/pch/precompiled_rptui.hxx @@ -202,7 +202,6 @@ #include <map> #include <memory> #include <numeric> -#include <o3tl/compat_functional.hxx> #include <osl/diagnose.h> #include <osl/mutex.hxx> #include <rtl/ref.hxx> diff --git a/reportdesign/source/core/sdr/PropertyForward.cxx b/reportdesign/source/core/sdr/PropertyForward.cxx index 8295c672c87d..718d95ed541e 100644 --- a/reportdesign/source/core/sdr/PropertyForward.cxx +++ b/reportdesign/source/core/sdr/PropertyForward.cxx @@ -24,8 +24,6 @@ #include <tools/debug.hxx> #include <tools/diagnose_ex.h> #include "corestrings.hrc" -#include <o3tl/compat_functional.hxx> - namespace rptui { diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx index b338c6738f17..1a5bcf3f4413 100644 --- a/reportdesign/source/ui/inspection/GeometryHandler.cxx +++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx @@ -103,7 +103,6 @@ #include "dlgpage.hxx" #include "helpids.hrc" #include <toolkit/helper/convert.hxx> - #include <o3tl/compat_functional.hxx> #define DATA_OR_FORMULA 0 @@ -1639,7 +1638,10 @@ void GeometryHandler::impl_fillFormulaList_nothrow(::std::vector< OUString >& _o if ( m_nDataFieldType == FUNCTION ) ::std::transform(m_aDefaultFunctions.begin(),m_aDefaultFunctions.end(),::std::back_inserter(_out_rList),::boost::bind( &DefaultFunction::getName, _1 )); else if ( m_nDataFieldType == USER_DEF_FUNCTION ) - ::std::transform(m_aFunctionNames.begin(),m_aFunctionNames.end(),::std::back_inserter(_out_rList),::o3tl::select1st<TFunctions::value_type>()); + ::std::transform( m_aFunctionNames.begin(), + m_aFunctionNames.end(), + ::std::back_inserter(_out_rList), + ::o3tl::select1st< TFunctions::value_type >() ); } OUString GeometryHandler::impl_ConvertUIToMimeType_nothrow(const OUString& _sUIName) const diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx index 9740f60e131e..eef1d574ab6d 100644 --- a/reportdesign/source/ui/report/ViewsWindow.cxx +++ b/reportdesign/source/ui/report/ViewsWindow.cxx @@ -49,7 +49,6 @@ #include <algorithm> #include <cstdlib> #include <numeric> -#include <o3tl/compat_functional.hxx> namespace rptui { |