[Libreoffice-commits] core.git: 6 commits - avmedia/source canvas/source dbaccess/source framework/inc framework/source sc/source sw/inc sw/source
Michael Stahl
mstahl at redhat.com
Fri Jul 31 13:16:43 PDT 2015
avmedia/source/vlc/wrapper/EventHandler.hxx | 5 +++--
avmedia/source/vlc/wrapper/EventManager.hxx | 6 +++---
canvas/source/opengl/ogl_canvashelper.cxx | 6 +++---
canvas/source/simplecanvas/simplecanvasimpl.cxx | 7 ++++---
dbaccess/source/core/api/CRowSetColumn.cxx | 2 +-
dbaccess/source/core/api/CRowSetColumn.hxx | 2 +-
dbaccess/source/core/api/CRowSetDataColumn.cxx | 2 +-
dbaccess/source/core/api/CRowSetDataColumn.hxx | 6 +++---
framework/inc/pch/precompiled_fwe.hxx | 2 +-
framework/source/fwe/helper/undomanagerhelper.cxx | 10 +++++-----
sc/source/ui/sidebar/CellBorderStylePopup.cxx | 2 +-
sc/source/ui/sidebar/CellBorderStylePopup.hxx | 5 +++--
sc/source/ui/sidebar/CellLineStylePopup.cxx | 2 +-
sc/source/ui/sidebar/CellLineStylePopup.hxx | 5 +++--
sw/inc/pch/precompiled_sw.hxx | 1 -
sw/source/core/doc/CntntIdxStore.cxx | 3 +--
sw/source/core/doc/docbm.cxx | 1 -
17 files changed, 34 insertions(+), 33 deletions(-)
New commits:
commit 326596f1ae6535c3299bb9e702496864d87fcffe
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Jul 31 21:47:13 2015 +0200
sw: replace boost::function with std::function
Change-Id: I5a0a0e83366ce518fc74d915bb8c43cc883ff016
diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx
index e740d22..c60047c 100644
--- a/sw/inc/pch/precompiled_sw.hxx
+++ b/sw/inc/pch/precompiled_sw.hxx
@@ -43,7 +43,6 @@
#include <basic/sbx.hxx>
#include <basic/sbxobj.hxx>
#include <basic/sbxvar.hxx>
-#include <boost/function.hpp>
#include <boost/make_shared.hpp>
#include <boost/noncopyable.hpp>
#include <boost/numeric/conversion/cast.hpp>
diff --git a/sw/source/core/doc/CntntIdxStore.cxx b/sw/source/core/doc/CntntIdxStore.cxx
index 834ff27..7b4e8a6 100644
--- a/sw/source/core/doc/CntntIdxStore.cxx
+++ b/sw/source/core/doc/CntntIdxStore.cxx
@@ -18,7 +18,6 @@
*/
#include <bookmrk.hxx>
-#include <boost/function.hpp>
#include <cntfrm.hxx>
#include <doc.hxx>
#include <IDocumentRedlineAccess.hxx>
@@ -129,7 +128,7 @@ namespace
std::vector<MarkEntry> m_aFlyEntries;
std::vector<PaMEntry> m_aUnoCrsrEntries;
std::vector<PaMEntry> m_aShellCrsrEntries;
- typedef boost::function<void (SwPosition& rPos, sal_Int32 nContent)> updater_t;
+ typedef std::function<void (SwPosition& rPos, sal_Int32 nContent)> updater_t;
virtual void Clear() SAL_OVERRIDE
{
m_aBkmkEntries.clear();
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index 060c32f..536cd7a 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -19,7 +19,6 @@
#include <MarkManager.hxx>
#include <bookmrk.hxx>
-#include <boost/function.hpp>
#include <cntfrm.hxx>
#include <crossrefbookmark.hxx>
#include <annotationmark.hxx>
commit 91352803344b7a1d20121f6aa4a642dbe45936b2
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Jul 31 21:45:31 2015 +0200
sc: replace boost::function with std::function
Change-Id: Ic98b20eabdc0e62078b28ab0219b00b67e8e1099
diff --git a/sc/source/ui/sidebar/CellBorderStylePopup.cxx b/sc/source/ui/sidebar/CellBorderStylePopup.cxx
index 1a27c25..f71603e 100644
--- a/sc/source/ui/sidebar/CellBorderStylePopup.cxx
+++ b/sc/source/ui/sidebar/CellBorderStylePopup.cxx
@@ -24,7 +24,7 @@ namespace sc { namespace sidebar {
CellBorderStylePopup::CellBorderStylePopup (
vcl::Window* pParent,
- const ::boost::function<svx::sidebar::PopupControl*(svx::sidebar::PopupContainer*)>& rControlCreator)
+ const ::std::function<svx::sidebar::PopupControl* (svx::sidebar::PopupContainer*)>& rControlCreator)
: Popup(pParent, rControlCreator, ::OUString("CellBorderStyle"))
{
}
diff --git a/sc/source/ui/sidebar/CellBorderStylePopup.hxx b/sc/source/ui/sidebar/CellBorderStylePopup.hxx
index 4b66db5..52124a8 100644
--- a/sc/source/ui/sidebar/CellBorderStylePopup.hxx
+++ b/sc/source/ui/sidebar/CellBorderStylePopup.hxx
@@ -20,7 +20,8 @@
#define INCLUDED_SC_SOURCE_UI_SIDEBAR_CELLBORDERSTYLEPOPUP_HXX
#include <svx/sidebar/Popup.hxx>
-#include <boost/function.hpp>
+
+#include <functional>
namespace sc { namespace sidebar {
@@ -29,7 +30,7 @@ class CellBorderStylePopup : public svx::sidebar::Popup
public:
CellBorderStylePopup(
vcl::Window* pParent,
- const ::boost::function<svx::sidebar::PopupControl*(svx::sidebar::PopupContainer*)>& rControlCreator);
+ const ::std::function<svx::sidebar::PopupControl*(svx::sidebar::PopupContainer*)>& rControlCreator);
virtual ~CellBorderStylePopup();
};
diff --git a/sc/source/ui/sidebar/CellLineStylePopup.cxx b/sc/source/ui/sidebar/CellLineStylePopup.cxx
index a65cc21..59b4b06 100644
--- a/sc/source/ui/sidebar/CellLineStylePopup.cxx
+++ b/sc/source/ui/sidebar/CellLineStylePopup.cxx
@@ -24,7 +24,7 @@ namespace sc { namespace sidebar {
CellLineStylePopup::CellLineStylePopup (
vcl::Window* pParent,
- const ::boost::function<svx::sidebar::PopupControl*(svx::sidebar::PopupContainer*)>& rControlCreator)
+ const ::std::function<svx::sidebar::PopupControl* (svx::sidebar::PopupContainer*)>& rControlCreator)
: Popup(pParent, rControlCreator, OUString("CellLineStyle"))
{
}
diff --git a/sc/source/ui/sidebar/CellLineStylePopup.hxx b/sc/source/ui/sidebar/CellLineStylePopup.hxx
index c7cdbce..76ac74d 100644
--- a/sc/source/ui/sidebar/CellLineStylePopup.hxx
+++ b/sc/source/ui/sidebar/CellLineStylePopup.hxx
@@ -20,7 +20,8 @@
#define INCLUDED_SC_SOURCE_UI_SIDEBAR_CELLLINESTYLEPOPUP_HXX
#include <svx/sidebar/Popup.hxx>
-#include <boost/function.hpp>
+
+#include <functional>
namespace sc { namespace sidebar {
@@ -29,7 +30,7 @@ class CellLineStylePopup : public svx::sidebar::Popup
public:
CellLineStylePopup(
vcl::Window* pParent,
- const ::boost::function<svx::sidebar::PopupControl*(svx::sidebar::PopupContainer*)>& rControlCreator);
+ const ::std::function<svx::sidebar::PopupControl* (svx::sidebar::PopupContainer*)>& rControlCreator);
virtual ~CellLineStylePopup();
void SetLineStyleSelect(sal_uInt16 out, sal_uInt16 in, sal_uInt16 dis);
commit 4cf0869b694fc9c4f2de4cfac3433c01a4a60184
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Jul 31 21:40:11 2015 +0200
framework: replace boost::function with std::function
Change-Id: I9342bbdaa626c88592d3a7bdf12f150cc2a605b1
diff --git a/framework/inc/pch/precompiled_fwe.hxx b/framework/inc/pch/precompiled_fwe.hxx
index ec8ec98..55820ec 100644
--- a/framework/inc/pch/precompiled_fwe.hxx
+++ b/framework/inc/pch/precompiled_fwe.hxx
@@ -15,7 +15,7 @@
*/
#include <algorithm>
-#include <boost/function.hpp>
+#include <functional>
#include <com/sun/star/awt/XBitmap.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
diff --git a/framework/source/fwe/helper/undomanagerhelper.cxx b/framework/source/fwe/helper/undomanagerhelper.cxx
index 36d84b5..07b9112 100644
--- a/framework/source/fwe/helper/undomanagerhelper.cxx
+++ b/framework/source/fwe/helper/undomanagerhelper.cxx
@@ -30,8 +30,8 @@
#include <osl/conditn.hxx>
#include <boost/bind.hpp>
-#include <boost/function.hpp>
+#include <functional>
#include <stack>
#include <queue>
@@ -138,7 +138,7 @@ namespace framework
class UndoManagerRequest : public ::comphelper::AnyEvent
{
public:
- UndoManagerRequest( ::boost::function0< void > const& i_request )
+ UndoManagerRequest( ::std::function<void ()> const& i_request )
:m_request( i_request )
,m_caughtException()
,m_finishCondition()
@@ -181,7 +181,7 @@ namespace framework
}
private:
- ::boost::function0< void > m_request;
+ ::std::function<void ()> m_request;
Any m_caughtException;
::osl::Condition m_finishCondition;
};
@@ -302,7 +302,7 @@ namespace framework
private:
/// adds a function to be called to the request processor's queue
- void impl_processRequest( ::boost::function0< void > const& i_request, IMutexGuard& i_instanceLock );
+ void impl_processRequest(::std::function<void ()> const& i_request, IMutexGuard& i_instanceLock);
/// impl-versions of the XUndoManager API.
void impl_enterUndoContext( const OUString& i_title, const bool i_hidden );
@@ -473,7 +473,7 @@ namespace framework
// <--- SYNCHRONIZED
}
- void UndoManagerHelper_Impl::impl_processRequest( ::boost::function0< void > const& i_request, IMutexGuard& i_instanceLock )
+ void UndoManagerHelper_Impl::impl_processRequest(::std::function<void ()> const& i_request, IMutexGuard& i_instanceLock)
{
// create the request, and add it to our queue
::rtl::Reference< UndoManagerRequest > pRequest( new UndoManagerRequest( i_request ) );
commit fb038a0d0d36799c169db778b6d47ac1a73f1c0d
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Jul 31 21:37:19 2015 +0200
dbaccess: replace boost::function with std::function
Change-Id: I4bea36a9add24f9144c8e222e9ce42c7c9f3678b
diff --git a/dbaccess/source/core/api/CRowSetColumn.cxx b/dbaccess/source/core/api/CRowSetColumn.cxx
index adc3d38..2a8492f 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 0c4ec82..63f7c65 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 876fc2a..4431da1 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 0dc3db9..6a7809d 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
commit c2966acc465086b164b36e3366f164554f83ad21
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Jul 31 21:35:42 2015 +0200
canvas: replace boost::function with std::function
Change-Id: I1a4a3007a07a796d80d06ab7554953925bb8be3d
diff --git a/canvas/source/opengl/ogl_canvashelper.cxx b/canvas/source/opengl/ogl_canvashelper.cxx
index 6fb306f..63acd3c 100644
--- a/canvas/source/opengl/ogl_canvashelper.cxx
+++ b/canvas/source/opengl/ogl_canvashelper.cxx
@@ -37,9 +37,9 @@
#include <GL/glew.h>
#include <boost/bind.hpp>
-#include <boost/function.hpp>
#include <memory>
+#include <functional>
using namespace ::com::sun::star;
@@ -85,13 +85,13 @@ namespace oglcanvas
rendering::ARGBColor maARGBColor;
::basegfx::B2DPolyPolygonVector maPolyPolys;
- ::boost::function6< bool,
+ ::std::function< bool (
const CanvasHelper&,
const ::basegfx::B2DHomMatrix&,
GLenum,
GLenum,
const rendering::ARGBColor&,
- const ::basegfx::B2DPolyPolygonVector& > maFunction;
+ const ::basegfx::B2DPolyPolygonVector&)> maFunction;
};
namespace
diff --git a/canvas/source/simplecanvas/simplecanvasimpl.cxx b/canvas/source/simplecanvas/simplecanvasimpl.cxx
index 1579fcd..92332a6 100644
--- a/canvas/source/simplecanvas/simplecanvasimpl.cxx
+++ b/canvas/source/simplecanvas/simplecanvasimpl.cxx
@@ -38,7 +38,8 @@
#include <canvas/canvastools.hxx>
#include <boost/bind.hpp>
-#include <boost/function.hpp>
+
+#include <functional>
#define SERVICE_NAME "com.sun.star.rendering.SimpleCanvas"
@@ -91,7 +92,7 @@ namespace
decltype(&color2Sequence)> m_aFillColor;
o3tl::LazyUpdate<geometry::RealRectangle2D,
uno::Reference< rendering::XPolyPolygon2D >,
- boost::function1<uno::Reference<rendering::XPolyPolygon2D>, geometry::RealRectangle2D> > m_aRectClip;
+ std::function<uno::Reference<rendering::XPolyPolygon2D> (geometry::RealRectangle2D)> > m_aRectClip;
geometry::AffineMatrix2D m_aTransformation;
explicit SimpleRenderState( uno::Reference<rendering::XGraphicDevice> const& xDevice ) :
@@ -368,7 +369,7 @@ namespace
typedef o3tl::LazyUpdate<
rendering::FontRequest,
uno::Reference< rendering::XCanvasFont >,
- boost::function1<uno::Reference<rendering::XCanvasFont>, rendering::FontRequest> > SimpleFont;
+ std::function<uno::Reference<rendering::XCanvasFont> (rendering::FontRequest)> > SimpleFont;
uno::Reference<rendering::XCanvas> mxCanvas;
SimpleFont maFont;
commit 701cfbd696a8bbea9296de0b32bb80b007c04496
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Jul 31 21:31:33 2015 +0200
avmedia: replace boost::function with std::function
Change-Id: I813d42a1ab494e0887791516606fddd342e21ff0
diff --git a/avmedia/source/vlc/wrapper/EventHandler.hxx b/avmedia/source/vlc/wrapper/EventHandler.hxx
index 37272c2..536d80b 100644
--- a/avmedia/source/vlc/wrapper/EventHandler.hxx
+++ b/avmedia/source/vlc/wrapper/EventHandler.hxx
@@ -9,7 +9,8 @@
#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_EVENTHANDLER_HXX
#define INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_EVENTHANDLER_HXX
-#include <boost/function.hpp>
+
+#include <functional>
#include <boost/noncopyable.hpp>
#include <salhelper/thread.hxx>
#include "ThreadsafeQueue.hxx"
@@ -30,7 +31,7 @@ namespace wrapper
virtual void SAL_CALL run() SAL_OVERRIDE;
public:
- typedef boost::function< void() > TCallback;
+ typedef std::function< void() > TCallback;
ThreadsafeQueue< TCallback > mCallbackQueue;
};
}
diff --git a/avmedia/source/vlc/wrapper/EventManager.hxx b/avmedia/source/vlc/wrapper/EventManager.hxx
index 8ee2eb6..624b798 100644
--- a/avmedia/source/vlc/wrapper/EventManager.hxx
+++ b/avmedia/source/vlc/wrapper/EventManager.hxx
@@ -10,7 +10,7 @@
#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_EVENTMANAGER_HXX
#define INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_EVENTMANAGER_HXX
-#include <boost/function.hpp>
+#include <functional>
#include <boost/noncopyable.hpp>
#include "Player.hxx"
@@ -29,7 +29,7 @@ namespace wrapper
public:
static bool LoadSymbols();
- typedef boost::function<void()> Callback;
+ typedef std::function<void()> Callback;
EventManager( Player& player, EventHandler& eh );
@@ -38,7 +38,7 @@ namespace wrapper
private:
EventHandler& mEventHandler;
- typedef boost::function< void() > TCallback;
+ typedef std::function< void() > TCallback;
libvlc_event_manager_t *mManager;
TCallback mOnPaused;
TCallback mOnEndReached;
More information about the Libreoffice-commits
mailing list