mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sc: replace boost::function with std::function

Browse Source 
Change-Id: Ic98b20eabdc0e62078b28ab0219b00b67e8e1099
This commit is contained in:
Michael Stahl
2015-07-31 21:45:31 +02:00
parent 4cf0869b69
commit 9135280334
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sc/source/ui/sidebar/CellBorderStylePopup.cxx
View File

@@ -24,7 +24,7 @@ namespace sc { namespace sidebar {
CellBorderStylePopup::CellBorderStylePopup ( CellBorderStylePopup::CellBorderStylePopup (
vcl::Window* pParent, vcl::Window* pParent,
const ::boost::function<svx::sidebar::PopupControl*(svx::sidebar::PopupContainer*)>& rControlCreator) const ::std::function<svx::sidebar::PopupControl* (svx::sidebar::PopupContainer*)>& rControlCreator)
: Popup(pParent, rControlCreator, ::OUString("CellBorderStyle")) : Popup(pParent, rControlCreator, ::OUString("CellBorderStyle"))
{ {
} }

5
sc/source/ui/sidebar/CellBorderStylePopup.hxx
View File

@@ -20,7 +20,8 @@
#define INCLUDED_SC_SOURCE_UI_SIDEBAR_CELLBORDERSTYLEPOPUP_HXX #define INCLUDED_SC_SOURCE_UI_SIDEBAR_CELLBORDERSTYLEPOPUP_HXX
#include <svx/sidebar/Popup.hxx> #include <svx/sidebar/Popup.hxx>
#include <boost/function.hpp>
#include <functional>
namespace sc { namespace sidebar { namespace sc { namespace sidebar {
@@ -29,7 +30,7 @@ class CellBorderStylePopup : public svx::sidebar::Popup
public: public:
CellBorderStylePopup( CellBorderStylePopup(
vcl::Window* pParent, vcl::Window* pParent,
const ::boost::function<svx::sidebar::PopupControl*(svx::sidebar::PopupContainer*)>& rControlCreator); const ::std::function<svx::sidebar::PopupControl*(svx::sidebar::PopupContainer*)>& rControlCreator);
virtual ~CellBorderStylePopup(); virtual ~CellBorderStylePopup();
}; };

2
sc/source/ui/sidebar/CellLineStylePopup.cxx
View File

@@ -24,7 +24,7 @@ namespace sc { namespace sidebar {
CellLineStylePopup::CellLineStylePopup ( CellLineStylePopup::CellLineStylePopup (
vcl::Window* pParent, vcl::Window* pParent,
const ::boost::function<svx::sidebar::PopupControl*(svx::sidebar::PopupContainer*)>& rControlCreator) const ::std::function<svx::sidebar::PopupControl* (svx::sidebar::PopupContainer*)>& rControlCreator)
: Popup(pParent, rControlCreator, OUString("CellLineStyle")) : Popup(pParent, rControlCreator, OUString("CellLineStyle"))
{ {
} }

5
sc/source/ui/sidebar/CellLineStylePopup.hxx
View File

@@ -20,7 +20,8 @@
#define INCLUDED_SC_SOURCE_UI_SIDEBAR_CELLLINESTYLEPOPUP_HXX #define INCLUDED_SC_SOURCE_UI_SIDEBAR_CELLLINESTYLEPOPUP_HXX
#include <svx/sidebar/Popup.hxx> #include <svx/sidebar/Popup.hxx>
#include <boost/function.hpp>
#include <functional>
namespace sc { namespace sidebar { namespace sc { namespace sidebar {
@@ -29,7 +30,7 @@ class CellLineStylePopup : public svx::sidebar::Popup
public: public:
CellLineStylePopup( CellLineStylePopup(
vcl::Window* pParent, vcl::Window* pParent,
const ::boost::function<svx::sidebar::PopupControl*(svx::sidebar::PopupContainer*)>& rControlCreator); const ::std::function<svx::sidebar::PopupControl* (svx::sidebar::PopupContainer*)>& rControlCreator);
virtual ~CellLineStylePopup(); virtual ~CellLineStylePopup();
void SetLineStyleSelect(sal_uInt16 out, sal_uInt16 in, sal_uInt16 dis); void SetLineStyleSelect(sal_uInt16 out, sal_uInt16 in, sal_uInt16 dis);