summaryrefslogtreecommitdiff
path: root/sd/source/ui/slideshow
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-09-17 15:41:33 +0100
committerCaolán McNamara <caolanm@redhat.com>2015-09-17 17:01:14 +0100
commit6f495a195b794257e8b1302d384148be43c04cee (patch)
treec0ef4b8eeed1b1bb2e8da0deffac0a74b2eb5467 /sd/source/ui/slideshow
parent74efa4f0e87e2b5fe7a577fa4673cb947c947c74 (diff)
boost->std
Change-Id: I1e6a7fd66f90e6acd803c6cd464f1d73252f7bcb
Diffstat (limited to 'sd/source/ui/slideshow')
-rw-r--r--sd/source/ui/slideshow/SlideShowRestarter.cxx2
-rw-r--r--sd/source/ui/slideshow/SlideShowRestarter.hxx6
-rw-r--r--sd/source/ui/slideshow/slideshow.cxx12
-rw-r--r--sd/source/ui/slideshow/slideshowimpl.hxx4
4 files changed, 12 insertions, 12 deletions
diff --git a/sd/source/ui/slideshow/SlideShowRestarter.cxx b/sd/source/ui/slideshow/SlideShowRestarter.cxx
index 42417ad7ccaa..be3db6ab1958 100644
--- a/sd/source/ui/slideshow/SlideShowRestarter.cxx
+++ b/sd/source/ui/slideshow/SlideShowRestarter.cxx
@@ -100,7 +100,7 @@ IMPL_LINK_NOARG_TYPED(SlideShowRestarter, EndPresentation, void*, void)
// restart of the slide show.
if (mpViewShellBase != NULL)
{
- ::boost::shared_ptr<FrameworkHelper> pHelper(
+ ::std::shared_ptr<FrameworkHelper> pHelper(
FrameworkHelper::Instance(*mpViewShellBase));
if (pHelper->GetConfigurationController()->getResource(
FrameworkHelper::CreateResourceId(FrameworkHelper::msFullScreenPaneURL)).is())
diff --git a/sd/source/ui/slideshow/SlideShowRestarter.hxx b/sd/source/ui/slideshow/SlideShowRestarter.hxx
index 42b494c91fd0..240d6ec77ef7 100644
--- a/sd/source/ui/slideshow/SlideShowRestarter.hxx
+++ b/sd/source/ui/slideshow/SlideShowRestarter.hxx
@@ -24,7 +24,7 @@
#include "ViewShellBase.hxx"
#include <rtl/ref.hxx>
#include <tools/link.hxx>
-#include <boost/enable_shared_from_this.hpp>
+#include <memory>
namespace sd {
@@ -37,7 +37,7 @@ namespace sd {
opportunity to show or hide depending on the number of available displays.
*/
class SlideShowRestarter
- : public boost::enable_shared_from_this<SlideShowRestarter>
+ : public std::enable_shared_from_this<SlideShowRestarter>
{
public:
/** Create a new SlideShowRestarter object.
@@ -64,7 +64,7 @@ private:
ImplSVEvent * mnEventId;
::rtl::Reference<SlideShow> mpSlideShow;
ViewShellBase* mpViewShellBase;
- ::boost::shared_ptr<SlideShowRestarter> mpSelf;
+ ::std::shared_ptr<SlideShowRestarter> mpSelf;
sal_Int32 mnDisplayCount;
SfxDispatcher* mpDispatcher;
sal_Int32 mnCurrentSlideNumber;
diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx
index 46cec5f87145..a04d0cd08b0a 100644
--- a/sd/source/ui/slideshow/slideshow.cxx
+++ b/sd/source/ui/slideshow/slideshow.cxx
@@ -94,7 +94,7 @@ namespace {
}
private:
- ::boost::shared_ptr<SlideShowRestarter> mpRestarter;
+ ::std::shared_ptr<SlideShowRestarter> mpRestarter;
};
}
@@ -701,7 +701,7 @@ void SAL_CALL SlideShow::end()
// Get the shell pointer in its own scope to be sure that
// the shared_ptr to the shell is released before DoClose()
// is called.
- ::boost::shared_ptr<ViewShell> pSharedView (pFullScreenViewShellBase->GetMainViewShell());
+ ::std::shared_ptr<ViewShell> pSharedView (pFullScreenViewShellBase->GetMainViewShell());
pShell = dynamic_cast<PresentationViewShell*>(pSharedView.get());
}
if( pShell && pShell->GetViewFrame() )
@@ -973,7 +973,7 @@ void SlideShow::activate( ViewShellBase& rBase )
{
if( (mpFullScreenViewShellBase == &rBase) && !mxController.is() )
{
- ::boost::shared_ptr<PresentationViewShell> pShell = ::boost::dynamic_pointer_cast<PresentationViewShell>(rBase.GetMainViewShell());
+ ::std::shared_ptr<PresentationViewShell> pShell = std::dynamic_pointer_cast<PresentationViewShell>(rBase.GetMainViewShell());
if(pShell.get() != NULL)
{
pShell->FinishInitialization( mpFullScreenFrameView );
@@ -1093,8 +1093,8 @@ void SlideShow::StartInPlacePresentation()
ViewShell::ShellType eShell = ViewShell::ST_NONE;
- ::boost::shared_ptr<FrameworkHelper> pHelper(FrameworkHelper::Instance(*mpCurrentViewShellBase));
- ::boost::shared_ptr<ViewShell> pMainViewShell(pHelper->GetViewShell(FrameworkHelper::msCenterPaneURL));
+ ::std::shared_ptr<FrameworkHelper> pHelper(FrameworkHelper::Instance(*mpCurrentViewShellBase));
+ ::std::shared_ptr<ViewShell> pMainViewShell(pHelper->GetViewShell(FrameworkHelper::msCenterPaneURL));
if( pMainViewShell.get() )
eShell = pMainViewShell->GetShellType();
@@ -1170,7 +1170,7 @@ void SlideShow::StartFullscreenPresentation( )
// changes made by the presentation have an effect on the other
// view shells.
FrameView* pOriginalFrameView = 0;
- ::boost::shared_ptr<ViewShell> xShell(mpCurrentViewShellBase->GetMainViewShell());
+ ::std::shared_ptr<ViewShell> xShell(mpCurrentViewShellBase->GetMainViewShell());
if (xShell.get())
pOriginalFrameView = xShell->GetFrameView();
diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx
index a7af2838e268..6cf680235c3d 100644
--- a/sd/source/ui/slideshow/slideshowimpl.hxx
+++ b/sd/source/ui/slideshow/slideshowimpl.hxx
@@ -112,7 +112,7 @@ struct WrappedShapeEventImpl
WrappedShapeEventImpl() : meClickAction( css::presentation::ClickAction_NONE ), mnVerb( 0 ) {};
};
-typedef boost::shared_ptr< WrappedShapeEventImpl > WrappedShapeEventImplPtr;
+typedef std::shared_ptr< WrappedShapeEventImpl > WrappedShapeEventImplPtr;
typedef std::map< css::uno::Reference< css::drawing::XShape >, WrappedShapeEventImplPtr > WrappedShapeEventImplMap;
class SlideShowListenerProxy : private ::cppu::BaseMutex,
@@ -336,7 +336,7 @@ private:
VclPtr<ShowWindow> mpShowWindow;
VclPtr<PushButton> mpTimeButton;
- boost::shared_ptr< AnimationSlideController > mpSlideController;
+ std::shared_ptr< AnimationSlideController > mpSlideController;
long mnRestoreSlide;
Point maSlideOrigin;