From 91352803344b7a1d20121f6aa4a642dbe45936b2 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 31 Jul 2015 21:45:31 +0200 Subject: [PATCH] sc: replace boost::function with std::function Change-Id: Ic98b20eabdc0e62078b28ab0219b00b67e8e1099 --- sc/source/ui/sidebar/CellBorderStylePopup.cxx | 2 +- sc/source/ui/sidebar/CellBorderStylePopup.hxx | 5 +++-- sc/source/ui/sidebar/CellLineStylePopup.cxx | 2 +- sc/source/ui/sidebar/CellLineStylePopup.hxx | 5 +++-- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/sc/source/ui/sidebar/CellBorderStylePopup.cxx b/sc/source/ui/sidebar/CellBorderStylePopup.cxx index 1a27c25e6a55..f71603e9ccb9 100644 --- a/sc/source/ui/sidebar/CellBorderStylePopup.cxx +++ b/sc/source/ui/sidebar/CellBorderStylePopup.cxx @@ -24,7 +24,7 @@ namespace sc { namespace sidebar { CellBorderStylePopup::CellBorderStylePopup ( vcl::Window* pParent, - const ::boost::function& rControlCreator) + const ::std::function& rControlCreator) : Popup(pParent, rControlCreator, ::OUString("CellBorderStyle")) { } diff --git a/sc/source/ui/sidebar/CellBorderStylePopup.hxx b/sc/source/ui/sidebar/CellBorderStylePopup.hxx index 4b66db521c45..52124a8490de 100644 --- a/sc/source/ui/sidebar/CellBorderStylePopup.hxx +++ b/sc/source/ui/sidebar/CellBorderStylePopup.hxx @@ -20,7 +20,8 @@ #define INCLUDED_SC_SOURCE_UI_SIDEBAR_CELLBORDERSTYLEPOPUP_HXX #include -#include + +#include namespace sc { namespace sidebar { @@ -29,7 +30,7 @@ class CellBorderStylePopup : public svx::sidebar::Popup public: CellBorderStylePopup( vcl::Window* pParent, - const ::boost::function& rControlCreator); + const ::std::function& rControlCreator); virtual ~CellBorderStylePopup(); }; diff --git a/sc/source/ui/sidebar/CellLineStylePopup.cxx b/sc/source/ui/sidebar/CellLineStylePopup.cxx index a65cc219a3f5..59b4b065f134 100644 --- a/sc/source/ui/sidebar/CellLineStylePopup.cxx +++ b/sc/source/ui/sidebar/CellLineStylePopup.cxx @@ -24,7 +24,7 @@ namespace sc { namespace sidebar { CellLineStylePopup::CellLineStylePopup ( vcl::Window* pParent, - const ::boost::function& rControlCreator) + const ::std::function& rControlCreator) : Popup(pParent, rControlCreator, OUString("CellLineStyle")) { } diff --git a/sc/source/ui/sidebar/CellLineStylePopup.hxx b/sc/source/ui/sidebar/CellLineStylePopup.hxx index c7cdbce529a3..76ac74deeaa9 100644 --- a/sc/source/ui/sidebar/CellLineStylePopup.hxx +++ b/sc/source/ui/sidebar/CellLineStylePopup.hxx @@ -20,7 +20,8 @@ #define INCLUDED_SC_SOURCE_UI_SIDEBAR_CELLLINESTYLEPOPUP_HXX #include -#include + +#include namespace sc { namespace sidebar { @@ -29,7 +30,7 @@ class CellLineStylePopup : public svx::sidebar::Popup public: CellLineStylePopup( vcl::Window* pParent, - const ::boost::function& rControlCreator); + const ::std::function& rControlCreator); virtual ~CellLineStylePopup(); void SetLineStyleSelect(sal_uInt16 out, sal_uInt16 in, sal_uInt16 dis);