summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2015-07-31 18:30:48 +0200
committerMichael Stahl <mstahl@redhat.com>2015-07-31 21:24:25 +0200
commit69885050705d65803b0176beb7ffc7938d527396 (patch)
tree18554fc52bc73edf96bbfb35893e09386564b0bd /include
parent2a62966d8947829d00702455977026369082007a (diff)
svx: replace boost::function with std::function
Change-Id: I7d6d01775600fdbd64b0b5a249d88acdb89f6591
Diffstat (limited to 'include')
-rw-r--r--include/svx/ParaLineSpacingPopup.hxx2
-rw-r--r--include/svx/sidebar/AreaTransparencyGradientPopup.hxx4
-rw-r--r--include/svx/sidebar/LineWidthPopup.hxx4
-rw-r--r--include/svx/sidebar/Popup.hxx10
-rw-r--r--include/svx/sidebar/SelectionChangeHandler.hxx6
5 files changed, 12 insertions, 14 deletions
diff --git a/include/svx/ParaLineSpacingPopup.hxx b/include/svx/ParaLineSpacingPopup.hxx
index d541dd850ff1..9427a3fc673c 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 b11cb8ce35d5..8c74dff80a62 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 772934fb07b3..d507e9c39e16 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 32ff0abf96fd..7b44492e0c63 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 715265840c57..890a72ab3427 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;