Kaydet (Commit) 5805be0b authored tarafından Noel Grandin's avatar Noel Grandin

boost::mem_fn->std::mem_fn in dbaccess

Change-Id: I9156e106d12b670e94bab899a4f67a35701ae5ac
üst 0dfcb858
...@@ -33,7 +33,6 @@ ...@@ -33,7 +33,6 @@
#include <vector> #include <vector>
#include <boost/bind.hpp> #include <boost/bind.hpp>
#include <boost/intrusive_ptr.hpp> #include <boost/intrusive_ptr.hpp>
#include <boost/mem_fn.hpp>
#include <boost/noncopyable.hpp> #include <boost/noncopyable.hpp>
#include <boost/optional.hpp> #include <boost/optional.hpp>
#include <osl/diagnose.h> #include <osl/diagnose.h>
......
...@@ -67,9 +67,6 @@ ...@@ -67,9 +67,6 @@
#include <tools/diagnose_ex.h> #include <tools/diagnose_ex.h>
#include <vcl/layout.hxx> #include <vcl/layout.hxx>
#include <boost/mem_fn.hpp>
#include <boost/bind.hpp>
#include <algorithm> #include <algorithm>
#include <functional> #include <functional>
...@@ -193,14 +190,14 @@ FeatureState OTableController::GetState(sal_uInt16 _nId) const ...@@ -193,14 +190,14 @@ FeatureState OTableController::GetState(sal_uInt16 _nId) const
aReturn.bEnabled = true; aReturn.bEnabled = true;
break; break;
case ID_BROWSER_SAVEDOC: 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; break;
case ID_BROWSER_SAVEASDOC: case ID_BROWSER_SAVEASDOC:
aReturn.bEnabled = isConnected() && isEditable(); aReturn.bEnabled = isConnected() && isEditable();
if ( aReturn.bEnabled ) if ( aReturn.bEnabled )
{ {
aReturn.bEnabled = ::std::any_of(m_vRowList.begin(),m_vRowList.end(), aReturn.bEnabled = ::std::any_of(m_vRowList.begin(),m_vRowList.end(),
::boost::mem_fn(&OTableRow::isValid)); ::std::mem_fn(&OTableRow::isValid));
} }
break; break;
...@@ -223,7 +220,7 @@ FeatureState OTableController::GetState(sal_uInt16 _nId) const ...@@ -223,7 +220,7 @@ FeatureState OTableController::GetState(sal_uInt16 _nId) const
if ( aReturn.bEnabled ) if ( aReturn.bEnabled )
{ {
aReturn.bEnabled = ::std::any_of(m_vRowList.begin(),m_vRowList.end(), aReturn.bEnabled = ::std::any_of(m_vRowList.begin(),m_vRowList.end(),
::boost::mem_fn(&OTableRow::isValid)); ::std::mem_fn(&OTableRow::isValid));
} }
break; break;
default: default:
...@@ -552,7 +549,7 @@ sal_Bool SAL_CALL OTableController::suspend(sal_Bool /*_bSuspend*/) throw( Runti ...@@ -552,7 +549,7 @@ sal_Bool SAL_CALL OTableController::suspend(sal_Bool /*_bSuspend*/) throw( Runti
if ( isModified() ) if ( isModified() )
{ {
if ( ::std::any_of(m_vRowList.begin(),m_vRowList.end(), 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", ScopedVclPtrInstance<MessageDialog> aQry(getView(), "TableDesignSaveModifiedDialog",
"dbaccess/ui/tabledesignsavemodifieddialog.ui"); "dbaccess/ui/tabledesignsavemodifieddialog.ui");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment