summaryrefslogtreecommitdiff
path: root/sd/source/ui/slideshow
diff options
context:
space:
mode:
Diffstat (limited to 'sd/source/ui/slideshow')
-rw-r--r--sd/source/ui/slideshow/slideshow.cxx10
-rw-r--r--sd/source/ui/slideshow/slideshowimpl.cxx40
-rw-r--r--sd/source/ui/slideshow/slideshowviewimpl.cxx4
3 files changed, 27 insertions, 27 deletions
diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx
index 1b63f0d06f14..74bbe395d92d 100644
--- a/sd/source/ui/slideshow/slideshow.cxx
+++ b/sd/source/ui/slideshow/slideshow.cxx
@@ -1067,14 +1067,14 @@ void SlideShow::StartInPlacePresentation()
::std::shared_ptr<FrameworkHelper> pHelper(FrameworkHelper::Instance(*mpCurrentViewShellBase));
::std::shared_ptr<ViewShell> pMainViewShell(pHelper->GetViewShell(FrameworkHelper::msCenterPaneURL));
- if( pMainViewShell.get() )
+ if( pMainViewShell )
eShell = pMainViewShell->GetShellType();
if( eShell != ViewShell::ST_IMPRESS )
{
// Switch temporary to a DrawViewShell which supports the in-place presentation.
- if( pMainViewShell.get() )
+ if( pMainViewShell )
{
FrameView* pFrameView = pMainViewShell->GetFrameView();
pFrameView->SetPresentationViewShellId(SID_VIEWSHELL1);
@@ -1107,7 +1107,7 @@ void SlideShow::StartInPlacePresentation()
return;
bool bSuccess = false;
- if( mxCurrentSettings.get() && mxCurrentSettings->mbPreview )
+ if( mxCurrentSettings && mxCurrentSettings->mbPreview )
{
bSuccess = mxController->startPreview(mxCurrentSettings->mxStartPage, mxCurrentSettings->mxAnimationNode, mxCurrentSettings->mpParentWindow );
}
@@ -1120,7 +1120,7 @@ void SlideShow::StartInPlacePresentation()
end();
else
{
- if( mpCurrentViewShellBase && ( !mxCurrentSettings.get() || ( mxCurrentSettings.get() && !mxCurrentSettings->mbPreview ) ) )
+ if( mpCurrentViewShellBase && ( !mxCurrentSettings || ( mxCurrentSettings && !mxCurrentSettings->mbPreview ) ) )
mpCurrentViewShellBase->GetWindow()->GrabFocus();
}
}
@@ -1149,7 +1149,7 @@ void SlideShow::StartFullscreenPresentation( )
// view shells.
FrameView* pOriginalFrameView = nullptr;
::std::shared_ptr<ViewShell> xShell(mpCurrentViewShellBase->GetMainViewShell());
- if (xShell.get())
+ if (xShell)
pOriginalFrameView = xShell->GetFrameView();
delete mpFullScreenFrameView;
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index e92bb0b509ce..03fbc17a10dc 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -1310,7 +1310,7 @@ void SlideshowImpl::displayCurrentSlide (const bool bSkipAllMainSequenceEffects)
stopSound();
removeShapeEvents();
- if( mpSlideController.get() && mxShow.is() )
+ if( mpSlideController && mxShow.is() )
{
Reference< XDrawPagesSupplier > xDrawPages( mpDoc->getUnoModel(),
UNO_QUERY_THROW );
@@ -1431,7 +1431,7 @@ void SlideshowImpl::click( const Reference< XShape >& xShape )
SolarMutexGuard aSolarGuard;
WrappedShapeEventImplPtr pEvent = maShapeEventMap[xShape];
- if( !pEvent.get() )
+ if( !pEvent )
return;
switch( pEvent->meClickAction )
@@ -1589,7 +1589,7 @@ void SlideshowImpl::hyperLinkClicked( OUString const& aHyperLink )
void SlideshowImpl::displaySlideNumber( sal_Int32 nSlideNumber )
{
- if( mpSlideController.get() )
+ if( mpSlideController )
{
if( mpSlideController->jumpToSlideNumber( nSlideNumber ) )
{
@@ -1601,7 +1601,7 @@ void SlideshowImpl::displaySlideNumber( sal_Int32 nSlideNumber )
/** nSlideIndex == -1 displays current slide again */
void SlideshowImpl::displaySlideIndex( sal_Int32 nSlideIndex )
{
- if( mpSlideController.get() )
+ if( mpSlideController )
{
if( (nSlideIndex == -1) || mpSlideController->jumpToSlideIndex( nSlideIndex ) )
{
@@ -1619,7 +1619,7 @@ void SlideshowImpl::jumpToBookmark( const OUString& sBookmark )
sal_Int32 SlideshowImpl::getCurrentSlideNumber() const
{
- return mpSlideController.get() ? mpSlideController->getCurrentSlideNumber() : -1;
+ return mpSlideController ? mpSlideController->getCurrentSlideNumber() : -1;
}
sal_Bool SAL_CALL SlideshowImpl::isEndless()
@@ -1736,7 +1736,7 @@ bool SlideshowImpl::keyInput(const KeyEvent& rKEvt)
case KEY_SUBTRACT:
// in case the user cancels the presentation, switch to current slide
// in edit mode
- if( mpSlideController.get() && (ANIMATIONMODE_SHOW == meAnimationMode) )
+ if( mpSlideController && (ANIMATIONMODE_SHOW == meAnimationMode) )
{
if( mpSlideController->getCurrentSlideNumber() != -1 )
mnRestoreSlide = mpSlideController->getCurrentSlideNumber();
@@ -1763,7 +1763,7 @@ bool SlideshowImpl::keyInput(const KeyEvent& rKEvt)
{
if( !maCharBuffer.isEmpty() )
{
- if( mpSlideController.get() )
+ if( mpSlideController )
{
if( mpSlideController->jumpToSlideNumber( maCharBuffer.toInt32() - 1 ) )
displayCurrentSlide();
@@ -1900,7 +1900,7 @@ IMPL_LINK( SlideshowImpl, EventListenerHdl, VclSimpleEvent&, rSimpleEvent, void
case MediaCommand::Stop:
// in case the user cancels the presentation, switch to current slide
// in edit mode
- if( mpSlideController.get() && (ANIMATIONMODE_SHOW == meAnimationMode) )
+ if( mpSlideController && (ANIMATIONMODE_SHOW == meAnimationMode) )
{
if( mpSlideController->getCurrentSlideNumber() != -1 )
mnRestoreSlide = mpSlideController->getCurrentSlideNumber();
@@ -2157,7 +2157,7 @@ IMPL_LINK( SlideshowImpl, ContextMenuSelectHdl, Menu *, pMenu, bool )
// When in autoplay mode (pps/ppsx), offer editing of the presentation
// Turn autostart off, else Impress will close when exiting the Presentation
mpViewShell->GetDoc()->SetExitAfterPresenting(false);
- if( mpSlideController.get() && (ANIMATIONMODE_SHOW == meAnimationMode) )
+ if( mpSlideController && (ANIMATIONMODE_SHOW == meAnimationMode) )
{
if( mpSlideController->getCurrentSlideNumber() != -1 )
{
@@ -2170,7 +2170,7 @@ IMPL_LINK( SlideshowImpl, ContextMenuSelectHdl, Menu *, pMenu, bool )
{
// in case the user cancels the presentation, switch to current slide
// in edit mode
- if( mpSlideController.get() && (ANIMATIONMODE_SHOW == meAnimationMode) )
+ if( mpSlideController && (ANIMATIONMODE_SHOW == meAnimationMode) )
{
if( mpSlideController->getCurrentSlideNumber() != -1 )
{
@@ -2529,7 +2529,7 @@ Reference< XDrawPage > SAL_CALL SlideshowImpl::getCurrentSlide()
SolarMutexGuard aSolarGuard;
Reference< XDrawPage > xSlide;
- if( mxShow.is() && mpSlideController.get() )
+ if( mxShow.is() && mpSlideController )
{
sal_Int32 nSlide = getCurrentSlideNumber();
if( (nSlide >= 0) && (nSlide < mpSlideController->getSlideNumberCount() ) )
@@ -2555,14 +2555,14 @@ sal_Int32 SAL_CALL SlideshowImpl::getNextSlideIndex()
sal_Int32 SAL_CALL SlideshowImpl::getCurrentSlideIndex()
{
- return mpSlideController.get() ? mpSlideController->getCurrentSlideIndex() : -1;
+ return mpSlideController ? mpSlideController->getCurrentSlideIndex() : -1;
}
// css::presentation::XSlideShowController:
::sal_Int32 SAL_CALL SlideshowImpl::getSlideCount()
{
- return mpSlideController.get() ? mpSlideController->getSlideIndexCount() : 0;
+ return mpSlideController ? mpSlideController->getSlideIndexCount() : 0;
}
Reference< XDrawPage > SAL_CALL SlideshowImpl::getSlideByIndex(::sal_Int32 Index)
@@ -2717,7 +2717,7 @@ void SAL_CALL SlideshowImpl::gotoNextEffect( )
{
SolarMutexGuard aSolarGuard;
- if( !(mxShow.is() && mpSlideController.get() && mpShowWindow) )
+ if( !(mxShow.is() && mpSlideController && mpShowWindow) )
return;
if( mbIsPaused )
@@ -2743,7 +2743,7 @@ void SAL_CALL SlideshowImpl::gotoPreviousEffect( )
{
SolarMutexGuard aSolarGuard;
- if( !(mxShow.is() && mpSlideController.get() && mpShowWindow) )
+ if( !(mxShow.is() && mpSlideController && mpShowWindow) )
return;
if( mbIsPaused )
@@ -2765,7 +2765,7 @@ void SAL_CALL SlideshowImpl::gotoFirstSlide( )
{
SolarMutexGuard aSolarGuard;
- if( !(mpShowWindow && mpSlideController.get()) )
+ if( !(mpShowWindow && mpSlideController) )
return;
if( mbIsPaused )
@@ -2805,7 +2805,7 @@ void SAL_CALL SlideshowImpl::gotoNextSlide( )
maInputFreezeTimer.Start();
}
- if( mpSlideController.get() )
+ if( mpSlideController )
{
if( mpSlideController->nextSlide() )
{
@@ -2862,7 +2862,7 @@ void SlideshowImpl::gotoPreviousSlide (const bool bSkipAllMainSequenceEffects)
{
SolarMutexGuard aSolarGuard;
- if( !(mxShow.is() && mpSlideController.get()) )
+ if( !(mxShow.is() && mpSlideController) )
return;
try
@@ -2909,7 +2909,7 @@ void SAL_CALL SlideshowImpl::gotoLastSlide()
{
SolarMutexGuard aSolarGuard;
- if( !mpSlideController.get() )
+ if( !mpSlideController )
return;
if( mbIsPaused )
@@ -2945,7 +2945,7 @@ void SAL_CALL SlideshowImpl::gotoSlide( const Reference< XDrawPage >& xSlide )
{
SolarMutexGuard aSolarGuard;
- if( !(mpSlideController.get() && xSlide.is()) )
+ if( !(mpSlideController && xSlide.is()) )
return;
if( mbIsPaused )
diff --git a/sd/source/ui/slideshow/slideshowviewimpl.cxx b/sd/source/ui/slideshow/slideshowviewimpl.cxx
index 56d14adf2370..46d92f8967ba 100644
--- a/sd/source/ui/slideshow/slideshowviewimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowviewimpl.cxx
@@ -291,7 +291,7 @@ Reference< rendering::XSpriteCanvas > SAL_CALL SlideShowView::getCanvas( )
{
::osl::MutexGuard aGuard( m_aMutex );
- return mpCanvas.get() ? mpCanvas->getUNOSpriteCanvas() : Reference< rendering::XSpriteCanvas >();
+ return mpCanvas ? mpCanvas->getUNOSpriteCanvas() : Reference< rendering::XSpriteCanvas >();
}
void SAL_CALL SlideShowView::clear()
@@ -311,7 +311,7 @@ void SAL_CALL SlideShowView::clear()
::cppcanvas::PolyPolygonSharedPtr pPolyPoly(
::cppcanvas::BaseGfxFactory::createPolyPolygon( mpCanvas, aPoly ) );
- if( pPolyPoly.get() )
+ if( pPolyPoly )
{
pPolyPoly->setRGBAFillColor( 0x000000FFU );
pPolyPoly->draw();
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-30 15:43:33 +0000