summaryrefslogtreecommitdiff
path: root/svx/source
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2015-08-03 12:21:19 +0200
committerMichael Stahl <mstahl@redhat.com>2015-08-03 14:47:44 +0200
commit81c6ae873d0b624f8f5113253180e796bdafd8d8 (patch)
tree4835eb50d149f7ad5222cfd13eb77a7a07991aec /svx/source
parent300b4fa81a924a4a30fc231574b469db82ea42e6 (diff)
svx: replace boost::function with std::function
Change-Id: I52def97b8dfa9e4dba5d47937de45e587a23b4de
Diffstat (limited to 'svx/source')
-rw-r--r--svx/source/gallery2/GallerySplitter.cxx2
-rw-r--r--svx/source/gallery2/GallerySplitter.hxx7
-rw-r--r--svx/source/gallery2/galbrws1.cxx4
-rw-r--r--svx/source/gallery2/galbrws1.hxx10
-rw-r--r--svx/source/sidebar/text/TextCharacterSpacingPopup.cxx2
-rw-r--r--svx/source/sidebar/text/TextCharacterSpacingPopup.hxx4
-rw-r--r--svx/source/sidebar/text/TextUnderlinePopup.cxx2
-rw-r--r--svx/source/sidebar/text/TextUnderlinePopup.hxx6
8 files changed, 20 insertions, 17 deletions
diff --git a/svx/source/gallery2/GallerySplitter.cxx b/svx/source/gallery2/GallerySplitter.cxx
index f6857f84abd1..21dc47c72b89 100644
--- a/svx/source/gallery2/GallerySplitter.cxx
+++ b/svx/source/gallery2/GallerySplitter.cxx
@@ -22,7 +22,7 @@
GallerySplitter::GallerySplitter(
vcl::Window* pParent,
WinBits nStyle,
- const ::boost::function<void()>& rDataChangeFunctor)
+ const ::std::function<void ()>& rDataChangeFunctor)
: Splitter(pParent, nStyle)
, maDataChangeFunctor(rDataChangeFunctor)
{
diff --git a/svx/source/gallery2/GallerySplitter.hxx b/svx/source/gallery2/GallerySplitter.hxx
index 179ffbe99205..751444e61837 100644
--- a/svx/source/gallery2/GallerySplitter.hxx
+++ b/svx/source/gallery2/GallerySplitter.hxx
@@ -20,7 +20,8 @@
#define INCLUDED_SVX_SOURCE_GALLERY2_GALLERYSPLITTER_HXX
#include <vcl/split.hxx>
-#include <boost/function.hpp>
+
+#include <functional>
class GallerySplitter : public Splitter
{
@@ -28,13 +29,13 @@ public:
GallerySplitter(
vcl::Window* pParent,
WinBits nStyle,
- const ::boost::function<void()>& rDataChangeFunctor);
+ const ::std::function<void ()>& rDataChangeFunctor);
protected:
virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
private:
- ::boost::function<void()> maDataChangeFunctor;
+ ::std::function<void ()> maDataChangeFunctor;
};
diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx
index faa108dbc88b..53faca310e74 100644
--- a/svx/source/gallery2/galbrws1.cxx
+++ b/svx/source/gallery2/galbrws1.cxx
@@ -107,8 +107,8 @@ bool GalleryThemeListBox::PreNotify( NotifyEvent& rNEvt )
GalleryBrowser1::GalleryBrowser1(
vcl::Window* pParent,
Gallery* pGallery,
- const ::boost::function<sal_Bool(const KeyEvent&,Window*)>& rKeyInputHandler,
- const ::boost::function<void()>& rThemeSlectionHandler)
+ const ::std::function<sal_Bool (const KeyEvent&,Window*)>& rKeyInputHandler,
+ const ::std::function<void ()>& rThemeSlectionHandler)
:
Control ( pParent, WB_TABSTOP ),
maNewTheme ( VclPtr<GalleryButton>::Create(this, WB_3DLOOK) ),
diff --git a/svx/source/gallery2/galbrws1.hxx b/svx/source/gallery2/galbrws1.hxx
index 4c5bc4413b61..2a35853696ac 100644
--- a/svx/source/gallery2/galbrws1.hxx
+++ b/svx/source/gallery2/galbrws1.hxx
@@ -26,7 +26,7 @@
#include <svl/lstner.hxx>
#include <vector>
-#include <boost/function.hpp>
+#include <functional>
class GalleryBrowser1;
@@ -91,8 +91,8 @@ private:
Image aImgReadOnly;
Image aImgImported;
- ::boost::function<sal_Bool(const KeyEvent&,Window*)> maKeyInputHandler;
- ::boost::function<void()> maThemeSlectionHandler;
+ ::std::function<sal_Bool (const KeyEvent&,Window*)> maKeyInputHandler;
+ ::std::function<void ()> maThemeSlectionHandler;
void ImplAdjustControls();
sal_uIntPtr ImplInsertThemeEntry( const GalleryThemeEntry* pEntry );
@@ -122,8 +122,8 @@ public:
GalleryBrowser1(
vcl::Window* pParent,
Gallery* pGallery,
- const ::boost::function<sal_Bool(const KeyEvent&,Window*)>& rKeyInputHandler,
- const ::boost::function<void()>& rThemeSlectionHandler);
+ const ::std::function<sal_Bool (const KeyEvent&,Window*)>& rKeyInputHandler,
+ const ::std::function<void ()>& rThemeSlectionHandler);
virtual ~GalleryBrowser1();
virtual void dispose() SAL_OVERRIDE;
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);