diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-08-03 12:21:19 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-08-03 14:47:44 +0200 |
| commit | 81c6ae873d0b624f8f5113253180e796bdafd8d8 (patch) | |
| tree | 4835eb50d149f7ad5222cfd13eb77a7a07991aec /svx/source/sidebar | |
| parent | 300b4fa81a924a4a30fc231574b469db82ea42e6 (diff) | |
svx: replace boost::function with std::function
Change-Id: I52def97b8dfa9e4dba5d47937de45e587a23b4de
Diffstat (limited to 'svx/source/sidebar')
4 files changed, 8 insertions, 6 deletions
diff --git a/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx b/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx index 157012545210..b8840b06ab59 100644 --- a/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx +++ b/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx @@ -25,7 +25,7 @@ namespace svx { namespace sidebar { TextCharacterSpacingPopup::TextCharacterSpacingPopup ( vcl::Window* pParent, - const ::boost::function<VclPtr<PopupControl>(PopupContainer*)>& rControlCreator) + const ::std::function<VclPtr<PopupControl>(PopupContainer*)>& rControlCreator) : Popup( pParent, rControlCreator, diff --git a/svx/source/sidebar/text/TextCharacterSpacingPopup.hxx b/svx/source/sidebar/text/TextCharacterSpacingPopup.hxx index 7cf5bcd5e21d..548a9d929b81 100644 --- a/svx/source/sidebar/text/TextCharacterSpacingPopup.hxx +++ b/svx/source/sidebar/text/TextCharacterSpacingPopup.hxx @@ -21,7 +21,7 @@ #include "svx/sidebar/Popup.hxx" -#include <boost/function.hpp> +#include <functional> namespace svx { namespace sidebar { @@ -31,7 +31,7 @@ class TextCharacterSpacingPopup public: TextCharacterSpacingPopup ( vcl::Window* pParent, - const ::boost::function<VclPtr<PopupControl>(PopupContainer*)>& rControlCreator); + const ::std::function<VclPtr<PopupControl> (PopupContainer*)>& rControlCreator); virtual ~TextCharacterSpacingPopup(); void Rearrange (bool bLBAvailable,bool bAvailable, long nKerning); diff --git a/svx/source/sidebar/text/TextUnderlinePopup.cxx b/svx/source/sidebar/text/TextUnderlinePopup.cxx index 7777244abd41..a7c175465406 100644 --- a/svx/source/sidebar/text/TextUnderlinePopup.cxx +++ b/svx/source/sidebar/text/TextUnderlinePopup.cxx @@ -23,7 +23,7 @@ namespace svx { namespace sidebar { TextUnderlinePopup::TextUnderlinePopup ( vcl::Window* pParent, - const ::boost::function<PopupControl*(PopupContainer*)>& rControlCreator) + const ::std::function<PopupControl* (PopupContainer*)>& rControlCreator) : Popup( pParent, rControlCreator, diff --git a/svx/source/sidebar/text/TextUnderlinePopup.hxx b/svx/source/sidebar/text/TextUnderlinePopup.hxx index 6eea294cd977..b9da6418693d 100644 --- a/svx/source/sidebar/text/TextUnderlinePopup.hxx +++ b/svx/source/sidebar/text/TextUnderlinePopup.hxx @@ -21,8 +21,10 @@ #include "svx/sidebar/Popup.hxx" -#include <boost/function.hpp> #include <vcl/vclenum.hxx> + +#include <functional> + namespace svx { namespace sidebar { class TextUnderlinePopup @@ -31,7 +33,7 @@ class TextUnderlinePopup public: TextUnderlinePopup ( vcl::Window* pParent, - const ::boost::function<PopupControl*(PopupContainer*)>& rControlCreator); + const ::std::function<PopupControl* (PopupContainer*)>& rControlCreator); virtual ~TextUnderlinePopup(); void Rearrange (FontUnderline eLine); |