diff options
-rw-r--r-- | dbaccess/inc/pch/precompiled_dba.hxx | 1 | ||||
-rw-r--r-- | dbaccess/inc/pch/precompiled_dbu.hxx | 1 | ||||
-rw-r--r-- | dbaccess/source/core/dataaccess/databasedocument.cxx | 17 |
3 files changed, 10 insertions, 9 deletions
diff --git a/dbaccess/inc/pch/precompiled_dba.hxx b/dbaccess/inc/pch/precompiled_dba.hxx index 77edfdb82a06..d4e2b5e9cee1 100644 --- a/dbaccess/inc/pch/precompiled_dba.hxx +++ b/dbaccess/inc/pch/precompiled_dba.hxx @@ -49,7 +49,6 @@ #include <type_traits> #include <utility> #include <vector> -#include <boost/bind.hpp> #include <boost/intrusive_ptr.hpp> #include <boost/optional.hpp> #include <boost/optional/optional.hpp> diff --git a/dbaccess/inc/pch/precompiled_dbu.hxx b/dbaccess/inc/pch/precompiled_dbu.hxx index 3f2491e5805d..07392df7337c 100644 --- a/dbaccess/inc/pch/precompiled_dbu.hxx +++ b/dbaccess/inc/pch/precompiled_dbu.hxx @@ -31,7 +31,6 @@ #include <stdlib.h> #include <string.h> #include <vector> -#include <boost/bind.hpp> #include <boost/intrusive_ptr.hpp> #include <boost/optional.hpp> #include <osl/diagnose.h> diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx index 3e398a9071cb..9e0ee5eceb92 100644 --- a/dbaccess/source/core/dataaccess/databasedocument.cxx +++ b/dbaccess/source/core/dataaccess/databasedocument.cxx @@ -81,8 +81,6 @@ #include <osl/diagnose.h> #include <tools/errcode.hxx> -#include <boost/bind.hpp> - #include <functional> #include <list> @@ -1500,7 +1498,8 @@ void ODatabaseDocument::impl_disposeControllerFrames_nothrow() } } -void SAL_CALL ODatabaseDocument::close( sal_Bool _bDeliverOwnership ) throw (CloseVetoException, RuntimeException, std::exception) +void SAL_CALL ODatabaseDocument::close(sal_Bool bDeliverOwnership) +throw (CloseVetoException, RuntimeException, std::exception) { // nearly everything below can/must be done without our mutex locked, the below is just for // the checks for being disposed and the like @@ -1517,12 +1516,14 @@ void SAL_CALL ODatabaseDocument::close( sal_Bool _bDeliverOwnership ) throw (Clo // allow listeners to veto lang::EventObject aEvent( *this ); m_aCloseListener.forEach< XCloseListener >( - boost::bind( &XCloseListener::queryClosing, _1, boost::cref( aEvent ), boost::cref( _bDeliverOwnership ) ) ); + [&aEvent, &bDeliverOwnership] (uno::Reference<XCloseListener> const& xListener) { + return xListener->queryClosing(aEvent, bDeliverOwnership); + }); // notify that we're going to unload m_aEventNotifier.notifyDocumentEvent( "OnPrepareUnload" ); - impl_closeControllerFrames_nolck_throw( _bDeliverOwnership ); + impl_closeControllerFrames_nolck_throw( bDeliverOwnership ); m_aCloseListener.notifyEach( &XCloseListener::notifyClosing, (const lang::EventObject&)aEvent ); @@ -1777,12 +1778,14 @@ Sequence< OUString > SAL_CALL ODatabaseDocument::getDocumentSubStoragesNames( ) return xStorageAccess->getDocumentSubStoragesNames(); } -void ODatabaseDocument::impl_notifyStorageChange_nolck_nothrow( const Reference< XStorage >& _rxNewRootStorage ) +void ODatabaseDocument::impl_notifyStorageChange_nolck_nothrow( const Reference< XStorage >& xNewRootStorage ) { Reference< XInterface > xMe( *this ); m_aStorageListeners.forEach< XStorageChangeListener >( - boost::bind( &XStorageChangeListener::notifyStorageChange, _1, boost::cref( xMe ), boost::cref( _rxNewRootStorage ) ) ); + [&xMe, &xNewRootStorage] (uno::Reference<XStorageChangeListener> const& xListener) { + return xListener->notifyStorageChange(xMe, xNewRootStorage); + }); } void ODatabaseDocument::disposing() |