summaryrefslogtreecommitdiff
path: root/sdext/source/presenter/PresenterPaneContainer.hxx
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2015-08-03 12:50:28 +0200
committerMichael Stahl <mstahl@redhat.com>2015-08-03 14:47:45 +0200
commit902d61bc7f2e0491b95798c2ece8595b3881b573 (patch)
tree0cccac094a864ac3f2421cd485088f6418b5da96 /sdext/source/presenter/PresenterPaneContainer.hxx
parent34d2a07a23f344b33f9b3ed7d2a70b405b392db6 (diff)
sdext: replace boost::function with std::function
This one is a bit odd, wonder if that was a bug: - aAction(aPredicate); + aAction(aPredicate()); Change-Id: I0ddd565b65fe4778a297486805fa7f7a12702224
Diffstat (limited to 'sdext/source/presenter/PresenterPaneContainer.hxx')
-rw-r--r--sdext/source/presenter/PresenterPaneContainer.hxx12
1 files changed, 7 insertions, 5 deletions
diff --git a/sdext/source/presenter/PresenterPaneContainer.hxx b/sdext/source/presenter/PresenterPaneContainer.hxx
index c22eb278fc64..03704b9910a6 100644
--- a/sdext/source/presenter/PresenterPaneContainer.hxx
+++ b/sdext/source/presenter/PresenterPaneContainer.hxx
@@ -33,11 +33,13 @@
#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/compbase1.hxx>
#include <rtl/ref.hxx>
-#include <vector>
-#include <boost/function.hpp>
+
#include <boost/noncopyable.hpp>
#include <boost/shared_ptr.hpp>
+#include <vector>
+#include <functional>
+
namespace sdext { namespace presenter {
class PresenterPaneBase;
@@ -65,7 +67,7 @@ public:
virtual void SAL_CALL disposing() SAL_OVERRIDE;
- typedef ::boost::function1<void, const css::uno::Reference<css::drawing::framework::XView>&>
+ typedef ::std::function<void (const css::uno::Reference<css::drawing::framework::XView>&)>
ViewInitializationFunction;
/** Each pane descriptor holds references to one pane and the view
@@ -79,8 +81,8 @@ public:
class PaneDescriptor
{
public:
- typedef ::boost::function<void(bool)> Activator;
- typedef ::boost::function<boost::shared_ptr<PresenterSprite>()> SpriteProvider;
+ typedef ::std::function<void (bool)> Activator;
+ typedef ::std::function<boost::shared_ptr<PresenterSprite> ()> SpriteProvider;
css::uno::Reference<css::drawing::framework::XResourceId> mxPaneId;
OUString msViewURL;
::rtl::Reference<PresenterPaneBase> mxPane;