From 366d08f2f6d4de922f6099c62bb81b49d89e0a68 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 8 Apr 2020 12:36:53 +0200 Subject: new loplugin:simplifypointertobool Change-Id: Iff68e8f379614a6ab6a6e0d1bad18e70bc76d76a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91907 Tested-by: Jenkins Reviewed-by: Noel Grandin --- sd/source/filter/html/htmlex.cxx | 2 +- sd/source/ui/annotations/annotationtag.cxx | 6 +++--- sd/source/ui/func/fupage.cxx | 2 +- sd/source/ui/slideshow/showwin.cxx | 2 +- sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx | 2 +- sd/source/ui/view/outlview.cxx | 2 +- sd/source/ui/view/sdwindow.cxx | 2 +- sd/source/ui/view/viewoverlaymanager.cxx | 2 +- sd/source/ui/view/viewshel.cxx | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) (limited to 'sd') diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx index 13d54a55bb6c..15f952e7ad55 100644 --- a/sd/source/filter/html/htmlex.cxx +++ b/sd/source/filter/html/htmlex.cxx @@ -2647,7 +2647,7 @@ OUString HtmlExport::CreateNavBar( sal_uInt16 nSdPage, bool bIsText ) const // export navigation graphics from button set void HtmlExport::CreateBitmaps() { - if(mnButtonThema == -1 || !mpButtonSet.get()) + if(mnButtonThema == -1 || !mpButtonSet) return; for( int nButton = 0; nButton != SAL_N_ELEMENTS(pButtonNames); nButton++ ) diff --git a/sd/source/ui/annotations/annotationtag.cxx b/sd/source/ui/annotations/annotationtag.cxx index 098a2a816cd7..67d6366de7db 100644 --- a/sd/source/ui/annotations/annotationtag.cxx +++ b/sd/source/ui/annotations/annotationtag.cxx @@ -553,7 +553,7 @@ void AnnotationTag::OpenPopup( bool bEdit ) if( !mxAnnotation.is() ) return; - if( !mpAnnotationWindow.get() ) + if( !mpAnnotationWindow ) { vcl::Window* pWindow = dynamic_cast< vcl::Window* >( getView().GetFirstOutputDevice() ); if( pWindow ) @@ -583,13 +583,13 @@ void AnnotationTag::OpenPopup( bool bEdit ) } } - if( bEdit && mpAnnotationWindow.get() ) + if( bEdit && mpAnnotationWindow ) mpAnnotationWindow->StartEdit(); } void AnnotationTag::ClosePopup() { - if( mpAnnotationWindow.get()) + if( mpAnnotationWindow ) { mpAnnotationWindow->RemoveEventListener( LINK(this, AnnotationTag, WindowEventHandler)); mpAnnotationWindow->Deactivate(); diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx index 95dc91b232f2..3779feec3f82 100644 --- a/sd/source/ui/func/fupage.cxx +++ b/sd/source/ui/func/fupage.cxx @@ -348,7 +348,7 @@ const SfxItemSet* FuPage::ExecuteDialog(weld::Window* pParent, const SfxRequest& pTempSet.reset( new SfxItemSet(*pDlg->GetOutputItemSet()) ); } - if (pTempSet.get() && pStyleSheet) + if (pTempSet && pStyleSheet) { pStyleSheet->AdjustToFontHeight(*pTempSet); diff --git a/sd/source/ui/slideshow/showwin.cxx b/sd/source/ui/slideshow/showwin.cxx index eaf7e0a3b7cf..2762342abdce 100644 --- a/sd/source/ui/slideshow/showwin.cxx +++ b/sd/source/ui/slideshow/showwin.cxx @@ -603,7 +603,7 @@ css::uno::Reference ShowWindow::CreateAccessible() { css::uno::Reference< css::accessibility::XAccessible > xAcc = GetAccessible(false); - if (xAcc.get()) + if (xAcc) { return xAcc; } diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx index 44a04b7728fb..aae9af937627 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx @@ -255,7 +255,7 @@ css::uno::Reference void SlideSorterViewShell::SwitchViewFireFocus(const css::uno::Reference< css::accessibility::XAccessible >& xAcc ) { - if (xAcc.get()) + if (xAcc) { ::accessibility::AccessibleSlideSorterView* pBase = static_cast< ::accessibility::AccessibleSlideSorterView* >(xAcc.get()); if (pBase) diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx index 735b836875f7..544dca087d9e 100644 --- a/sd/source/ui/view/outlview.cxx +++ b/sd/source/ui/view/outlview.cxx @@ -1146,7 +1146,7 @@ SdPage* OutlineView::GetActualPage() DBG_ASSERT( pCurrent || (mpDocSh->GetUndoManager() && static_cast< sd::UndoManager *>(mpDocSh->GetUndoManager())->IsDoing()) || - maDragAndDropModelGuard.get(), + maDragAndDropModelGuard, "sd::OutlineView::GetActualPage(), no current page?" ); if( pCurrent ) diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx index f7bb298d2b60..1c06ad1762f4 100644 --- a/sd/source/ui/view/sdwindow.cxx +++ b/sd/source/ui/view/sdwindow.cxx @@ -957,7 +957,7 @@ css::uno::Reference return vcl::Window::CreateAccessible (); } css::uno::Reference< css::accessibility::XAccessible > xAcc = GetAccessible(false); - if (xAcc.get()) + if (xAcc) { return xAcc; } diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx index 3dc5260944a2..a1d6cdc1b30c 100644 --- a/sd/source/ui/view/viewoverlaymanager.cxx +++ b/sd/source/ui/view/viewoverlaymanager.cxx @@ -314,7 +314,7 @@ bool ChangePlaceholderTag::MouseButtonDown( const MouseEvent& /*rMEvt*/, SmartHd { sal_uInt16 nSID = gButtonSlots[nHighlightId]; - if( mxPlaceholderObj.get() ) + if( mxPlaceholderObj ) { // mark placeholder if it is not currently marked (or if also others are marked) if( !mrView.IsObjMarked( mxPlaceholderObj.get() ) || (mrView.GetMarkedObjectList().GetMarkCount() != 1) ) diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx index 97719c049e32..ca99e3f7a214 100644 --- a/sd/source/ui/view/viewshel.cxx +++ b/sd/source/ui/view/viewshel.cxx @@ -1540,7 +1540,7 @@ bool ViewShell::RelocateToParentWindow (vcl::Window* pParentWindow) void ViewShell::SwitchViewFireFocus(const css::uno::Reference< css::accessibility::XAccessible >& xAcc ) { - if (xAcc.get()) + if (xAcc) { ::accessibility::AccessibleDocumentViewBase* pBase = static_cast< ::accessibility::AccessibleDocumentViewBase* >(xAcc.get()); if (pBase) -- cgit