diff options
| -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/api/Functions.cxx | 4 | ||||
| -rw-r--r-- | reportdesign/source/core/api/Groups.cxx | 4 | ||||
| -rw-r--r-- | reportdesign/source/core/api/ReportDefinition.cxx | 1 | ||||
| -rw-r--r-- | reportdesign/source/ui/report/ReportController.cxx | 1 |
6 files changed, 4 insertions, 8 deletions
diff --git a/reportdesign/inc/pch/precompiled_rpt.hxx b/reportdesign/inc/pch/precompiled_rpt.hxx index 97dbd4db0a70..051c05a9d251 100644 --- a/reportdesign/inc/pch/precompiled_rpt.hxx +++ b/reportdesign/inc/pch/precompiled_rpt.hxx @@ -56,7 +56,6 @@ #include <boost/bind.hpp> #include <boost/functional/hash.hpp> #include <boost/intrusive_ptr.hpp> -#include <boost/mem_fn.hpp> #include <boost/noncopyable.hpp> #include <boost/optional.hpp> #include <boost/shared_array.hpp> diff --git a/reportdesign/inc/pch/precompiled_rptui.hxx b/reportdesign/inc/pch/precompiled_rptui.hxx index dc85cee9272f..e1510844127f 100644 --- a/reportdesign/inc/pch/precompiled_rptui.hxx +++ b/reportdesign/inc/pch/precompiled_rptui.hxx @@ -59,7 +59,6 @@ #include <boost/bind.hpp> #include <boost/functional/hash.hpp> #include <boost/intrusive_ptr.hpp> -#include <boost/mem_fn.hpp> #include <boost/noncopyable.hpp> #include <boost/shared_array.hpp> #include <osl/conditn.h> diff --git a/reportdesign/source/core/api/Functions.cxx b/reportdesign/source/core/api/Functions.cxx index e20c526dc602..e436e39fa03f 100644 --- a/reportdesign/source/core/api/Functions.cxx +++ b/reportdesign/source/core/api/Functions.cxx @@ -22,7 +22,6 @@ #include "core_resource.hxx" #include "core_resource.hrc" #include <comphelper/property.hxx> -#include <boost/mem_fn.hpp> #include <algorithm> namespace reportdesign @@ -53,7 +52,8 @@ void SAL_CALL OFunctions::dispose() throw(uno::RuntimeException, std::exception) void SAL_CALL OFunctions::disposing() { - ::std::for_each(m_aFunctions.begin(),m_aFunctions.end(),::boost::mem_fn(&css::report::XFunction::dispose)); + for (auto& rFunction : m_aFunctions) + rFunction->dispose(); m_aFunctions.clear(); lang::EventObject aDisposeEvent( static_cast< ::cppu::OWeakObject* >( this ) ); m_aContainerListeners.disposeAndClear( aDisposeEvent ); diff --git a/reportdesign/source/core/api/Groups.cxx b/reportdesign/source/core/api/Groups.cxx index 30756c475fd4..65308e5bd7e1 100644 --- a/reportdesign/source/core/api/Groups.cxx +++ b/reportdesign/source/core/api/Groups.cxx @@ -21,7 +21,6 @@ #include <tools/debug.hxx> #include "core_resource.hxx" #include "core_resource.hrc" -#include <boost/mem_fn.hpp> #include <algorithm> namespace reportdesign @@ -52,7 +51,8 @@ void SAL_CALL OGroups::dispose() throw(uno::RuntimeException, std::exception) void SAL_CALL OGroups::disposing() { - ::std::for_each(m_aGroups.begin(),m_aGroups.end(),::boost::mem_fn(&css::report::XGroup::dispose)); + for(auto& rGroup : m_aGroups) + rGroup->dispose(); m_aGroups.clear(); lang::EventObject aDisposeEvent( static_cast< ::cppu::OWeakObject* >( this ) ); m_aContainerListeners.disposeAndClear( aDisposeEvent ); diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx index cc825ea36882..648f163843a1 100644 --- a/reportdesign/source/core/api/ReportDefinition.cxx +++ b/reportdesign/source/core/api/ReportDefinition.cxx @@ -125,7 +125,6 @@ #include <vcl/virdev.hxx> #include <boost/bind.hpp> -#include <boost/mem_fn.hpp> #include <boost/noncopyable.hpp> // page styles diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index 3f61c9baa961..05d22cedf130 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -140,7 +140,6 @@ #include "PageNumber.hxx" #include "UndoEnv.hxx" -#include <boost/mem_fn.hpp> #include <boost/bind.hpp> #include <boost/noncopyable.hpp> #include <memory> |