summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2015-07-31 21:37:19 +0200
committerMichael Stahl <mstahl@redhat.com>2015-07-31 21:54:25 +0200
commitfb038a0d0d36799c169db778b6d47ac1a73f1c0d (patch)
tree5d812bcb75ad15ef44b18c4137fb9aec9f364bd4
parentc2966acc465086b164b36e3366f164554f83ad21 (diff)
dbaccess: replace boost::function with std::function
Change-Id: I4bea36a9add24f9144c8e222e9ce42c7c9f3678b
-rw-r--r--dbaccess/source/core/api/CRowSetColumn.cxx2
-rw-r--r--dbaccess/source/core/api/CRowSetColumn.hxx2
-rw-r--r--dbaccess/source/core/api/CRowSetDataColumn.cxx2
-rw-r--r--dbaccess/source/core/api/CRowSetDataColumn.hxx6
4 files changed, 6 insertions, 6 deletions
diff --git a/dbaccess/source/core/api/CRowSetColumn.cxx b/dbaccess/source/core/api/CRowSetColumn.cxx
index adc3d3835faf..2a8492fa291b 100644
--- a/dbaccess/source/core/api/CRowSetColumn.cxx
+++ b/dbaccess/source/core/api/CRowSetColumn.cxx
@@ -41,7 +41,7 @@ ORowSetColumn::ORowSetColumn( const Reference < XResultSetMetaData >& _xMetaData
const Reference< XDatabaseMetaData >& _rxDBMeta,
const OUString& _rDescription,
const OUString& i_sLabel,
- const boost::function< const ::connectivity::ORowSetValue& ( sal_Int32 ) > &_getValue )
+ const std::function<const ::connectivity::ORowSetValue& (sal_Int32)> &_getValue )
:ORowSetDataColumn( _xMetaData, _xRow, NULL, _nPos, _rxDBMeta, _rDescription, i_sLabel, _getValue )
{
}
diff --git a/dbaccess/source/core/api/CRowSetColumn.hxx b/dbaccess/source/core/api/CRowSetColumn.hxx
index 0c4ec827c996..63f7c65a8d07 100644
--- a/dbaccess/source/core/api/CRowSetColumn.hxx
+++ b/dbaccess/source/core/api/CRowSetColumn.hxx
@@ -38,7 +38,7 @@ namespace dbaccess
const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _rxDBMeta,
const OUString& _rDescription,
const OUString& i_sLabel,
- const boost::function< const ::connectivity::ORowSetValue& ( sal_Int32 ) > &_getValue);
+ const std::function<const ::connectivity::ORowSetValue& (sal_Int32)> &_getValue);
virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const SAL_OVERRIDE;
virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE;
diff --git a/dbaccess/source/core/api/CRowSetDataColumn.cxx b/dbaccess/source/core/api/CRowSetDataColumn.cxx
index 876fc2a6d7b8..4431da1146fe 100644
--- a/dbaccess/source/core/api/CRowSetDataColumn.cxx
+++ b/dbaccess/source/core/api/CRowSetDataColumn.cxx
@@ -48,7 +48,7 @@ ORowSetDataColumn::ORowSetDataColumn( const Reference < XResultSetMetaData >& _x
const Reference< XDatabaseMetaData >& _rxDBMeta,
const OUString& _rDescription,
const OUString& i_sLabel,
- const boost::function< const ORowSetValue& (sal_Int32)> &_getValue)
+ const std::function<const ORowSetValue& (sal_Int32)> &_getValue)
:ODataColumn(_xMetaData,_xRow,_xRowUpdate,_nPos,_rxDBMeta)
,m_pGetValue(_getValue)
,m_sLabel(i_sLabel)
diff --git a/dbaccess/source/core/api/CRowSetDataColumn.hxx b/dbaccess/source/core/api/CRowSetDataColumn.hxx
index 0dc3db9866f8..6a7809d01208 100644
--- a/dbaccess/source/core/api/CRowSetDataColumn.hxx
+++ b/dbaccess/source/core/api/CRowSetDataColumn.hxx
@@ -26,7 +26,7 @@
#include <connectivity/CommonTools.hxx>
#include <comphelper/proparrhlp.hxx>
-#include <boost/function.hpp>
+#include <functional>
namespace dbaccess
{
@@ -38,7 +38,7 @@ namespace dbaccess
public ORowSetDataColumn_PROP
{
protected:
- const boost::function< const ::connectivity::ORowSetValue& ( sal_Int32 ) > m_pGetValue;
+ const std::function<const ::connectivity::ORowSetValue& (sal_Int32)> m_pGetValue;
::com::sun::star::uno::Any m_aOldValue;
OUString m_sLabel;
@@ -53,7 +53,7 @@ namespace dbaccess
const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _rxDBMeta,
const OUString& _rDescription,
const OUString& i_sLabel,
- const boost::function< const ::connectivity::ORowSetValue& ( sal_Int32 ) > &_getValue);
+ const std::function<const ::connectivity::ORowSetValue& (sal_Int32)> &_getValue);
// com::sun::star::lang::XTypeProvider