canvas/source/opengl/ogl_canvashelper.cxx | 1 +
canvas/source/opengl/ogl_spritedevicehelper.cxx | 2 +-
canvas/source/simplecanvas/simplecanvasimpl.cxx | 1 +
canvas/source/tools/propertysethelper.cxx | 4 ++--
comphelper/source/misc/scopeguard.cxx | 2 +-
include/canvas/propertysethelper.hxx | 6 +++---
include/comphelper/scopeguard.hxx | 5 +++--
include/comphelper/servicedecl.hxx | 13 +++++++------
include/sfx2/sidebar/AsynchronousCall.hxx | 5 +++--
include/sfx2/sidebar/ControllerItem.hxx | 2 --
include/sfx2/sidebar/PanelTitleBar.hxx | 1 -
include/sfx2/sidebar/SidebarPanelBase.hxx | 1 -
include/sfx2/sidebar/TabBar.hxx | 12 +++++++-----
include/sfx2/templatelocalview.hxx | 3 ++-
include/sfx2/thumbnailview.hxx | 8 ++++----
include/svtools/filechangedchecker.hxx | 9 ++++++---
include/svx/ParaLineSpacingPopup.hxx | 2 --
include/svx/sidebar/AreaTransparencyGradientPopup.hxx | 4 ++--
include/svx/sidebar/LineWidthPopup.hxx | 4 ++--
include/svx/sidebar/Popup.hxx | 10 +++++-----
include/svx/sidebar/SelectionChangeHandler.hxx | 6 +++---
include/toolkit/awt/vclxwindow.hxx | 8 +++-----
sfx2/inc/pch/precompiled_sfx.hxx | 1 -
sfx2/source/control/templatelocalview.cxx | 2 +-
sfx2/source/control/thumbnailview.cxx | 4 ++--
sfx2/source/sidebar/SidebarController.cxx | 1 -
sfx2/source/sidebar/TabBar.cxx | 2 +-
svl/source/undo/undo.cxx | 1 +
svtools/source/misc/filechangedchecker.cxx | 11 ++++++-----
svx/source/sidebar/SelectionChangeHandler.cxx | 2 +-
svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx | 2 +-
svx/source/sidebar/line/LineWidthPopup.cxx | 2 +-
svx/source/sidebar/tools/Popup.cxx | 4 ++--
33 files changed, 72 insertions(+), 69 deletions(-)
New commits:
commit 9e90038b73b84e622e20145ac56c642996e658e9
Author: Michael Stahl <mst...@redhat.com>
Date: Fri Jul 31 18:31:01 2015 +0200
canvas: replace boost::function with std::function
Change-Id: Ia3644bc0d9db2159aa4e9f05ca2f36e60b63e6f4
diff --git a/canvas/source/opengl/ogl_canvashelper.cxx
b/canvas/source/opengl/ogl_canvashelper.cxx
index 3861c4a..6fb306f 100644
--- a/canvas/source/opengl/ogl_canvashelper.cxx
+++ b/canvas/source/opengl/ogl_canvashelper.cxx
@@ -37,6 +37,7 @@
#include <GL/glew.h>
#include <boost/bind.hpp>
+#include <boost/function.hpp>
#include <memory>
diff --git a/canvas/source/opengl/ogl_spritedevicehelper.cxx
b/canvas/source/opengl/ogl_spritedevicehelper.cxx
index 8764004..25c9e9b 100644
--- a/canvas/source/opengl/ogl_spritedevicehelper.cxx
+++ b/canvas/source/opengl/ogl_spritedevicehelper.cxx
@@ -297,7 +297,7 @@ namespace oglcanvas
SpriteComparator());
std::for_each(aSprites.begin(),
aSprites.end(),
- boost::mem_fn(&CanvasCustomSprite::renderSprite));
+ std::mem_fn(&CanvasCustomSprite::renderSprite));
// frame counter, other info
diff --git a/canvas/source/simplecanvas/simplecanvasimpl.cxx
b/canvas/source/simplecanvas/simplecanvasimpl.cxx
index af7f9df..1579fcd 100644
--- a/canvas/source/simplecanvas/simplecanvasimpl.cxx
+++ b/canvas/source/simplecanvas/simplecanvasimpl.cxx
@@ -38,6 +38,7 @@
#include <canvas/canvastools.hxx>
#include <boost/bind.hpp>
+#include <boost/function.hpp>
#define SERVICE_NAME "com.sun.star.rendering.SimpleCanvas"
diff --git a/canvas/source/tools/propertysethelper.cxx
b/canvas/source/tools/propertysethelper.cxx
index 477fda9..33ddcbd 100644
--- a/canvas/source/tools/propertysethelper.cxx
+++ b/canvas/source/tools/propertysethelper.cxx
@@ -110,7 +110,7 @@ namespace canvas
throwUnknown( aPropertyName );
}
- if( aCallbacks.setter.empty() )
+ if (!aCallbacks.setter)
throwVeto( aPropertyName );
aCallbacks.setter(aValue);
@@ -126,7 +126,7 @@ namespace canvas
throwUnknown( aPropertyName );
}
- if( !aCallbacks.getter.empty() )
+ if (aCallbacks.getter)
return aCallbacks.getter();
// TODO(Q1): subtlety, empty getter method silently returns
diff --git a/include/canvas/propertysethelper.hxx
b/include/canvas/propertysethelper.hxx
index 37aea93..2256097 100644
--- a/include/canvas/propertysethelper.hxx
+++ b/include/canvas/propertysethelper.hxx
@@ -24,7 +24,7 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <canvas/canvastools.hxx>
-#include <boost/function.hpp>
+#include <functional>
#include <vector>
#include <memory>
@@ -50,8 +50,8 @@ namespace canvas
class CANVASTOOLS_DLLPUBLIC PropertySetHelper
{
public:
- typedef boost::function0< ::com::sun::star::uno::Any >
GetterType;
- typedef boost::function1<void, const ::com::sun::star::uno::Any&>
SetterType;
+ typedef std::function<::com::sun::star::uno::Any ()> GetterType;
+ typedef std::function<void (const ::com::sun::star::uno::Any&)>
SetterType;
struct Callbacks
{
GetterType getter;
commit 69885050705d65803b0176beb7ffc7938d527396
Author: Michael Stahl <mst...@redhat.com>
Date: Fri Jul 31 18:30:48 2015 +0200
svx: replace boost::function with std::function
Change-Id: I7d6d01775600fdbd64b0b5a249d88acdb89f6591
diff --git a/include/svx/ParaLineSpacingPopup.hxx
b/include/svx/ParaLineSpacingPopup.hxx
index d541dd8..9427a3f 100644
--- a/include/svx/ParaLineSpacingPopup.hxx
+++ b/include/svx/ParaLineSpacingPopup.hxx
@@ -19,8 +19,6 @@
#ifndef INCLUDED_SVX_SOURCE_SIDEBAR_PARAGRAPH_PARALINESPACINGPOPUP_HXX
#define INCLUDED_SVX_SOURCE_SIDEBAR_PARAGRAPH_PARALINESPACINGPOPUP_HXX
-#include <boost/function.hpp>
-
#include <editeng/lspcitem.hxx>
#include <sfx2/sidebar/EnumContext.hxx>
#include <sfx2/tbxctrl.hxx>
diff --git a/include/svx/sidebar/AreaTransparencyGradientPopup.hxx
b/include/svx/sidebar/AreaTransparencyGradientPopup.hxx
index b11cb8c..8c74dff 100644
--- a/include/svx/sidebar/AreaTransparencyGradientPopup.hxx
+++ b/include/svx/sidebar/AreaTransparencyGradientPopup.hxx
@@ -21,7 +21,7 @@
#include "svx/sidebar/Popup.hxx"
-#include <boost/function.hpp>
+#include <functional>
class XFillFloatTransparenceItem;
@@ -35,7 +35,7 @@ class AreaTransparencyGradientPopup
public:
AreaTransparencyGradientPopup (
vcl::Window* pParent,
- const ::boost::function<PopupControl*(PopupContainer*)>&
rControlCreator);
+ ::std::function<PopupControl*(PopupContainer*)> const&
rControlCreator);
virtual ~AreaTransparencyGradientPopup();
void Rearrange (XFillFloatTransparenceItem* pItem);
diff --git a/include/svx/sidebar/LineWidthPopup.hxx
b/include/svx/sidebar/LineWidthPopup.hxx
index 772934f..d507e9c 100644
--- a/include/svx/sidebar/LineWidthPopup.hxx
+++ b/include/svx/sidebar/LineWidthPopup.hxx
@@ -23,7 +23,7 @@
#include <svl/poolitem.hxx>
-#include <boost/function.hpp>
+#include <functional>
namespace svx { namespace sidebar {
@@ -34,7 +34,7 @@ class LineWidthPopup
public:
LineWidthPopup (
vcl::Window* pParent,
- const ::boost::function<PopupControl*(PopupContainer*)>&
rControlCreator);
+ const ::std::function<PopupControl*(PopupContainer*)>&
rControlCreator);
virtual ~LineWidthPopup();
void SetWidthSelect (long lValue, bool bValuable, SfxMapUnit eMapUnit);
diff --git a/include/svx/sidebar/Popup.hxx b/include/svx/sidebar/Popup.hxx
index 32ff0ab..7b44492 100644
--- a/include/svx/sidebar/Popup.hxx
+++ b/include/svx/sidebar/Popup.hxx
@@ -26,7 +26,7 @@
#include <svx/sidebar/PopupContainer.hxx>
#include <svx/sidebar/PopupControl.hxx>
-#include <boost/function.hpp>
+#include <functional>
namespace vcl { class Window; }
class ToolBox;
@@ -51,7 +51,7 @@ public:
*/
Popup (
vcl::Window* pParent,
- const ::boost::function<PopupControl*(PopupContainer*)>&
rControlCreator,
+ const ::std::function<PopupControl*(PopupContainer*)>& rControlCreator,
const ::rtl::OUString& rsAccessibleName);
virtual ~Popup();
@@ -73,7 +73,7 @@ public:
/** If you want to be informed when the popup closes then add a
callback that is called after that.
*/
- void SetPopupModeEndHandler (const ::boost::function<void()>& rCallback);
+ void SetPopupModeEndHandler (const ::std::function<void()>& rCallback);
void dispose();
@@ -92,8 +92,8 @@ protected:
private:
VclPtr<vcl::Window> mpParent;
- ::boost::function<VclPtr<PopupControl>(PopupContainer*)> maControlCreator;
- ::boost::function<void()> maPopupModeEndCallback;
+ ::std::function<VclPtr<PopupControl>(PopupContainer*)> maControlCreator;
+ ::std::function<void()> maPopupModeEndCallback;
const ::rtl::OUString msAccessibleName;
VclPtr<PopupContainer> mxContainer;
diff --git a/include/svx/sidebar/SelectionChangeHandler.hxx
b/include/svx/sidebar/SelectionChangeHandler.hxx
index 7152658..890a72a 100644
--- a/include/svx/sidebar/SelectionChangeHandler.hxx
+++ b/include/svx/sidebar/SelectionChangeHandler.hxx
@@ -28,7 +28,7 @@
#include <cppuhelper/compbase1.hxx>
#include <cppuhelper/basemutex.hxx>
-#include <boost/function.hpp>
+#include <functional>
class SdrMarkView;
@@ -48,7 +48,7 @@ class SVX_DLLPUBLIC SelectionChangeHandler
{
public:
SelectionChangeHandler (
- const boost::function<rtl::OUString()>& rSelectionChangeCallback,
+ const std::function<rtl::OUString ()>& rSelectionChangeCallback,
const css::uno::Reference<css::frame::XController>& rxController,
const sfx2::sidebar::EnumContext::Context eDefaultContext);
virtual ~SelectionChangeHandler();
@@ -69,7 +69,7 @@ private:
SelectionChangeHandler(const SelectionChangeHandler&) SAL_DELETED_FUNCTION;
SelectionChangeHandler& operator=(const SelectionChangeHandler&)
SAL_DELETED_FUNCTION;
- const boost::function<rtl::OUString()> maSelectionChangeCallback;
+ const std::function<rtl::OUString ()> maSelectionChangeCallback;
css::uno::Reference<css::frame::XController> mxController;
const sfx2::sidebar::EnumContext::Context meDefaultContext;
bool mbIsConnected;
diff --git a/svx/source/sidebar/SelectionChangeHandler.cxx
b/svx/source/sidebar/SelectionChangeHandler.cxx
index b25011f..0a4b5aa 100644
--- a/svx/source/sidebar/SelectionChangeHandler.cxx
+++ b/svx/source/sidebar/SelectionChangeHandler.cxx
@@ -33,7 +33,7 @@ using namespace sfx2::sidebar;
namespace svx { namespace sidebar {
SelectionChangeHandler::SelectionChangeHandler (
- const boost::function<rtl::OUString()>& rSelectionChangeCallback,
+ const std::function<rtl::OUString()>& rSelectionChangeCallback,
const Reference<frame::XController>& rxController,
const EnumContext::Context eDefaultContext)
: SelectionChangeHandlerInterfaceBase(m_aMutex),
diff --git a/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx
b/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx
index fb01754..98ddc10 100644
--- a/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx
+++ b/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx
@@ -23,7 +23,7 @@ namespace svx { namespace sidebar {
AreaTransparencyGradientPopup::AreaTransparencyGradientPopup (
vcl::Window* pParent,
- const ::boost::function<PopupControl*(PopupContainer*)>& rControlCreator)
+ const ::std::function<PopupControl* (PopupContainer*)>& rControlCreator)
: Popup(
pParent,
rControlCreator,
diff --git a/svx/source/sidebar/line/LineWidthPopup.cxx
b/svx/source/sidebar/line/LineWidthPopup.cxx
index 351d12d..dcef64e 100644
--- a/svx/source/sidebar/line/LineWidthPopup.cxx
+++ b/svx/source/sidebar/line/LineWidthPopup.cxx
@@ -29,7 +29,7 @@ namespace svx { namespace sidebar {
LineWidthPopup::LineWidthPopup (
vcl::Window* pParent,
- const ::boost::function<PopupControl*(PopupContainer*)>& rControlCreator)
+ const ::std::function<PopupControl*(PopupContainer*)>& rControlCreator)
: Popup(
pParent,
rControlCreator,
diff --git a/svx/source/sidebar/tools/Popup.cxx
b/svx/source/sidebar/tools/Popup.cxx
index 3bd6246..8c0e855 100644
--- a/svx/source/sidebar/tools/Popup.cxx
+++ b/svx/source/sidebar/tools/Popup.cxx
@@ -27,7 +27,7 @@ namespace svx { namespace sidebar {
Popup::Popup (
vcl::Window* pParent,
- const ::boost::function<PopupControl*(PopupContainer*)>& rControlCreator,
+ const ::std::function<PopupControl* (PopupContainer*)>& rControlCreator,
const ::rtl::OUString& rsAccessibleName)
: mxControl(),
mpParent(pParent),
@@ -89,7 +89,7 @@ void Popup::Hide()
mxContainer->EndPopupMode();
}
-void Popup::SetPopupModeEndHandler (const ::boost::function<void()>& rCallback)
+void Popup::SetPopupModeEndHandler (const ::std::function<void ()>& rCallback)
{
maPopupModeEndCallback = rCallback;
if (mxContainer)
commit 2a62966d8947829d00702455977026369082007a
Author: Michael Stahl <mst...@redhat.com>
Date: Fri Jul 31 18:30:09 2015 +0200
sfx2: replace boost::function with std::function
Change-Id: I72acc5f396553eb464338a395ef40f95ed57a07e
diff --git a/include/sfx2/sidebar/AsynchronousCall.hxx
b/include/sfx2/sidebar/AsynchronousCall.hxx
index 338505c..408805a 100644
--- a/include/sfx2/sidebar/AsynchronousCall.hxx
+++ b/include/sfx2/sidebar/AsynchronousCall.hxx
@@ -19,10 +19,11 @@
#ifndef INCLUDED_SFX2_SOURCE_SIDEBAR_ASYNCHRONOUSCALL_HXX
#define INCLUDED_SFX2_SOURCE_SIDEBAR_ASYNCHRONOUSCALL_HXX
-#include <boost/function.hpp>
#include <tools/solar.h>
#include <tools/link.hxx>
+#include <functional>
+
struct ImplSVEvent;
namespace sfx2 { namespace sidebar {
@@ -32,7 +33,7 @@ namespace sfx2 { namespace sidebar {
class AsynchronousCall
{
public:
- typedef ::boost::function<void()> Action;
+ typedef ::std::function<void()> Action;
AsynchronousCall();
AsynchronousCall (const Action& rAction);
diff --git a/include/sfx2/sidebar/ControllerItem.hxx
b/include/sfx2/sidebar/ControllerItem.hxx
index 0a38021..97ea553 100644
--- a/include/sfx2/sidebar/ControllerItem.hxx
+++ b/include/sfx2/sidebar/ControllerItem.hxx
@@ -28,8 +28,6 @@
#include <com/sun/star/frame/XFrame.hpp>
-#include <boost/function.hpp>
-
class SfxViewFrame;
class ToolBox;
diff --git a/include/sfx2/sidebar/PanelTitleBar.hxx
b/include/sfx2/sidebar/PanelTitleBar.hxx
index e3f0064..21cee82 100644
--- a/include/sfx2/sidebar/PanelTitleBar.hxx
+++ b/include/sfx2/sidebar/PanelTitleBar.hxx
@@ -22,7 +22,6 @@
#include <sfx2/sidebar/TitleBar.hxx>
#include <com/sun/star/frame/XFrame.hpp>
-#include <boost/function.hpp>
namespace sfx2 { namespace sidebar {
diff --git a/include/sfx2/sidebar/SidebarPanelBase.hxx
b/include/sfx2/sidebar/SidebarPanelBase.hxx
index 75d155e..55a4097 100644
--- a/include/sfx2/sidebar/SidebarPanelBase.hxx
+++ b/include/sfx2/sidebar/SidebarPanelBase.hxx
@@ -33,7 +33,6 @@
#include <com/sun/star/ui/XUpdateModel.hpp>
#include <boost/noncopyable.hpp>
-#include <boost/function.hpp>
#include <vcl/vclptr.hxx>
diff --git a/include/sfx2/sidebar/TabBar.hxx b/include/sfx2/sidebar/TabBar.hxx
index 457e510..2a8d7f9 100644
--- a/include/sfx2/sidebar/TabBar.hxx
+++ b/include/sfx2/sidebar/TabBar.hxx
@@ -27,10 +27,12 @@
#include <vcl/window.hxx>
#include <com/sun/star/frame/XFrame.hpp>
-#include <boost/function.hpp>
#include <boost/tuple/tuple.hpp>
#include <boost/scoped_ptr.hpp>
+#include <functional>
+
+
class Button;
class CheckBox;
class RadioButton;
@@ -61,13 +63,13 @@ public:
bool mbIsActive;
bool mbIsEnabled;
};
- typedef ::boost::function<void(
+ typedef ::std::function<void (
const Rectangle&,
const ::std::vector<DeckMenuData>& rMenuData)> PopupMenuProvider;
TabBar (
vcl::Window* pParentWindow,
const css::uno::Reference<css::frame::XFrame>& rxFrame,
- const ::boost::function<void(const ::rtl::OUString&rsDeckId)>&
rDeckActivationFunctor,
+ const ::std::function<void (const ::rtl::OUString&rsDeckId)>&
rDeckActivationFunctor,
const PopupMenuProvider& rPopupMenuProvider,
SidebarController* rParentSidebarController);
@@ -99,13 +101,13 @@ private:
DECL_LINK(HandleClick, Button*);
VclPtr<RadioButton> mpButton;
::rtl::OUString msDeckId;
- ::boost::function<void(const ::rtl::OUString&rsDeckId)>
maDeckActivationFunctor;
+ ::std::function<void (const ::rtl::OUString&rsDeckId)>
maDeckActivationFunctor;
bool mbIsHidden;
bool mbIsHiddenByDefault;
};
typedef ::std::vector<Item> ItemContainer;
ItemContainer maItems;
- const ::boost::function<void(const ::rtl::OUString&rsDeckId)>
maDeckActivationFunctor;
+ const ::std::function<void (const ::rtl::OUString&rsDeckId)>
maDeckActivationFunctor;
sal_Int32 mnMenuSeparatorY;
PopupMenuProvider maPopupMenuProvider;
diff --git a/include/sfx2/templatelocalview.hxx
b/include/sfx2/templatelocalview.hxx
index 123a6f6..2d06ef9 100644
--- a/include/sfx2/templatelocalview.hxx
+++ b/include/sfx2/templatelocalview.hxx
@@ -11,6 +11,7 @@
#define INCLUDED_SFX2_TEMPLATELOCALVIEW_HXX
#include <set>
+#include <functional>
#include <sfx2/templateabstractview.hxx>
@@ -56,7 +57,7 @@ public:
std::vector<OUString> getFolderNames ();
std::vector<TemplateItemProperties>
- getFilteredItems (const boost::function<bool (const
TemplateItemProperties&) > &rFunc) const;
+ getFilteredItems (const std::function<bool (const
TemplateItemProperties&) > &rFunc) const;
virtual sal_uInt16 createRegion (const OUString &rName) SAL_OVERRIDE;
diff --git a/include/sfx2/thumbnailview.hxx b/include/sfx2/thumbnailview.hxx
index a14ad32..a522ef8 100644
--- a/include/sfx2/thumbnailview.hxx
+++ b/include/sfx2/thumbnailview.hxx
@@ -13,7 +13,7 @@
#include <sfx2/dllapi.h>
#include <vector>
-#include <boost/function.hpp>
+#include <functional>
#include <comphelper/processfactory.hxx>
#include <unotools/ucbstreamhelper.hxx>
@@ -226,9 +226,9 @@ public:
void ShowTooltips( bool bShowTooltips );
- void filterItems (const boost::function<bool (const ThumbnailViewItem*) >
&func);
+ void filterItems (const std::function<bool (const ThumbnailViewItem*) >
&func);
- void sortItems (const boost::function<bool (const ThumbnailViewItem*,
+ void sortItems (const std::function<bool (const ThumbnailViewItem*,
const ThumbnailViewItem*) >
&func);
void setItemStateHdl (const Link<> &aLink) { maItemStateHdl = aLink; }
@@ -326,7 +326,7 @@ protected:
Link<> maItemStateHdl;
ThumbnailItemAttributes* mpItemAttrs;
- boost::function<bool (const ThumbnailViewItem*)> maFilterFunc;
+ std::function<bool (const ThumbnailViewItem*)> maFilterFunc;
};
#endif // INCLUDED_SFX2_THUMBNAILVIEW_HXX
diff --git a/sfx2/inc/pch/precompiled_sfx.hxx b/sfx2/inc/pch/precompiled_sfx.hxx
index 37debdb..6c7b649 100644
--- a/sfx2/inc/pch/precompiled_sfx.hxx
+++ b/sfx2/inc/pch/precompiled_sfx.hxx
@@ -41,7 +41,6 @@
#include <basic/sbxobj.hxx>
#include <basic/sbxvar.hxx>
#include <boost/bind.hpp>
-#include <boost/function.hpp>
#include <boost/logic/tribool.hpp>
#include <boost/noncopyable.hpp>
#include <boost/optional.hpp>
diff --git a/sfx2/source/control/templatelocalview.cxx
b/sfx2/source/control/templatelocalview.cxx
index 2dbbad5..1dc61c1 100644
--- a/sfx2/source/control/templatelocalview.cxx
+++ b/sfx2/source/control/templatelocalview.cxx
@@ -225,7 +225,7 @@ std::vector<OUString> TemplateLocalView::getFolderNames()
}
std::vector<TemplateItemProperties>
-TemplateLocalView::getFilteredItems(const boost::function<bool (const
TemplateItemProperties&) > &rFunc) const
+TemplateLocalView::getFilteredItems(const std::function<bool (const
TemplateItemProperties&)> &rFunc) const
{
std::vector<TemplateItemProperties> aItems;
diff --git a/sfx2/source/control/thumbnailview.cxx
b/sfx2/source/control/thumbnailview.cxx
index ff050df..cdd7329 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -1170,7 +1170,7 @@ void ThumbnailView::ShowTooltips( bool bShowTooltips )
mbShowTooltips = bShowTooltips;
}
-void ThumbnailView::filterItems (const boost::function<bool (const
ThumbnailViewItem*) > &func)
+void ThumbnailView::filterItems(const std::function<bool (const
ThumbnailViewItem*)> &func)
{
mnFirstLine = 0; // start at the top of the list instead of the
current position
maFilterFunc = func;
@@ -1221,7 +1221,7 @@ void ThumbnailView::filterItems (const
boost::function<bool (const ThumbnailView
Invalidate();
}
-void ThumbnailView::sortItems (const boost::function<bool (const
ThumbnailViewItem*, const ThumbnailViewItem*) > &func)
+void ThumbnailView::sortItems(const std::function<bool (const
ThumbnailViewItem*, const ThumbnailViewItem*)> &func)
{
std::sort(mItemList.begin(),mItemList.end(),func);
diff --git a/sfx2/source/sidebar/SidebarController.cxx
b/sfx2/source/sidebar/SidebarController.cxx
index ed4cee0..c7c40f7 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -55,7 +55,6 @@
#include <com/sun/star/rendering/XSpriteCanvas.hpp>
#include <boost/bind.hpp>
-#include <boost/function.hpp>
using namespace css;
using namespace css::uno;
diff --git a/sfx2/source/sidebar/TabBar.cxx b/sfx2/source/sidebar/TabBar.cxx
index 4733898..29a4896 100644
--- a/sfx2/source/sidebar/TabBar.cxx
+++ b/sfx2/source/sidebar/TabBar.cxx
@@ -43,7 +43,7 @@ namespace sfx2 { namespace sidebar {
TabBar::TabBar(vcl::Window* pParentWindow,
const Reference<frame::XFrame>& rxFrame,
- const boost::function<void(const OUString&)>&
rDeckActivationFunctor,
+ const std::function<void (const OUString&)>&
rDeckActivationFunctor,
const PopupMenuProvider& rPopupMenuProvider,
SidebarController* rParentSidebarController
)
commit 1841946863ed006a36323fcca52a71272eae2ee6
Author: Michael Stahl <mst...@redhat.com>
Date: Fri Jul 31 18:29:36 2015 +0200
toolkit: replace boost::function with std::function
Change-Id: I4bf5b2aab1dd76e596c191ae2eec8eb18005b914
diff --git a/include/toolkit/awt/vclxwindow.hxx
b/include/toolkit/awt/vclxwindow.hxx
index 1ab1f9e..dab9b8e 100644
--- a/include/toolkit/awt/vclxwindow.hxx
+++ b/include/toolkit/awt/vclxwindow.hxx
@@ -45,7 +45,8 @@
#include <stdarg.h>
#include <list>
-#include <boost/function.hpp>
+#include <functional>
+
class VclSimpleEvent;
class VclWindowEvent;
@@ -56,11 +57,8 @@ namespace toolkit
class IAccessibleFactory;
}
-
-
// class VCLXWINDOW
-
class UnoPropertyArrayHelper;
class VCLXWindowImpl;
typedef ::cppu::ImplInheritanceHelper9 < VCLXDevice
@@ -108,7 +106,7 @@ protected:
::cppu::OInterfaceContainerHelper& GetTopWindowListeners();
public:
- typedef ::boost::function0< void > Callback;
+ typedef ::std::function<void ()> Callback;
protected:
/** executes the given callback asynchronously
commit 7ee228a108d1e5d4ffa9121e0890e23982f8ecb5
Author: Michael Stahl <mst...@redhat.com>
Date: Fri Jul 31 18:28:55 2015 +0200
svtools: replace boost::function with std::function
Change-Id: Ic60190814a19e03341de3678f35c4ac69624ca4c
diff --git a/include/svtools/filechangedchecker.hxx
b/include/svtools/filechangedchecker.hxx
index a91642d..480dae53 100644
--- a/include/svtools/filechangedchecker.hxx
+++ b/include/svtools/filechangedchecker.hxx
@@ -11,11 +11,13 @@
#define INCLUDED_SVTOOLS_FILECHANGEDCHECKER_HXX
#include <svtools/svtdllapi.h>
-#include <boost/function.hpp>
+
#include <osl/file.hxx>
#include <vcl/timer.hxx>
#include <vcl/idle.hxx>
+#include <functional>
+
/** Periodically checks if a file has been modified
Instances of this class setup a vcl timer to occasionally wake up
@@ -27,7 +29,7 @@ private:
Idle mIdle;
OUString mFileName;
TimeValue mLastModTime;
- ::boost::function0<void> mpCallback;
+ ::std::function<void ()> mpCallback;
bool SVT_DLLPRIVATE getCurrentModTime(TimeValue& o_rValue) const;
DECL_LINK_TYPED(TimerHandler, Idle *, void);
@@ -35,7 +37,8 @@ private:
public:
void resetTimer();
bool hasFileChanged();
- FileChangedChecker(const OUString& rFilename, const
::boost::function0<void>& rCallback);
+ FileChangedChecker(const OUString& rFilename,
+ const ::std::function<void ()>& rCallback);
};
#endif
diff --git a/svtools/source/misc/filechangedchecker.cxx
b/svtools/source/misc/filechangedchecker.cxx
index ea35296..2f2434d 100644
--- a/svtools/source/misc/filechangedchecker.cxx
+++ b/svtools/source/misc/filechangedchecker.cxx
@@ -11,11 +11,12 @@
#include <svtools/filechangedchecker.hxx>
-FileChangedChecker::FileChangedChecker(const OUString& rFilename, const
::boost::function0<void>& rCallback) :
- mIdle(),
- mFileName(rFilename),
- mLastModTime(),
- mpCallback(rCallback)
+FileChangedChecker::FileChangedChecker(const OUString& rFilename,
+ const ::std::function<void ()>& rCallback)
+ : mIdle()
+ , mFileName(rFilename)
+ , mLastModTime()
+ , mpCallback(rCallback)
{
// Get the curren last file modified Status
getCurrentModTime(mLastModTime);
commit 819fd24487aa120e6f0df1488d1afef7621252cb
Author: Michael Stahl <mst...@redhat.com>
Date: Fri Jul 31 18:27:56 2015 +0200
comphelper: replace boost::function with std::function
Change-Id: I042c97d8472c3afceffba36808687f382571e6c2
diff --git a/comphelper/source/misc/scopeguard.cxx
b/comphelper/source/misc/scopeguard.cxx
index 89f3924..f159b29 100644
--- a/comphelper/source/misc/scopeguard.cxx
+++ b/comphelper/source/misc/scopeguard.cxx
@@ -52,7 +52,7 @@ ScopeGuard::~ScopeGuard()
void ScopeGuard::dismiss()
{
- m_func.clear();
+ m_func = nullptr;
}
FlagGuard::~FlagGuard()
diff --git a/include/comphelper/scopeguard.hxx
b/include/comphelper/scopeguard.hxx
index f120cd7..324ad6c 100644
--- a/include/comphelper/scopeguard.hxx
+++ b/include/comphelper/scopeguard.hxx
@@ -21,7 +21,8 @@
#define INCLUDED_COMPHELPER_SCOPEGUARD_HXX
#include <comphelper/comphelperdllapi.h>
-#include <boost/function.hpp>
+
+#include <functional>
namespace comphelper {
@@ -53,7 +54,7 @@ private:
ScopeGuard(const ScopeGuard&) SAL_DELETED_FUNCTION;
ScopeGuard& operator=(const ScopeGuard&) SAL_DELETED_FUNCTION;
- ::boost::function0<void> m_func; // preferring portable syntax
+ ::std::function<void ()> m_func;
exc_handling const m_excHandling;
};
diff --git a/include/comphelper/servicedecl.hxx
b/include/comphelper/servicedecl.hxx
index 02fbb2f..f9b0b12 100644
--- a/include/comphelper/servicedecl.hxx
+++ b/include/comphelper/servicedecl.hxx
@@ -25,22 +25,23 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <uno/environment.h>
#include <boost/noncopyable.hpp>
-#include <boost/function.hpp>
#include <boost/preprocessor/cat.hpp>
#include <boost/preprocessor/repetition.hpp>
#include <boost/preprocessor/seq/enum.hpp>
+#include <functional>
+
namespace comphelper {
namespace service_decl {
class ServiceDecl;
namespace detail {
-typedef ::boost::function3<
- css::uno::Reference<css::uno::XInterface> /* return */,
- ServiceDecl const&,
- css::uno::Sequence<css::uno::Any> const&,
- css::uno::Reference<css::uno::XComponentContext> const&> CreateFuncF;
+typedef ::std::function<
+ css::uno::Reference<css::uno::XInterface> /* return */
+ (ServiceDecl const&,
+ css::uno::Sequence<css::uno::Any> const&,
+ css::uno::Reference<css::uno::XComponentContext> const&)> CreateFuncF;
}
/** Class to declare a service implementation. There is no need to implement
diff --git a/svl/source/undo/undo.cxx b/svl/source/undo/undo.cxx
index a6f75bf..f7cd0ac 100644
--- a/svl/source/undo/undo.cxx
+++ b/svl/source/undo/undo.cxx
@@ -30,6 +30,7 @@
#include <vector>
#include <list>
#include <limits>
+#include <algorithm>
using ::com::sun::star::uno::Exception;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
