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 @@
#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>
......
......@@ -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);
......
......@@ -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);
......
......@@ -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;
......
......@@ -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;
......
......@@ -33,7 +33,7 @@ using namespace sfx2::sidebar;
namespace svx { namespace sidebar {
SelectionChangeHandler::SelectionChangeHandler (
const boost::function<rtl::OUString()>& rSelectionChangeCallback,
const std::function<rtl::OUString()>& rSelectionChangeCallback,
const Reference<frame::XController>& rxController,
const EnumContext::Context eDefaultContext)
: SelectionChangeHandlerInterfaceBase(m_aMutex),
......
......@@ -23,7 +23,7 @@ namespace svx { namespace sidebar {
AreaTransparencyGradientPopup::AreaTransparencyGradientPopup (
vcl::Window* pParent,
const ::boost::function<PopupControl*(PopupContainer*)>& rControlCreator)
const ::std::function<PopupControl* (PopupContainer*)>& rControlCreator)
: Popup(
pParent,
rControlCreator,
......
......@@ -29,7 +29,7 @@ namespace svx { namespace sidebar {
LineWidthPopup::LineWidthPopup (
vcl::Window* pParent,
const ::boost::function<PopupControl*(PopupContainer*)>& rControlCreator)
const ::std::function<PopupControl*(PopupContainer*)>& rControlCreator)
: Popup(
pParent,
rControlCreator,
......
......@@ -27,7 +27,7 @@ namespace svx { namespace sidebar {
Popup::Popup (
vcl::Window* pParent,
const ::boost::function<PopupControl*(PopupContainer*)>& rControlCreator,
const ::std::function<PopupControl* (PopupContainer*)>& rControlCreator,
const ::rtl::OUString& rsAccessibleName)
: mxControl(),
mpParent(pParent),
......@@ -89,7 +89,7 @@ void Popup::Hide()
mxContainer->EndPopupMode();
}
void Popup::SetPopupModeEndHandler (const ::boost::function<void()>& rCallback)
void Popup::SetPopupModeEndHandler (const ::std::function<void ()>& rCallback)
{
maPopupModeEndCallback = rCallback;
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