diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-07-31 18:30:09 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-07-31 21:24:25 +0200 |
| commit | 2a62966d8947829d00702455977026369082007a (patch) | |
| tree | e2323fa9b36ed1686f03de9aa5a272c77f3cc902 /sfx2/source | |
| parent | 1841946863ed006a36323fcca52a71272eae2ee6 (diff) | |
sfx2: replace boost::function with std::function
Change-Id: I72acc5f396553eb464338a395ef40f95ed57a07e
Diffstat (limited to 'sfx2/source')
| -rw-r--r-- | sfx2/source/control/templatelocalview.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/control/thumbnailview.cxx | 4 | ||||
| -rw-r--r-- | sfx2/source/sidebar/SidebarController.cxx | 1 | ||||
| -rw-r--r-- | sfx2/source/sidebar/TabBar.cxx | 2 |
4 files changed, 4 insertions, 5 deletions
diff --git a/sfx2/source/control/templatelocalview.cxx b/sfx2/source/control/templatelocalview.cxx index 2dbbad5174e3..1dc61c1f74a8 100644 --- a/sfx2/source/control/templatelocalview.cxx +++ b/sfx2/source/control/templatelocalview.cxx @@ -225,7 +225,7 @@ std::vector<OUString> TemplateLocalView::getFolderNames() } std::vector<TemplateItemProperties> -TemplateLocalView::getFilteredItems(const boost::function<bool (const TemplateItemProperties&) > &rFunc) const +TemplateLocalView::getFilteredItems(const std::function<bool (const TemplateItemProperties&)> &rFunc) const { std::vector<TemplateItemProperties> aItems; diff --git a/sfx2/source/control/thumbnailview.cxx b/sfx2/source/control/thumbnailview.cxx index ff050df4a699..cdd7329fcfa5 100644 --- a/sfx2/source/control/thumbnailview.cxx +++ b/sfx2/source/control/thumbnailview.cxx @@ -1170,7 +1170,7 @@ void ThumbnailView::ShowTooltips( bool bShowTooltips ) mbShowTooltips = bShowTooltips; } -void ThumbnailView::filterItems (const boost::function<bool (const ThumbnailViewItem*) > &func) +void ThumbnailView::filterItems(const std::function<bool (const ThumbnailViewItem*)> &func) { mnFirstLine = 0; // start at the top of the list instead of the current position maFilterFunc = func; @@ -1221,7 +1221,7 @@ void ThumbnailView::filterItems (const boost::function<bool (const ThumbnailView Invalidate(); } -void ThumbnailView::sortItems (const boost::function<bool (const ThumbnailViewItem*, const ThumbnailViewItem*) > &func) +void ThumbnailView::sortItems(const std::function<bool (const ThumbnailViewItem*, const ThumbnailViewItem*)> &func) { std::sort(mItemList.begin(),mItemList.end(),func); diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx index ed4cee0f15be..c7c40f754af2 100644 --- a/sfx2/source/sidebar/SidebarController.cxx +++ b/sfx2/source/sidebar/SidebarController.cxx @@ -55,7 +55,6 @@ #include <com/sun/star/rendering/XSpriteCanvas.hpp> #include <boost/bind.hpp> -#include <boost/function.hpp> using namespace css; using namespace css::uno; diff --git a/sfx2/source/sidebar/TabBar.cxx b/sfx2/source/sidebar/TabBar.cxx index 4733898ada0a..29a4896368ef 100644 --- a/sfx2/source/sidebar/TabBar.cxx +++ b/sfx2/source/sidebar/TabBar.cxx @@ -43,7 +43,7 @@ namespace sfx2 { namespace sidebar { TabBar::TabBar(vcl::Window* pParentWindow, const Reference<frame::XFrame>& rxFrame, - const boost::function<void(const OUString&)>& rDeckActivationFunctor, + const std::function<void (const OUString&)>& rDeckActivationFunctor, const PopupMenuProvider& rPopupMenuProvider, SidebarController* rParentSidebarController ) |