summaryrefslogtreecommitdiff
path: root/sd/source/ui/slideshow/slideshow.cxx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-09-18 09:09:12 +0100
committerCaolán McNamara <caolanm@redhat.com>2015-09-23 11:19:17 +0000
commit177ea7a2818ee64de3eaa9b587d70fe461468005 (patch)
tree60d3838c3f7daff05fc94e4bf2d7c83b2c013041 /sd/source/ui/slideshow/slideshow.cxx
parenta44e03b5d7822d026a3b2fbaf039522f085defed (diff)
boost::shared_ptr->std::shared_ptr
Change-Id: I2c6ac98f0984534894759cfbf4449eb554801cf8 Reviewed-on: https://gerrit.libreoffice.org/18678 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sd/source/ui/slideshow/slideshow.cxx')
-rw-r--r--sd/source/ui/slideshow/slideshow.cxx12
1 files changed, 6 insertions, 6 deletions
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();