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

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

Change-Id: I7d6d01775600fdbd64b0b5a249d88acdb89f6591
üst 2a62966d
...@@ -19,8 +19,6 @@ ...@@ -19,8 +19,6 @@
#ifndef INCLUDED_SVX_SOURCE_SIDEBAR_PARAGRAPH_PARALINESPACINGPOPUP_HXX #ifndef INCLUDED_SVX_SOURCE_SIDEBAR_PARAGRAPH_PARALINESPACINGPOPUP_HXX
#define INCLUDED_SVX_SOURCE_SIDEBAR_PARAGRAPH_PARALINESPACINGPOPUP_HXX #define INCLUDED_SVX_SOURCE_SIDEBAR_PARAGRAPH_PARALINESPACINGPOPUP_HXX
#include <boost/function.hpp>
#include <editeng/lspcitem.hxx> #include <editeng/lspcitem.hxx>
#include <sfx2/sidebar/EnumContext.hxx> #include <sfx2/sidebar/EnumContext.hxx>
#include <sfx2/tbxctrl.hxx> #include <sfx2/tbxctrl.hxx>
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#include "svx/sidebar/Popup.hxx" #include "svx/sidebar/Popup.hxx"
#include <boost/function.hpp> #include <functional>
class XFillFloatTransparenceItem; class XFillFloatTransparenceItem;
...@@ -35,7 +35,7 @@ class AreaTransparencyGradientPopup ...@@ -35,7 +35,7 @@ class AreaTransparencyGradientPopup
public: public:
AreaTransparencyGradientPopup ( AreaTransparencyGradientPopup (
vcl::Window* pParent, vcl::Window* pParent,
const ::boost::function<PopupControl*(PopupContainer*)>& rControlCreator); ::std::function<PopupControl*(PopupContainer*)> const& rControlCreator);
virtual ~AreaTransparencyGradientPopup(); virtual ~AreaTransparencyGradientPopup();
void Rearrange (XFillFloatTransparenceItem* pItem); void Rearrange (XFillFloatTransparenceItem* pItem);
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#include <svl/poolitem.hxx> #include <svl/poolitem.hxx>
#include <boost/function.hpp> #include <functional>
namespace svx { namespace sidebar { namespace svx { namespace sidebar {
...@@ -34,7 +34,7 @@ class LineWidthPopup ...@@ -34,7 +34,7 @@ class LineWidthPopup
public: public:
LineWidthPopup ( LineWidthPopup (
vcl::Window* pParent, vcl::Window* pParent,
const ::boost::function<PopupControl*(PopupContainer*)>& rControlCreator); const ::std::function<PopupControl*(PopupContainer*)>& rControlCreator);
virtual ~LineWidthPopup(); virtual ~LineWidthPopup();
void SetWidthSelect (long lValue, bool bValuable, SfxMapUnit eMapUnit); void SetWidthSelect (long lValue, bool bValuable, SfxMapUnit eMapUnit);
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#include <svx/sidebar/PopupContainer.hxx> #include <svx/sidebar/PopupContainer.hxx>
#include <svx/sidebar/PopupControl.hxx> #include <svx/sidebar/PopupControl.hxx>
#include <boost/function.hpp> #include <functional>
namespace vcl { class Window; } namespace vcl { class Window; }
class ToolBox; class ToolBox;
...@@ -51,7 +51,7 @@ public: ...@@ -51,7 +51,7 @@ public:
*/ */
Popup ( Popup (
vcl::Window* pParent, vcl::Window* pParent,
const ::boost::function<PopupControl*(PopupContainer*)>& rControlCreator, const ::std::function<PopupControl*(PopupContainer*)>& rControlCreator,
const ::rtl::OUString& rsAccessibleName); const ::rtl::OUString& rsAccessibleName);
virtual ~Popup(); virtual ~Popup();
...@@ -73,7 +73,7 @@ public: ...@@ -73,7 +73,7 @@ public:
/** If you want to be informed when the popup closes then add a /** If you want to be informed when the popup closes then add a
callback that is called after that. callback that is called after that.
*/ */
void SetPopupModeEndHandler (const ::boost::function<void()>& rCallback); void SetPopupModeEndHandler (const ::std::function<void()>& rCallback);
void dispose(); void dispose();
...@@ -92,8 +92,8 @@ protected: ...@@ -92,8 +92,8 @@ protected:
private: private:
VclPtr<vcl::Window> mpParent; VclPtr<vcl::Window> mpParent;
::boost::function<VclPtr<PopupControl>(PopupContainer*)> maControlCreator; ::std::function<VclPtr<PopupControl>(PopupContainer*)> maControlCreator;
::boost::function<void()> maPopupModeEndCallback; ::std::function<void()> maPopupModeEndCallback;
const ::rtl::OUString msAccessibleName; const ::rtl::OUString msAccessibleName;
VclPtr<PopupContainer> mxContainer; VclPtr<PopupContainer> mxContainer;
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#include <cppuhelper/compbase1.hxx> #include <cppuhelper/compbase1.hxx>
#include <cppuhelper/basemutex.hxx> #include <cppuhelper/basemutex.hxx>
#include <boost/function.hpp> #include <functional>
class SdrMarkView; class SdrMarkView;
...@@ -48,7 +48,7 @@ class SVX_DLLPUBLIC SelectionChangeHandler ...@@ -48,7 +48,7 @@ class SVX_DLLPUBLIC SelectionChangeHandler
{ {
public: public:
SelectionChangeHandler ( SelectionChangeHandler (
const boost::function<rtl::OUString()>& rSelectionChangeCallback, const std::function<rtl::OUString ()>& rSelectionChangeCallback,
const css::uno::Reference<css::frame::XController>& rxController, const css::uno::Reference<css::frame::XController>& rxController,
const sfx2::sidebar::EnumContext::Context eDefaultContext); const sfx2::sidebar::EnumContext::Context eDefaultContext);
virtual ~SelectionChangeHandler(); virtual ~SelectionChangeHandler();
...@@ -69,7 +69,7 @@ private: ...@@ -69,7 +69,7 @@ private:
SelectionChangeHandler(const SelectionChangeHandler&) SAL_DELETED_FUNCTION; SelectionChangeHandler(const SelectionChangeHandler&) SAL_DELETED_FUNCTION;
SelectionChangeHandler& operator=(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; css::uno::Reference<css::frame::XController> mxController;
const sfx2::sidebar::EnumContext::Context meDefaultContext; const sfx2::sidebar::EnumContext::Context meDefaultContext;
bool mbIsConnected; bool mbIsConnected;
......
...@@ -33,7 +33,7 @@ using namespace sfx2::sidebar; ...@@ -33,7 +33,7 @@ using namespace sfx2::sidebar;
namespace svx { namespace sidebar { namespace svx { namespace sidebar {
SelectionChangeHandler::SelectionChangeHandler ( SelectionChangeHandler::SelectionChangeHandler (
const boost::function<rtl::OUString()>& rSelectionChangeCallback, const std::function<rtl::OUString()>& rSelectionChangeCallback,
const Reference<frame::XController>& rxController, const Reference<frame::XController>& rxController,
const EnumContext::Context eDefaultContext) const EnumContext::Context eDefaultContext)
: SelectionChangeHandlerInterfaceBase(m_aMutex), : SelectionChangeHandlerInterfaceBase(m_aMutex),
......
...@@ -23,7 +23,7 @@ namespace svx { namespace sidebar { ...@@ -23,7 +23,7 @@ namespace svx { namespace sidebar {
AreaTransparencyGradientPopup::AreaTransparencyGradientPopup ( AreaTransparencyGradientPopup::AreaTransparencyGradientPopup (
vcl::Window* pParent, vcl::Window* pParent,
const ::boost::function<PopupControl*(PopupContainer*)>& rControlCreator) const ::std::function<PopupControl* (PopupContainer*)>& rControlCreator)
: Popup( : Popup(
pParent, pParent,
rControlCreator, rControlCreator,
......
...@@ -29,7 +29,7 @@ namespace svx { namespace sidebar { ...@@ -29,7 +29,7 @@ namespace svx { namespace sidebar {
LineWidthPopup::LineWidthPopup ( LineWidthPopup::LineWidthPopup (
vcl::Window* pParent, vcl::Window* pParent,
const ::boost::function<PopupControl*(PopupContainer*)>& rControlCreator) const ::std::function<PopupControl*(PopupContainer*)>& rControlCreator)
: Popup( : Popup(
pParent, pParent,
rControlCreator, rControlCreator,
......
...@@ -27,7 +27,7 @@ namespace svx { namespace sidebar { ...@@ -27,7 +27,7 @@ namespace svx { namespace sidebar {
Popup::Popup ( Popup::Popup (
vcl::Window* pParent, vcl::Window* pParent,
const ::boost::function<PopupControl*(PopupContainer*)>& rControlCreator, const ::std::function<PopupControl* (PopupContainer*)>& rControlCreator,
const ::rtl::OUString& rsAccessibleName) const ::rtl::OUString& rsAccessibleName)
: mxControl(), : mxControl(),
mpParent(pParent), mpParent(pParent),
...@@ -89,7 +89,7 @@ void Popup::Hide() ...@@ -89,7 +89,7 @@ void Popup::Hide()
mxContainer->EndPopupMode(); mxContainer->EndPopupMode();
} }
void Popup::SetPopupModeEndHandler (const ::boost::function<void()>& rCallback) void Popup::SetPopupModeEndHandler (const ::std::function<void ()>& rCallback)
{ {
maPopupModeEndCallback = rCallback; maPopupModeEndCallback = rCallback;
if (mxContainer) if (mxContainer)
......
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