Kaydet (Commit) 81c6ae87 authored tarafından Michael Stahl's avatar Michael Stahl

svx: replace boost::function with std::function

Change-Id: I52def97b8dfa9e4dba5d47937de45e587a23b4de
üst 300b4fa8
......@@ -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)
{
......
......@@ -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;
};
......
......@@ -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) ),
......
......@@ -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;
......
......@@ -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,
......
......@@ -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);
......
......@@ -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,
......
......@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment