bridges/source/jni_uno/jni_info.h | 4 ++--
dbaccess/inc/pch/precompiled_dbu.hxx | 1 -
dbaccess/source/ui/tabledesign/TableController.cxx | 11 ++++-------
reportdesign/inc/pch/precompiled_rpt.hxx | 1 -
reportdesign/inc/pch/precompiled_rptui.hxx | 1 -
reportdesign/source/core/api/Functions.cxx | 4 ++--
reportdesign/source/core/api/Groups.cxx | 4 ++--
reportdesign/source/core/api/ReportDefinition.cxx | 1 -
reportdesign/source/ui/report/ReportController.cxx | 1 -
9 files changed, 10 insertions(+), 18 deletions(-)
New commits:
commit e259c58227a4b8bfe5b2bb0457afcf6907c90800
Author: Noel Grandin <n...@peralex.com>
Date: Mon Feb 1 09:07:13 2016 +0200
boost::mem_fn->std::mem_fn in reportdesign
Change-Id: I05c8b22ed7af8ea0ac59ac21707025ec7808bf55
diff --git a/reportdesign/inc/pch/precompiled_rpt.hxx
b/reportdesign/inc/pch/precompiled_rpt.hxx
index 97dbd4d..051c05a 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 dc85cee..e151084 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 e20c526..e436e39 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 30756c4..65308e5 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 cc825ea..648f163 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 3f61c9b..05d22ce 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>
commit 5805be0b349ebb1be6a3613368bffc63644b1c84
Author: Noel Grandin <n...@peralex.com>
Date: Mon Feb 1 08:57:13 2016 +0200
boost::mem_fn->std::mem_fn in dbaccess
Change-Id: I9156e106d12b670e94bab899a4f67a35701ae5ac
diff --git a/dbaccess/inc/pch/precompiled_dbu.hxx
b/dbaccess/inc/pch/precompiled_dbu.hxx
index 7a6f7d3..84bdc63 100644
--- a/dbaccess/inc/pch/precompiled_dbu.hxx
+++ b/dbaccess/inc/pch/precompiled_dbu.hxx
@@ -33,7 +33,6 @@
#include <vector>
#include <boost/bind.hpp>
#include <boost/intrusive_ptr.hpp>
-#include <boost/mem_fn.hpp>
#include <boost/noncopyable.hpp>
#include <boost/optional.hpp>
#include <osl/diagnose.h>
diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx
b/dbaccess/source/ui/tabledesign/TableController.cxx
index 97fd96e..fbdbe93 100644
--- a/dbaccess/source/ui/tabledesign/TableController.cxx
+++ b/dbaccess/source/ui/tabledesign/TableController.cxx
@@ -67,9 +67,6 @@
#include <tools/diagnose_ex.h>
#include <vcl/layout.hxx>
-#include <boost/mem_fn.hpp>
-#include <boost/bind.hpp>
-
#include <algorithm>
#include <functional>
@@ -193,14 +190,14 @@ FeatureState OTableController::GetState(sal_uInt16 _nId)
const
aReturn.bEnabled = true;
break;
case ID_BROWSER_SAVEDOC:
- aReturn.bEnabled = isEditable() &&
::std::any_of(m_vRowList.begin(),m_vRowList.end(),::boost::mem_fn(&OTableRow::isValid));
+ aReturn.bEnabled = isEditable() &&
::std::any_of(m_vRowList.begin(),m_vRowList.end(),::std::mem_fn(&OTableRow::isValid));
break;
case ID_BROWSER_SAVEASDOC:
aReturn.bEnabled = isConnected() && isEditable();
if ( aReturn.bEnabled )
{
aReturn.bEnabled =
::std::any_of(m_vRowList.begin(),m_vRowList.end(),
-
::boost::mem_fn(&OTableRow::isValid));
+
::std::mem_fn(&OTableRow::isValid));
}
break;
@@ -223,7 +220,7 @@ FeatureState OTableController::GetState(sal_uInt16 _nId)
const
if ( aReturn.bEnabled )
{
aReturn.bEnabled =
::std::any_of(m_vRowList.begin(),m_vRowList.end(),
-
::boost::mem_fn(&OTableRow::isValid));
+
::std::mem_fn(&OTableRow::isValid));
}
break;
default:
@@ -552,7 +549,7 @@ sal_Bool SAL_CALL OTableController::suspend(sal_Bool
/*_bSuspend*/) throw( Runti
if ( isModified() )
{
if ( ::std::any_of(m_vRowList.begin(),m_vRowList.end(),
- ::boost::mem_fn(&OTableRow::isValid)) )
+ ::std::mem_fn(&OTableRow::isValid)) )
{
ScopedVclPtrInstance<MessageDialog> aQry(getView(),
"TableDesignSaveModifiedDialog",
"dbaccess/ui/tabledesignsavemodifieddialog.ui");
commit 0dfcb858c1e863f6df225ae774bb567f8cfe00c9
Author: Noel Grandin <n...@peralex.com>
Date: Mon Feb 1 08:42:49 2016 +0200
boost::unordered_map->std::unordered_map in bridges
Change-Id: Idf77d0871f932cf94003013db81c1bb67edbef16
diff --git a/bridges/source/jni_uno/jni_info.h
b/bridges/source/jni_uno/jni_info.h
index 962503b..2ff2048 100644
--- a/bridges/source/jni_uno/jni_info.h
+++ b/bridges/source/jni_uno/jni_info.h
@@ -23,7 +23,7 @@
#include <sal/config.h>
#include <boost/noncopyable.hpp>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
#include "jni_base.h"
@@ -114,7 +114,7 @@ struct JNI_type_info_holder: private boost::noncopyable
{}
};
-typedef ::boost::unordered_map<
+typedef ::std::unordered_map<
OUString, JNI_type_info_holder, OUStringHash > t_str2type;
class JNI_info: private boost::noncopyable
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
