loplugin:simplifypointertobool improve

to look for the
    x.get() != null
pattern, which can be simplified to
    x

I'll do the
   x.get() == nullptr
pattern in a separate patch, to reduce the chances of a mistake

Change-Id: I45e0d178e75359857cdf50d712039cb526016555
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95354
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

20 files changed, 117 insertions, 118 deletions

diff --git a/sdext/source/presenter/PresenterAccessibility.cxx b/sdext/source/presenter/PresenterAccessibility.cxx
index 2c494c058a2b..e82a0755b17c 100644
--- a/sdext/source/presenter/PresenterAccessibility.cxx
+++ b/sdext/source/presenter/PresenterAccessibility.cxx
@@ -1635,7 +1635,7 @@ bool PresenterAccessible::AccessibleParagraph::GetWindowState (const sal_Int16 n
     switch (nType)
     {
         case AccessibleStateType::EDITABLE:
-            return mpParagraph.get()!=nullptr;
+            return bool(mpParagraph);
 
         case AccessibleStateType::ACTIVE:
             return true;
diff --git a/sdext/source/presenter/PresenterButton.cxx b/sdext/source/presenter/PresenterButton.cxx
index f663e97e943c..77964c5e8965 100644
--- a/sdext/source/presenter/PresenterButton.cxx
+++ b/sdext/source/presenter/PresenterButton.cxx
@@ -266,7 +266,7 @@ void SAL_CALL PresenterButton::mouseReleased (const css::awt::MouseEvent&)
 
     if (meState == PresenterBitmapDescriptor::ButtonDown)
     {
-        OSL_ASSERT(mpPresenterController.get()!=nullptr);
+        OSL_ASSERT(mpPresenterController);
         mpPresenterController->DispatchUnoCommand(msAction);
 
         meState = PresenterBitmapDescriptor::Normal;
@@ -299,7 +299,7 @@ void SAL_CALL PresenterButton::disposing (const css::lang::EventObject& rEvent)
 
 css::geometry::IntegerSize2D PresenterButton::CalculateButtonSize()
 {
-    if (mpFont.get()!=nullptr && !mpFont->mxFont.is() && mxCanvas.is())
+    if (mpFont && !mpFont->mxFont.is() && mxCanvas.is())
         mpFont->PrepareFont(mxCanvas);
     if (mpFont.get()==nullptr || !mpFont->mxFont.is())
         return geometry::IntegerSize2D(-1,-1);
@@ -364,11 +364,11 @@ Reference<rendering::XBitmap> PresenterButton::GetBitmap (
     const SharedBitmapDescriptor& mpIcon,
     const PresenterBitmapDescriptor::Mode eMode)
 {
-    if (mpIcon.get() != nullptr)
+    if (mpIcon)
         return mpIcon->GetBitmap(eMode);
     else
     {
-        OSL_ASSERT(mpIcon.get()!=nullptr);
+        OSL_ASSERT(mpIcon);
         return nullptr;
     }
 }
@@ -404,7 +404,7 @@ void PresenterButton::SetupButtonBitmaps()
 
     mxMouseOverBitmap = mxCanvas->getDevice()->createCompatibleAlphaBitmap(maButtonSize);
     xCanvas.set(mxMouseOverBitmap, UNO_QUERY);
-    if (mpMouseOverFont.get()!=nullptr && !mpMouseOverFont->mxFont.is() && mxCanvas.is())
+    if (mpMouseOverFont && !mpMouseOverFont->mxFont.is() && mxCanvas.is())
         mpMouseOverFont->PrepareFont(mxCanvas);
     if (xCanvas.is())
         RenderButton(
diff --git a/sdext/source/presenter/PresenterController.cxx b/sdext/source/presenter/PresenterController.cxx
index 8d378d15f2f7..12787a546d18 100644
--- a/sdext/source/presenter/PresenterController.cxx
+++ b/sdext/source/presenter/PresenterController.cxx
@@ -503,7 +503,7 @@ void PresenterController::HideView (const OUString& rsViewURL)
 {
     PresenterPaneContainer::SharedPaneDescriptor pDescriptor (
         mpPaneContainer->FindViewURL(rsViewURL));
-    if (pDescriptor.get() != nullptr)
+    if (pDescriptor)
     {
         mxConfigurationController->requestResourceDeactivation(
             ResourceId::createWithAnchor(
@@ -765,7 +765,7 @@ void SAL_CALL PresenterController::notifyConfigurationChange (
                     mpWindowManager->Update();
                     // Request the repainting of the area previously
                     // occupied by the view.
-                    if (pDescriptor.get() != nullptr)
+                    if (pDescriptor)
                         GetPaintManager()->Invalidate(pDescriptor->mxBorderWindow);
                 }
             }
@@ -953,7 +953,7 @@ void SAL_CALL PresenterController::keyReleased (const awt::KeyEvent& rEvent)
 
         case awt::Key::F1:
             // Toggle the help view.
-            if (mpWindowManager.get() != nullptr)
+            if (mpWindowManager)
             {
                 if (mpWindowManager->GetViewMode() != PresenterWindowManager::VM_Help)
                     mpWindowManager->SetViewMode(PresenterWindowManager::VM_Help);
@@ -1053,7 +1053,7 @@ void PresenterController::InitializeMainPane (const Reference<XPane>& rxPane)
     mpWindowManager->SetParentPane(rxPane);
     mpWindowManager->SetTheme(mpTheme);
 
-    if (mpPaneBorderPainter.get() != nullptr)
+    if (mpPaneBorderPainter)
         mpPaneBorderPainter->SetTheme(mpTheme);
 
     // Add key listener
diff --git a/sdext/source/presenter/PresenterHelpView.cxx b/sdext/source/presenter/PresenterHelpView.cxx
index 9f0a55de4068..ecff22e648d6 100644
--- a/sdext/source/presenter/PresenterHelpView.cxx
+++ b/sdext/source/presenter/PresenterHelpView.cxx
@@ -155,7 +155,7 @@ PresenterHelpView::PresenterHelpView (
         if (mpPresenterController.is())
         {
             mpFont = mpPresenterController->GetViewFont(mxViewId->getResourceURL());
-            if (mpFont.get() != nullptr)
+            if (mpFont)
             {
                 mpFont->PrepareFont(mxCanvas);
             }
@@ -464,7 +464,7 @@ void PresenterHelpView::ProvideCanvas()
 
 void PresenterHelpView::Resize()
 {
-    if (!(mpCloseButton.get() != nullptr && mxWindow.is()))
+    if (!(mpCloseButton && mxWindow.is()))
         return;
 
     const awt::Rectangle aWindowBox (mxWindow->getPosSize());
diff --git a/sdext/source/presenter/PresenterNotesView.cxx b/sdext/source/presenter/PresenterNotesView.cxx
index c271875fe14a..a9fa7446b693 100644
--- a/sdext/source/presenter/PresenterNotesView.cxx
+++ b/sdext/source/presenter/PresenterNotesView.cxx
@@ -258,7 +258,7 @@ void PresenterNotesView::SetSlide (const Reference<drawing::XDrawPage>& rxNotesP
 
     Layout();
 
-    if (mpScrollBar.get() != nullptr)
+    if (mpScrollBar)
     {
         mpScrollBar->SetThumbPosition(0, false);
         UpdateScrollBar();
@@ -405,13 +405,13 @@ void PresenterNotesView::Layout()
             mnSeparatorYLocation = aWindowBox.Height - nToolBarHeight - gnSpaceBelowSeparator;
             aNewTextBoundingBox.Y2 = mnSeparatorYLocation - gnSpaceAboveSeparator;
             // Place the close button.
-            if (mpCloseButton.get() != nullptr)
+            if (mpCloseButton)
                 mpCloseButton->SetCenter(geometry::RealPoint2D(
                                                                (aWindowBox.Width +  aToolBarSize.Width) / 2,
                                                                aWindowBox.Height - aToolBarSize.Height/2));
         }
     // Check whether the vertical scroll bar is necessary.
-    if (mpScrollBar.get() != nullptr)
+    if (mpScrollBar)
         {
             bool bShowVerticalScrollbar (false);
             try
@@ -514,7 +514,7 @@ void PresenterNotesView::PaintToolBar (const awt::Rectangle& rUpdateBox)
         Sequence<double>(4),
         rendering::CompositeOperation::SOURCE);
 
-    if (mpBackground.get() != nullptr)
+    if (mpBackground)
     {
         // Paint the background.
         mpPresenterController->GetCanvasHelper()->Paint(
@@ -544,7 +544,7 @@ void PresenterNotesView::PaintText (const awt::Rectangle& rUpdateBox)
     if (aBox.Width <= 0 || aBox.Height <= 0)
         return;
 
-    if (mpBackground.get() != nullptr)
+    if (mpBackground)
     {
         // Paint the background.
         mpPresenterController->GetCanvasHelper()->Paint(
diff --git a/sdext/source/presenter/PresenterPaneBase.cxx b/sdext/source/presenter/PresenterPaneBase.cxx
index 29e7e4b046d8..6ec411b99c1b 100644
--- a/sdext/source/presenter/PresenterPaneBase.cxx
+++ b/sdext/source/presenter/PresenterPaneBase.cxx
@@ -47,7 +47,7 @@ PresenterPaneBase::PresenterPaneBase (
       msTitle(),
       mxComponentContext(rxContext)
 {
-    if (mpPresenterController.get() != nullptr)
+    if (mpPresenterController)
         mxPresenterHelper = mpPresenterController->GetPresenterHelper();
 }
 
@@ -98,7 +98,7 @@ void PresenterPaneBase::SetTitle (const OUString& rsTitle)
 {
     msTitle = rsTitle;
 
-    OSL_ASSERT(mpPresenterController.get()!=nullptr);
+    OSL_ASSERT(mpPresenterController);
     OSL_ASSERT(mpPresenterController->GetPaintManager() != nullptr);
 
     mpPresenterController->GetPaintManager()->Invalidate(mxBorderWindow);
diff --git a/sdext/source/presenter/PresenterPaneBorderPainter.cxx b/sdext/source/presenter/PresenterPaneBorderPainter.cxx
index ba57bb09b40b..53d60faa2315 100644
--- a/sdext/source/presenter/PresenterPaneBorderPainter.cxx
+++ b/sdext/source/presenter/PresenterPaneBorderPainter.cxx
@@ -260,7 +260,7 @@ awt::Point SAL_CALL PresenterPaneBorderPainter::getCalloutOffset (
     {
         const std::shared_ptr<RendererPaneStyle> pRendererPaneStyle(
             mpRenderer->GetRendererPaneStyle(rsPaneBorderStyleName));
-        if (pRendererPaneStyle != nullptr && pRendererPaneStyle->mpBottomCallout.get() != nullptr)
+        if (pRendererPaneStyle != nullptr && pRendererPaneStyle->mpBottomCallout)
         {
             return awt::Point (
                 0,
@@ -771,7 +771,7 @@ RendererPaneStyle::RendererPaneStyle (
     mpFont = rpTheme->GetFont(rsStyleName);
 
     OUString sAnchor ("Left");
-    if (mpFont.get() != nullptr)
+    if (mpFont)
     {
         sAnchor = mpFont->msAnchor;
         mnFontXOffset = mpFont->mnXOffset;
@@ -887,7 +887,7 @@ SharedBitmapDescriptor RendererPaneStyle::GetBitmap(
     const OUString& rsBitmapName)
 {
     SharedBitmapDescriptor pDescriptor (rpTheme->GetBitmap(rsStyleName, rsBitmapName));
-    if (pDescriptor.get() != nullptr)
+    if (pDescriptor)
         return pDescriptor;
     else
         return mpEmpty;
diff --git a/sdext/source/presenter/PresenterPaneContainer.cxx b/sdext/source/presenter/PresenterPaneContainer.cxx
index 7c9c1a5fc2e9..a102304258fb 100644
--- a/sdext/source/presenter/PresenterPaneContainer.cxx
+++ b/sdext/source/presenter/PresenterPaneContainer.cxx
@@ -59,7 +59,7 @@ void PresenterPaneContainer::PreparePane (
         return;
 
     SharedPaneDescriptor pPane (FindPaneURL(rxPaneId->getResourceURL()));
-    if (pPane.get() != nullptr)
+    if (pPane)
         return;
 
     // No entry found for the given pane id.  Create a new one.
@@ -110,7 +110,7 @@ PresenterPaneContainer::SharedPaneDescriptor
             PreparePane(xPaneId, OUString(), OUString(), OUString(),
                 false, ViewInitializationFunction());
         pDescriptor = FindPaneURL(sPaneURL);
-        if (pDescriptor.get() != nullptr)
+        if (pDescriptor)
         {
             Reference<awt::XWindow> xWindow (rxPane->getWindow());
             pDescriptor->mxContentWindow = xWindow;
@@ -138,7 +138,7 @@ PresenterPaneContainer::SharedPaneDescriptor
         sPaneURL = rxPaneId->getResourceURL();
 
     SharedPaneDescriptor pDescriptor (FindPaneURL(sPaneURL));
-    if (pDescriptor.get() != nullptr)
+    if (pDescriptor)
     {
         pDescriptor->mxBorderWindow = rxBorderWindow;
         return pDescriptor;
@@ -165,7 +165,7 @@ PresenterPaneContainer::SharedPaneDescriptor
         }
 
         pDescriptor = FindPaneURL(sPaneURL);
-        if (pDescriptor.get() != nullptr)
+        if (pDescriptor)
         {
             pDescriptor->mxView = rxView;
             try
@@ -187,7 +187,7 @@ PresenterPaneContainer::SharedPaneDescriptor
     PresenterPaneContainer::RemovePane (const Reference<XResourceId>& rxPaneId)
 {
     SharedPaneDescriptor pDescriptor (FindPaneId(rxPaneId));
-    if (pDescriptor.get() != nullptr)
+    if (pDescriptor)
     {
         if (pDescriptor->mxContentWindow.is())
             pDescriptor->mxContentWindow->removeEventListener(this);
@@ -217,7 +217,7 @@ PresenterPaneContainer::SharedPaneDescriptor
         }
 
         pDescriptor = FindPaneURL(sPaneURL);
-        if (pDescriptor.get() != nullptr)
+        if (pDescriptor)
         {
             pDescriptor->mxView = nullptr;
         }
@@ -282,7 +282,7 @@ PresenterPaneContainer::SharedPaneDescriptor PresenterPaneContainer::FindViewURL
 OUString PresenterPaneContainer::GetPaneURLForViewURL (const OUString& rsViewURL)
 {
     SharedPaneDescriptor pDescriptor (FindViewURL(rsViewURL));
-    if (pDescriptor.get() != nullptr)
+    if (pDescriptor)
         if (pDescriptor->mxPaneId.is())
             return pDescriptor->mxPaneId->getResourceURL();
     return OUString();
@@ -315,7 +315,7 @@ void SAL_CALL PresenterPaneContainer::disposing (
 {
     SharedPaneDescriptor pDescriptor (
         FindContentWindow(Reference<awt::XWindow>(rEvent.Source, UNO_QUERY)));
-    if (pDescriptor.get() != nullptr)
+    if (pDescriptor)
     {
         RemovePane(pDescriptor->mxPaneId);
     }
diff --git a/sdext/source/presenter/PresenterPaneFactory.cxx b/sdext/source/presenter/PresenterPaneFactory.cxx
index a22bfa246c1b..e2e2a8c0de0a 100644
--- a/sdext/source/presenter/PresenterPaneFactory.cxx
+++ b/sdext/source/presenter/PresenterPaneFactory.cxx
@@ -151,7 +151,7 @@ Reference<XResource> SAL_CALL PresenterPaneFactory::createResource (
                 mpPresenterController->GetPaneContainer());
             PresenterPaneContainer::SharedPaneDescriptor pDescriptor (
                 pPaneContainer->FindPaneURL(sPaneURL));
-            if (pDescriptor.get() != nullptr)
+            if (pDescriptor)
             {
                 pDescriptor->SetActivationState(true);
                 if (pDescriptor->mxBorderWindow.is())
@@ -277,7 +277,7 @@ Reference<XResource> PresenterPaneFactory::CreatePane (
     PresenterPaneContainer::SharedPaneDescriptor pDescriptor(
         pContainer->StoreBorderWindow(rxPaneId, xPane->GetBorderWindow()));
     pContainer->StorePane(xPane);
-    if (pDescriptor.get() != nullptr)
+    if (pDescriptor)
     {
         pDescriptor->mbIsSprite = bIsSpritePane;
 
diff --git a/sdext/source/presenter/PresenterProtocolHandler.cxx b/sdext/source/presenter/PresenterProtocolHandler.cxx
index 66bf66c6fcf4..9ea7790ce6eb 100644
--- a/sdext/source/presenter/PresenterProtocolHandler.cxx
+++ b/sdext/source/presenter/PresenterProtocolHandler.cxx
@@ -398,7 +398,7 @@ void PresenterProtocolHandler::Dispatch::disposing()
 {
     if (mbIsListeningToWindowManager)
     {
-        if (mpPresenterController.get() != nullptr)
+        if (mpPresenterController)
             mpPresenterController->GetWindowManager()->RemoveLayoutListener(this);
         mbIsListeningToWindowManager = false;
     }
diff --git a/sdext/source/presenter/PresenterScreen.cxx b/sdext/source/presenter/PresenterScreen.cxx
index bbb754050e8f..d04e4aff6855 100644
--- a/sdext/source/presenter/PresenterScreen.cxx
+++ b/sdext/source/presenter/PresenterScreen.cxx
@@ -560,7 +560,7 @@ void PresenterScreen::ShutdownPresenterScreen()
         xPaneFactoryComponent->dispose();
     mxPaneFactory = nullptr;
 
-    if (mpPresenterController.get() != nullptr)
+    if (mpPresenterController)
     {
         mpPresenterController->dispose();
         mpPresenterController.clear();
@@ -784,7 +784,7 @@ void PresenterScreen::SetupView(
         aViewDescriptor = iDescriptor->second;
 
     // Prepare the pane.
-    OSL_ASSERT(mpPaneContainer.get() != nullptr);
+    OSL_ASSERT(mpPaneContainer);
     mpPaneContainer->PreparePane(
         xPaneId,
         rsViewURL,
diff --git a/sdext/source/presenter/PresenterScrollBar.cxx b/sdext/source/presenter/PresenterScrollBar.cxx
index 46f1490e38f3..be498680fafa 100644
--- a/sdext/source/presenter/PresenterScrollBar.cxx
+++ b/sdext/source/presenter/PresenterScrollBar.cxx
@@ -520,7 +520,7 @@ void PresenterScrollBar::UpdateWidthOrHeight (
     sal_Int32& rSize,
     const SharedBitmapDescriptor& rpDescriptor)
 {
-    if (rpDescriptor.get() != nullptr)
+    if (rpDescriptor)
     {
         Reference<rendering::XBitmap> xBitmap (rpDescriptor->GetNormalBitmap());
         if (xBitmap.is())
@@ -620,7 +620,7 @@ void PresenterVerticalScrollBar::UpdateBorders()
     const awt::Rectangle aWindowBox (mxWindow->getPosSize());
     double nBottom = aWindowBox.Height;
 
-    if (mpNextButtonDescriptor.get() != nullptr)
+    if (mpNextButtonDescriptor)
     {
         Reference<rendering::XBitmap> xBitmap (mpNextButtonDescriptor->GetNormalBitmap());
         if (xBitmap.is())
@@ -631,7 +631,7 @@ void PresenterVerticalScrollBar::UpdateBorders()
             nBottom -= aSize.Height + gnScrollBarGap;
         }
     }
-    if (mpPrevButtonDescriptor.get() != nullptr)
+    if (mpPrevButtonDescriptor)
     {
         Reference<rendering::XBitmap> xBitmap (mpPrevButtonDescriptor->GetNormalBitmap());
         if (xBitmap.is())
diff --git a/sdext/source/presenter/PresenterSlidePreview.cxx b/sdext/source/presenter/PresenterSlidePreview.cxx
index 9e22850de7cc..f95d9a050947 100644
--- a/sdext/source/presenter/PresenterSlidePreview.cxx
+++ b/sdext/source/presenter/PresenterSlidePreview.cxx
@@ -80,7 +80,7 @@ PresenterSlidePreview::PresenterSlidePreview (
         mxWindow->setVisible(true);
     }
 
-    if (mpPresenterController.get() != nullptr)
+    if (mpPresenterController)
         mnSlideAspectRatio = mpPresenterController->GetSlideAspectRatio();
 
     Reference<lang::XMultiComponentFactory> xFactory = rxContext->getServiceManager();
diff --git a/sdext/source/presenter/PresenterSlideShowView.cxx b/sdext/source/presenter/PresenterSlideShowView.cxx
index 609b2d8566eb..9cf7b5c5c85d 100644
--- a/sdext/source/presenter/PresenterSlideShowView.cxx
+++ b/sdext/source/presenter/PresenterSlideShowView.cxx
@@ -79,7 +79,7 @@ PresenterSlideShowView::PresenterSlideShowView (
       mbIsEndSlideVisible(false),
       mxCurrentSlide()
 {
-    if (mpPresenterController.get() != nullptr)
+    if (mpPresenterController)
     {
         mnPageAspectRatio = mpPresenterController->GetSlideAspectRatio();
         mpBackground = mpPresenterController->GetViewBackground(mxViewId->getResourceURL());
@@ -250,7 +250,7 @@ void SAL_CALL PresenterSlideShowView::setCurrentPage (
     const css::uno::Reference<css::drawing::XDrawPage>& rxSlide)
 {
     mxCurrentSlide = rxSlide;
-    if (mpPresenterController.get() != nullptr
+    if (mpPresenterController
         && mxSlideShowController.is()
         && ! mpPresenterController->GetCurrentSlide().is()
         && ! mxSlideShowController->isPaused())
@@ -265,7 +265,7 @@ void SAL_CALL PresenterSlideShowView::setCurrentPage (
         // backwards.
         PresenterPaneContainer::SharedPaneDescriptor pDescriptor (
             mpPresenterController->GetPaneContainer()->FindViewURL(mxViewId->getResourceURL()));
-        if (pDescriptor.get() != nullptr)
+        if (pDescriptor)
         {
             msTitleTemplate = pDescriptor->msTitleTemplate;
             pDescriptor->msTitleTemplate = msClickToExitPresentationTitle;
@@ -279,7 +279,7 @@ void SAL_CALL PresenterSlideShowView::setCurrentPage (
         // Restore the title template.
         PresenterPaneContainer::SharedPaneDescriptor pDescriptor (
             mpPresenterController->GetPaneContainer()->FindViewURL(mxViewId->getResourceURL()));
-        if (pDescriptor.get() != nullptr)
+        if (pDescriptor)
         {
             pDescriptor->msTitleTemplate = msTitleTemplate;
             pDescriptor->msTitle.clear();
@@ -523,7 +523,7 @@ void SAL_CALL PresenterSlideShowView::mousePressed (const awt::MouseEvent& rEven
     // the PresenterController so that it switches to the next slide and
     // ends the presentation.
     if (mbIsEndSlideVisible)
-        if (mpPresenterController.get() != nullptr)
+        if (mpPresenterController)
             mpPresenterController->HandleMouseClick(rEvent);
 }
 
diff --git a/sdext/source/presenter/PresenterSlideSorter.cxx b/sdext/source/presenter/PresenterSlideSorter.cxx
index 029b0e05f3b0..1bbb30147d4f 100644
--- a/sdext/source/presenter/PresenterSlideSorter.cxx
+++ b/sdext/source/presenter/PresenterSlideSorter.cxx
@@ -304,7 +304,7 @@ PresenterSlideSorter::PresenterSlideSorter (
         {
             PresenterTheme::SharedFontDescriptor pFont (
                 mpPresenterController->GetTheme()->GetFont("ButtonFont"));
-            if (pFont.get() != nullptr)
+            if (pFont)
                 maSeparatorColor = pFont->mnColor;
         }
 
@@ -508,8 +508,8 @@ void SAL_CALL PresenterSlideSorter::mouseReleased (const css::awt::MouseEvent& r
             break;
 
         case 2:
-            OSL_ASSERT(mpPresenterController.get()!=nullptr);
-            OSL_ASSERT(mpPresenterController->GetWindowManager().get()!=nullptr);
+            OSL_ASSERT(mpPresenterController);
+            OSL_ASSERT(mpPresenterController->GetWindowManager());
             mpPresenterController->GetWindowManager()->SetSlideSorterState(false);
             GotoSlide(nSlideIndex);
             break;
@@ -693,7 +693,7 @@ geometry::RealRectangle2D PresenterSlideSorter::PlaceScrollBars (
     bool bIsScrollBarNeeded (false);
     Reference<container::XIndexAccess> xSlides (mxSlideShowController, UNO_QUERY_THROW);
     bIsScrollBarNeeded = mpLayout->IsScrollBarNeeded(xSlides->getCount());
-    if (mpVerticalScrollBar.get() != nullptr)
+    if (mpVerticalScrollBar)
         {
             if (bIsScrollBarNeeded)
                 {
@@ -746,7 +746,7 @@ void PresenterSlideSorter::PlaceCloseButton (
     // centered over the callout.  Otherwise it is centered with respect to
     // the whole window.
     sal_Int32 nCloseButtonCenter (rCenterBox.Width/2);
-    if (rpPane.get() != nullptr && rpPane->mxPane.is())
+    if (rpPane && rpPane->mxPane.is())
     {
         const sal_Int32 nCalloutCenter (-nLeftBorderWidth);
         const sal_Int32 nDistanceFromWindowCenter (abs(nCalloutCenter - rCenterBox.Width/2));
@@ -1383,7 +1383,7 @@ void PresenterSlideSorter::Layout::UpdateScrollBars()
 {
     sal_Int32 nTotalRowCount = sal_Int32(ceil(double(mnSlideCount) / double(mnColumnCount)));
 
-    if (mpVerticalScrollBar.get() != nullptr)
+    if (mpVerticalScrollBar)
     {
         mpVerticalScrollBar->SetTotalSize(
             nTotalRowCount * maPreviewSize.Height
@@ -1485,7 +1485,7 @@ void PresenterSlideSorter::MouseOverManager::SetCanvas (
     const Reference<rendering::XCanvas>& rxCanvas)
 {
     mxCanvas = rxCanvas;
-    if (mpFont.get() != nullptr)
+    if (mpFont)
         mpFont->PrepareFont(mxCanvas);
 }
 
@@ -1504,7 +1504,7 @@ void PresenterSlideSorter::MouseOverManager::SetSlide (
 
     if (nSlideIndex >= 0)
     {
-        if (mxSlides.get() != nullptr)
+        if (mxSlides)
         {
             msText.clear();
 
@@ -1654,7 +1654,7 @@ geometry::IntegerSize2D PresenterSlideSorter::MouseOverManager::CalculateLabelSi
 {
     // Height is specified by the label bitmaps.
     sal_Int32 nHeight (32);
-    if (mpCenterLabelBitmap.get() != nullptr)
+    if (mpCenterLabelBitmap)
     {
         Reference<rendering::XBitmap> xBitmap (mpCenterLabelBitmap->GetNormalBitmap());
         if (xBitmap.is())
@@ -1676,15 +1676,15 @@ void PresenterSlideSorter::MouseOverManager::PaintButtonBackground (
 {
     // Get the bitmaps for painting the label background.
     Reference<rendering::XBitmap> xLeftLabelBitmap;
-    if (mpLeftLabelBitmap.get() != nullptr)
+    if (mpLeftLabelBitmap)
         xLeftLabelBitmap = mpLeftLabelBitmap->GetNormalBitmap();
 
     Reference<rendering::XBitmap> xCenterLabelBitmap;
-    if (mpCenterLabelBitmap.get() != nullptr)
+    if (mpCenterLabelBitmap)
         xCenterLabelBitmap = mpCenterLabelBitmap->GetNormalBitmap();
 
     Reference<rendering::XBitmap> xRightLabelBitmap;
-    if (mpRightLabelBitmap.get() != nullptr)
+    if (mpRightLabelBitmap)
         xRightLabelBitmap = mpRightLabelBitmap->GetNormalBitmap();
 
     PresenterUIPainter::PaintHorizontalBitmapComposite (
@@ -1747,31 +1747,31 @@ PresenterSlideSorter::CurrentSlideFrameRenderer::CurrentSlideFrameRenderer (
     mpBottomRight = aContainer.GetBitmap("BottomRight");
 
     // Determine size of frame.
-    if (mpTop.get() != nullptr)
+    if (mpTop)
         mnTopFrameSize = mpTop->mnHeight;
-    if (mpLeft.get() != nullptr)
+    if (mpLeft)
         mnLeftFrameSize = mpLeft->mnWidth;
-    if (mpRight.get() != nullptr)
+    if (mpRight)
         mnRightFrameSize = mpRight->mnWidth;
-    if (mpBottom.get() != nullptr)
+    if (mpBottom)
         mnBottomFrameSize = mpBottom->mnHeight;
 
-    if (mpTopLeft.get() != nullptr)
+    if (mpTopLeft)
     {
         mnTopFrameSize = ::std::max(mnTopFrameSize, mpTopLeft->mnHeight);
         mnLeftFrameSize = ::std::max(mnLeftFrameSize, mpTopLeft->mnWidth);
     }
-    if (mpTopRight.get() != nullptr)
+    if (mpTopRight)
     {
         mnTopFrameSize = ::std::max(mnTopFrameSize, mpTopRight->mnHeight);
         mnRightFrameSize = ::std::max(mnRightFrameSize, mpTopRight->mnWidth);
     }
-    if (mpBottomLeft.get() != nullptr)
+    if (mpBottomLeft)
     {
         mnLeftFrameSize = ::std::max(mnLeftFrameSize, mpBottomLeft->mnWidth);
         mnBottomFrameSize = ::std::max(mnBottomFrameSize, mpBottomLeft->mnHeight);
     }
-    if (mpBottomRight.get() != nullptr)
+    if (mpBottomRight)
     {
         mnRightFrameSize = ::std::max(mnRightFrameSize, mpBottomRight->mnWidth);
         mnBottomFrameSize = ::std::max(mnBottomFrameSize, mpBottomRight->mnHeight);
@@ -1789,7 +1789,7 @@ void PresenterSlideSorter::CurrentSlideFrameRenderer::PaintCurrentSlideFrame (
     const Reference<rendering::XPolyPolygon2D> xClip (
         PresenterGeometryHelper::CreatePolygon(rClipBox, rxCanvas->getDevice()));
 
-    if (mpTop.get() != nullptr)
+    if (mpTop)
     {
         PaintBitmapTiled(
             mpTop->GetNormalBitmap(),
@@ -1800,7 +1800,7 @@ void PresenterSlideSorter::CurrentSlideFrameRenderer::PaintCurrentSlideFrame (
             rSlideBoundingBox.Width,
             mpTop->mnHeight);
     }
-    if (mpLeft.get() != nullptr)
+    if (mpLeft)
     {
         PaintBitmapTiled(
             mpLeft->GetNormalBitmap(),
@@ -1811,7 +1811,7 @@ void PresenterSlideSorter::CurrentSlideFrameRenderer::PaintCurrentSlideFrame (
             mpLeft->mnWidth,
             rSlideBoundingBox.Height);
     }
-    if (mpRight.get() != nullptr)
+    if (mpRight)
     {
         PaintBitmapTiled(
             mpRight->GetNormalBitmap(),
@@ -1822,7 +1822,7 @@ void PresenterSlideSorter::CurrentSlideFrameRenderer::PaintCurrentSlideFrame (
             mpRight->mnWidth,
             rSlideBoundingBox.Height);
     }
-    if (mpBottom.get() != nullptr)
+    if (mpBottom)
     {
         PaintBitmapTiled(
             mpBottom->GetNormalBitmap(),
@@ -1833,7 +1833,7 @@ void PresenterSlideSorter::CurrentSlideFrameRenderer::PaintCurrentSlideFrame (
             rSlideBoundingBox.Width,
             mpBottom->mnHeight);
     }
-    if (mpTopLeft.get() != nullptr)
+    if (mpTopLeft)
     {
         PaintBitmapOnce(
             mpTopLeft->GetNormalBitmap(),
@@ -1842,7 +1842,7 @@ void PresenterSlideSorter::CurrentSlideFrameRenderer::PaintCurrentSlideFrame (
             rSlideBoundingBox.X - mpTopLeft->mnWidth,
             rSlideBoundingBox.Y - mpTopLeft->mnHeight);
     }
-    if (mpTopRight.get() != nullptr)
+    if (mpTopRight)
     {
         PaintBitmapOnce(
             mpTopRight->GetNormalBitmap(),
@@ -1851,7 +1851,7 @@ void PresenterSlideSorter::CurrentSlideFrameRenderer::PaintCurrentSlideFrame (
             rSlideBoundingBox.X + rSlideBoundingBox.Width,
             rSlideBoundingBox.Y - mpTopLeft->mnHeight);
     }
-    if (mpBottomLeft.get() != nullptr)
+    if (mpBottomLeft)
     {
         PaintBitmapOnce(
             mpBottomLeft->GetNormalBitmap(),
@@ -1860,7 +1860,7 @@ void PresenterSlideSorter::CurrentSlideFrameRenderer::PaintCurrentSlideFrame (
             rSlideBoundingBox.X - mpBottomLeft->mnWidth,
             rSlideBoundingBox.Y + rSlideBoundingBox.Height);
     }
-    if (mpBottomRight.get() != nullptr)
+    if (mpBottomRight)
     {
         PaintBitmapOnce(
             mpBottomRight->GetNormalBitmap(),
diff --git a/sdext/source/presenter/PresenterTheme.cxx b/sdext/source/presenter/PresenterTheme.cxx
index 69b8fea28369..2cc7f2efa252 100644
--- a/sdext/source/presenter/PresenterTheme.cxx
+++ b/sdext/source/presenter/PresenterTheme.cxx
@@ -299,7 +299,7 @@ OUString PresenterTheme::GetStyleName (const OUString& rsResourceURL) const
     OSL_ASSERT(mpTheme != nullptr);
 
     SharedPaneStyle pPaneStyle (mpTheme->GetPaneStyle(rsStyleName));
-    if (pPaneStyle.get() != nullptr)
+    if (pPaneStyle)
         if (bOuter)
             return pPaneStyle->maOuterBorderSize.ToVector();
         else
@@ -381,18 +381,18 @@ SharedBitmapDescriptor PresenterTheme::GetBitmap (
         else
         {
             SharedPaneStyle pPaneStyle (mpTheme->GetPaneStyle(rsStyleName));
-            if (pPaneStyle.get() != nullptr)
+            if (pPaneStyle)
             {
                 SharedBitmapDescriptor pBitmap (pPaneStyle->GetBitmap(rsBitmapName));
-                if (pBitmap.get() != nullptr)
+                if (pBitmap)
                     return pBitmap;
             }
 
             SharedViewStyle pViewStyle (mpTheme->GetViewStyle(rsStyleName));
-            if (pViewStyle.get() != nullptr)
+            if (pViewStyle)
             {
                 SharedBitmapDescriptor pBitmap (pViewStyle->GetBitmap(rsBitmapName));
-                if (pBitmap.get() != nullptr)
+                if (pBitmap)
                     return pBitmap;
             }
         }
@@ -440,11 +440,11 @@ PresenterTheme::SharedFontDescriptor PresenterTheme::GetFont (
     if (mpTheme != nullptr)
     {
         SharedPaneStyle pPaneStyle (mpTheme->GetPaneStyle(rsStyleName));
-        if (pPaneStyle.get() != nullptr)
+        if (pPaneStyle)
             return pPaneStyle->GetFont();
 
         SharedViewStyle pViewStyle (mpTheme->GetViewStyle(rsStyleName));
-        if (pViewStyle.get() != nullptr)
+        if (pViewStyle)
             return pViewStyle->GetFont();
 
         std::shared_ptr<Theme> pTheme (mpTheme);
@@ -620,7 +620,7 @@ void PresenterTheme::Theme::Read (
 SharedPaneStyle PresenterTheme::Theme::GetPaneStyle (const OUString& rsStyleName) const
 {
     SharedPaneStyle pPaneStyle (maPaneStyles.GetPaneStyle(rsStyleName));
-    if (pPaneStyle.get() != nullptr)
+    if (pPaneStyle)
         return pPaneStyle;
     else if (mpParentTheme != nullptr)
         return mpParentTheme->GetPaneStyle(rsStyleName);
@@ -631,7 +631,7 @@ SharedPaneStyle PresenterTheme::Theme::GetPaneStyle (const OUString& rsStyleName
 SharedViewStyle PresenterTheme::Theme::GetViewStyle (const OUString& rsStyleName) const
 {
     SharedViewStyle pViewStyle (maViewStyles.GetViewStyle(rsStyleName));
-    if (pViewStyle.get() != nullptr)
+    if (pViewStyle)
         return pViewStyle;
     else if (mpParentTheme != nullptr)
         return mpParentTheme->GetViewStyle(rsStyleName);
@@ -898,7 +898,7 @@ SharedBitmapDescriptor PaneStyle::GetBitmap (const OUString& rsBitmapName) const
     if (mpBitmaps != nullptr)
     {
         SharedBitmapDescriptor pBitmap = mpBitmaps->GetBitmap(rsBitmapName);
-        if (pBitmap.get() != nullptr)
+        if (pBitmap)
             return pBitmap;
     }
 
@@ -910,7 +910,7 @@ SharedBitmapDescriptor PaneStyle::GetBitmap (const OUString& rsBitmapName) const
 
 PresenterTheme::SharedFontDescriptor PaneStyle::GetFont() const
 {
-    if (mpFont.get() != nullptr)
+    if (mpFont)
         return mpFont;
     else if (mpParentStyle != nullptr)
         return mpParentStyle->GetFont();
@@ -969,7 +969,7 @@ void ViewStyleContainer::ProcessViewStyle(
         PresenterConfigurationAccess::GetProperty(rxProperties, "Font"), UNO_QUERY);
     PresenterTheme::SharedFontDescriptor pFont (
         ReadContext::ReadFont(xFontNode, sPathToFont, PresenterTheme::SharedFontDescriptor()));
-    if (pFont.get() != nullptr)
+    if (pFont)
         pStyle->mpFont = pFont;
 
     Reference<container::XHierarchicalNameAccess> xBackgroundNode (
@@ -981,7 +981,7 @@ void ViewStyleContainer::ProcessViewStyle(
         rReadContext.mxPresenterHelper,
         rReadContext.mxCanvas,
         SharedBitmapDescriptor()));
-    if (pBackground.get() != nullptr && pBackground->GetNormalBitmap().is())
+    if (pBackground && pBackground->GetNormalBitmap().is())
         pStyle->mpBackground = pBackground;
 
     mStyles.push_back(pStyle);
@@ -1016,7 +1016,7 @@ SharedBitmapDescriptor ViewStyle::GetBitmap (const OUString& rsBitmapName) const
 
 PresenterTheme::SharedFontDescriptor ViewStyle::GetFont() const
 {
-    if (mpFont.get() != nullptr)
+    if (mpFont)
         return mpFont;
     else if (mpParentStyle != nullptr)
         return mpParentStyle->GetFont();
diff --git a/sdext/source/presenter/PresenterTimer.cxx b/sdext/source/presenter/PresenterTimer.cxx
index 348a8ffab7e5..0ecbad47da14 100644
--- a/sdext/source/presenter/PresenterTimer.cxx
+++ b/sdext/source/presenter/PresenterTimer.cxx
@@ -249,7 +249,7 @@ void TimerScheduler::CancelTask (const sal_Int32 nTaskId)
     // from being scheduled again and b) tries to prevent its execution.
     {
         ::osl::MutexGuard aGuard (maCurrentTaskMutex);
-        if (mpCurrentTask.get() != nullptr
+        if (mpCurrentTask
             && mpCurrentTask->mnTaskId == nTaskId)
             mpCurrentTask->mbIsCanceled = true;
     }
diff --git a/sdext/source/presenter/PresenterToolBar.cxx b/sdext/source/presenter/PresenterToolBar.cxx
index 206034c7ee7e..4edce3701bdb 100644
--- a/sdext/source/presenter/PresenterToolBar.cxx
+++ b/sdext/source/presenter/PresenterToolBar.cxx
@@ -412,7 +412,7 @@ void SAL_CALL PresenterToolBar::disposing()
         OSL_ASSERT(rxPart != nullptr);
         for (rtl::Reference<Element>& pElement : *rxPart)
         {
-            if (pElement.get() != nullptr)
+            if (pElement)
             {
                 Reference<lang::XComponent> xComponent (
                     static_cast<XWeak*>(pElement.get()), UNO_QUERY);
@@ -657,7 +657,7 @@ void PresenterToolBar::ProcessEntry (
     {
         pElement->SetModes( pNormalMode, pMouseOverMode, pSelectedMode, pDisabledMode);
         pElement->UpdateState();
-        if (mpCurrentContainerPart.get() != nullptr)
+        if (mpCurrentContainerPart)
             mpCurrentContainerPart->push_back(pElement);
     }
 }
@@ -928,7 +928,7 @@ void PresenterToolBar::Paint (
     {
         for (auto& rxElement : *rxPart)
         {
-            if (rxElement.get() != nullptr)
+            if (rxElement)
             {
                 if ( ! rxElement->IsOutside(rUpdateBox))
                     rxElement->Paint(mxCanvas, rViewState);
@@ -945,7 +945,7 @@ void PresenterToolBar::UpdateSlideNumber()
         {
             for (auto& rxElement : *rxPart)
             {
-                if (rxElement.get() != nullptr)
+                if (rxElement)
                     rxElement->CurrentSlideHasChanged();
             }
         }
@@ -1136,7 +1136,7 @@ Element::Element (
       mbIsSelected(false),
       mbIsEnabled(true)
 {
-    if (mpToolBar.get() != nullptr)
+    if (mpToolBar)
     {
         OSL_ASSERT(mpToolBar->GetPresenterController().is());
         OSL_ASSERT(mpToolBar->GetPresenterController()->GetWindowManager().is());
@@ -1210,7 +1210,7 @@ bool Element::SetState (
 
     if (bClicked && mbIsEnabled)
     {
-        if (mpMode.get() != nullptr)
+        if (mpMode)
         {
             do
             {
@@ -1266,8 +1266,8 @@ bool Element::IsFilling() const
 
 void Element::UpdateState()
 {
-    OSL_ASSERT(mpToolBar.get() != nullptr);
-    OSL_ASSERT(mpToolBar->GetPresenterController().get() != nullptr);
+    OSL_ASSERT(mpToolBar);
+    OSL_ASSERT(mpToolBar->GetPresenterController());
 
     if (mpMode.get() == nullptr)
         return;
@@ -1391,7 +1391,7 @@ Button::Button (
     : Element(rpToolBar),
       mbIsListenerRegistered(false)
 {
-    OSL_ASSERT(mpToolBar.get() != nullptr);
+    OSL_ASSERT(mpToolBar);
     OSL_ASSERT(mpToolBar->GetPresenterController().is());
     OSL_ASSERT(mpToolBar->GetPresenterController()->GetWindowManager().is());
 }
@@ -1404,9 +1404,8 @@ void Button::Initialize()
 
 void Button::disposing()
 {
-    OSL_ASSERT(mpToolBar.get() != nullptr);
-    if (mpToolBar.get() != nullptr
-        && mbIsListenerRegistered)
+    OSL_ASSERT(mpToolBar);
+    if (mpToolBar && mbIsListenerRegistered)
     {
         OSL_ASSERT(mpToolBar->GetPresenterController().is());
         OSL_ASSERT(mpToolBar->GetPresenterController()->GetWindowManager().is());
@@ -1447,7 +1446,7 @@ awt::Size Button::CreateBoundingSize (
     sal_Int32 nTextHeight (sal::static_int_cast<sal_Int32>(0.5 + aTextBBox.Y2 - aTextBBox.Y1));
     sal_Int32 nTextWidth (sal::static_int_cast<sal_Int32>(0.5 + aTextBBox.X2 - aTextBBox.X1));
     Reference<rendering::XBitmap> xBitmap;
-    if (mpMode->mpIcon.get() != nullptr)
+    if (mpMode->mpIcon)
         xBitmap = mpMode->mpIcon->GetNormalBitmap();
     if (xBitmap.is())
     {
@@ -1544,7 +1543,7 @@ awt::Size Label::CreateBoundingSize (
 
 void Label::SetText (const OUString& rsText)
 {
-    OSL_ASSERT(mpToolBar.get() != nullptr);
+    OSL_ASSERT(mpToolBar);
     if (mpMode.get() == nullptr)
         return;
 
@@ -1655,7 +1654,7 @@ void Text::Paint (
 
 geometry::RealRectangle2D Text::GetBoundingBox (const Reference<rendering::XCanvas>& rxCanvas)
 {
-    if (mpFont.get() != nullptr && !msText.isEmpty())
+    if (mpFont && !msText.isEmpty())
     {
         if ( ! mpFont->mxFont.is())
             mpFont->PrepareFont(rxCanvas);
@@ -1853,10 +1852,10 @@ void VerticalSeparator::Paint (
         nullptr,
         Sequence<double>(4),
         rendering::CompositeOperation::OVER);
-    if (mpMode.get() != nullptr)
+    if (mpMode)
     {
         PresenterTheme::SharedFontDescriptor pFont (mpMode->maText.GetFont());
-        if (pFont.get() != nullptr)
+        if (pFont)
             PresenterCanvasHelper::SetDeviceColor(aRenderState, pFont->mnColor);
     }
 
@@ -1898,10 +1897,10 @@ void HorizontalSeparator::Paint (
         nullptr,
         Sequence<double>(4),
         rendering::CompositeOperation::OVER);
-    if (mpMode.get() != nullptr)
+    if (mpMode)
     {
         PresenterTheme::SharedFontDescriptor pFont (mpMode->maText.GetFont());
-        if (pFont.get() != nullptr)
+        if (pFont)
             PresenterCanvasHelper::SetDeviceColor(aRenderState, pFont->mnColor);
     }
 
diff --git a/sdext/source/presenter/PresenterViewFactory.cxx b/sdext/source/presenter/PresenterViewFactory.cxx
index d8c2cfbe7667..c141b920d91e 100644
--- a/sdext/source/presenter/PresenterViewFactory.cxx
+++ b/sdext/source/presenter/PresenterViewFactory.cxx
@@ -208,7 +208,7 @@ Reference<XResource> SAL_CALL PresenterViewFactory::createResource (
         // Activate the view.
         PresenterPaneContainer::SharedPaneDescriptor pDescriptor (
             mpPresenterController->GetPaneContainer()->FindPaneId(rxViewId->getAnchor()));
-        if (pDescriptor.get() != nullptr)
+        if (pDescriptor)
             pDescriptor->SetActivationState(true);
     }
 
@@ -226,7 +226,7 @@ void SAL_CALL PresenterViewFactory::releaseResource (const Reference<XResource>&
     PresenterPaneContainer::SharedPaneDescriptor pDescriptor (
         mpPresenterController->GetPaneContainer()->FindPaneId(
             rxView->getResourceId()->getAnchor()));
-    if (pDescriptor.get() != nullptr)
+    if (pDescriptor)
         pDescriptor->SetActivationState(false);
 
     // Dispose only views that we can not put into the cache.
diff --git a/sdext/source/presenter/PresenterWindowManager.cxx b/sdext/source/presenter/PresenterWindowManager.cxx
index 0a4479882050..7b01ac83a53a 100644
--- a/sdext/source/presenter/PresenterWindowManager.cxx
+++ b/sdext/source/presenter/PresenterWindowManager.cxx
@@ -152,8 +152,8 @@ void PresenterWindowManager::NotifyViewCreation (const Reference<XView>& rxView)
 {
     PresenterPaneContainer::SharedPaneDescriptor pDescriptor (
         mpPaneContainer->FindPaneId(rxView->getResourceId()->getAnchor()));
-    OSL_ASSERT(pDescriptor.get() != nullptr);
-    if (pDescriptor.get() != nullptr)
+    OSL_ASSERT(pDescriptor);
+    if (pDescriptor)
     {
         Layout();
 
@@ -173,7 +173,7 @@ void PresenterWindowManager::SetPanePosSizeAbsolute (
 {
     PresenterPaneContainer::SharedPaneDescriptor pDescriptor (
         mpPaneContainer->FindPaneURL(rsPaneURL));
-    if (pDescriptor.get() != nullptr)
+    if (pDescriptor)
     {
         if (pDescriptor->mxBorderWindow.is())
             pDescriptor->mxBorderWindow->setPosSize(
@@ -357,7 +357,7 @@ void PresenterWindowManager::PaintChildren (const awt::PaintEvent& rEvent) const
 
 void PresenterWindowManager::SetLayoutMode (const LayoutMode eMode)
 {
-    OSL_ASSERT(mpPresenterController.get() != nullptr);
+    OSL_ASSERT(mpPresenterController);
 
     if (meLayoutMode == eMode
         && !mbIsSlideSorterActive
@@ -581,7 +581,7 @@ void PresenterWindowManager::LayoutStandardMode()
     // go over the inner pane size.
     PresenterPaneContainer::SharedPaneDescriptor pPane (
         mpPaneContainer->FindPaneURL(PresenterPaneFactory::msCurrentSlidePreviewPaneURL));
-    if (pPane.get() != nullptr)
+    if (pPane)
     {
         const awt::Size aCurrentSlideOuterBox(CalculatePaneSize(
             nHorizontalSlideDivide - 1.5*nGap,
@@ -603,7 +603,7 @@ void PresenterWindowManager::LayoutStandardMode()
     // width.  This takes into account the slide aspect ratio and thus has to
     // go over the inner pane size.
     pPane = mpPaneContainer->FindPaneURL(PresenterPaneFactory::msNextSlidePreviewPaneURL);
-    if (pPane.get() != nullptr)
+    if (pPane)
     {
         const awt::Size aNextSlideOuterBox (CalculatePaneSize(
             aBox.Width - nHorizontalSlideDivide - 1.5*nGap,
@@ -642,7 +642,7 @@ void PresenterWindowManager::LayoutNotesMode()
     // The notes view has no fixed aspect ratio.
     PresenterPaneContainer::SharedPaneDescriptor pPane (
         mpPaneContainer->FindPaneURL(PresenterPaneFactory::msNotesPaneURL));
-    if (pPane.get() != nullptr)
+    if (pPane)
     {
         const geometry::RealSize2D aNotesViewOuterSize(
             nPrimaryWidth - 1.5*nGap + 0.5,
@@ -666,7 +666,7 @@ void PresenterWindowManager::LayoutNotesMode()
     // width.  This takes into account the slide aspect ratio and thus has to
     // go over the inner pane size.
     pPane = mpPaneContainer->FindPaneURL(PresenterPaneFactory::msCurrentSlidePreviewPaneURL);
-    if (pPane.get() != nullptr)
+    if (pPane)
     {
         const awt::Size aCurrentSlideOuterBox(CalculatePaneSize(
             nSecondaryWidth - 1.5*nGap,
@@ -745,7 +745,7 @@ geometry::RealRectangle2D PresenterWindowManager::LayoutToolBar()
     // Get access to the tool bar.
     PresenterPaneContainer::SharedPaneDescriptor pDescriptor(
         mpPaneContainer->FindPaneURL(PresenterPaneFactory::msToolBarPaneURL));
-    if (pDescriptor.get() != nullptr)
+    if (pDescriptor)
     {
         PresenterToolBarView* pToolBarView
             = dynamic_cast<PresenterToolBarView*>(pDescriptor->mxView.get());
@@ -871,7 +871,7 @@ void PresenterWindowManager::UpdateWindowSize (const Reference<awt::XWindow>& rx
 {
     PresenterPaneContainer::SharedPaneDescriptor pDescriptor (
         mpPaneContainer->FindBorderWindow(rxBorderWindow));
-    if (pDescriptor.get() != nullptr)
+    if (pDescriptor)
     {
         mxClipPolygon = nullptr;