diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-10-16 15:23:12 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-10-17 08:25:47 +0200 |
| commit | ccb2a1f650bc505f8a4f1abebf8ce4f9396562a8 (patch) | |
| tree | 2ee2fd4f300ae95cf23bade1f242e02f9b276c07 /sd | |
| parent | da5c3a1ee43dd1a07cbd1b8005488bf05432593d (diff) | |
clang-tidy readability-redundant-smartptr-get
redundant get() call on smart pointer
Change-Id: Icb5a03bbc15e79a30d3d135a507d22914d15c2bd
Reviewed-on: https://gerrit.libreoffice.org/61837
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd')
58 files changed, 248 insertions, 253 deletions
diff --git a/sd/source/core/sdpage_animations.cxx b/sd/source/core/sdpage_animations.cxx index c7e35d05dffb..70764332d502 100644 --- a/sd/source/core/sdpage_animations.cxx +++ b/sd/source/core/sdpage_animations.cxx @@ -40,7 +40,7 @@ using ::com::sun::star::drawing::XShape; /** returns a helper class to manipulate effects inside the main sequence */ sd::MainSequencePtr const & SdPage::getMainSequence() { - if( nullptr == mpMainSequence.get() ) + if (nullptr == mpMainSequence) mpMainSequence.reset( new sd::MainSequence( getAnimationNode() ) ); return mpMainSequence; diff --git a/sd/source/core/stlfamily.cxx b/sd/source/core/stlfamily.cxx index 413699e3a533..52fb2d612b5d 100644 --- a/sd/source/core/stlfamily.cxx +++ b/sd/source/core/stlfamily.cxx @@ -441,7 +441,8 @@ Reference< XInterface > SAL_CALL SdStyleFamily::createInstance() { throw IllegalAccessException(); } - return Reference< XInterface >( static_cast< XStyle* >( SdStyleSheet::CreateEmptyUserStyle( *mxPool.get(), mnFamily ) ) ); + return Reference<XInterface>( + static_cast<XStyle*>(SdStyleSheet::CreateEmptyUserStyle(*mxPool, mnFamily))); } Reference< XInterface > SAL_CALL SdStyleFamily::createInstanceWithArguments( const Sequence< Any >& ) diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx index 8b4a095b3482..24f365b30936 100644 --- a/sd/source/core/stlsheet.cxx +++ b/sd/source/core/stlsheet.cxx @@ -802,7 +802,7 @@ void SAL_CALL SdStyleSheet::addModifyListener( const Reference< XModifyListener } else { - if( !mpModifyListenerForewarder.get() ) + if (!mpModifyListenerForewarder) mpModifyListenerForewarder.reset( new ModifyListenerForewarder( this ) ); mrBHelper.addListener( cppu::UnoType<XModifyListener>::get(), xListener ); } diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx index bcda24246ef6..01122edd607a 100644 --- a/sd/source/filter/eppt/epptso.cxx +++ b/sd/source/filter/eppt/epptso.cxx @@ -159,7 +159,7 @@ sal_uInt16 PPTExBulletProvider::GetId(Graphic const & rGraphic, Size& rGraphicSi } } } - sal_uInt32 nId = pGraphicProv->GetBlibID(aBuExPictureStream, *xGraphicObject.get()); + sal_uInt32 nId = pGraphicProv->GetBlibID(aBuExPictureStream, *xGraphicObject); if ( nId && ( nId < 0x10000 ) ) nRetValue = static_cast<sal_uInt16>(nId) - 1; @@ -813,7 +813,7 @@ void PPTWriter::ImplWritePortions( SvStream& rOut, TextObj& rTextObj ) ParagraphObj* pPara = rTextObj.GetParagraph(i); for ( std::vector<std::unique_ptr<PortionObj> >::const_iterator it = pPara->begin(); it != pPara->end(); ++it ) { - const PortionObj& rPortion = *(*it).get(); + const PortionObj& rPortion = **it; nPropertyFlags = 0; sal_uInt32 nCharAttr = rPortion.mnCharAttr; sal_uInt32 nCharColor = rPortion.mnCharColor; @@ -1104,7 +1104,7 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_u pPara = aTextObj.GetParagraph(i); for ( std::vector<std::unique_ptr<PortionObj> >::const_iterator it = pPara->begin(); it != pPara->end(); ++it ) { - const PortionObj& rPortion = *(*it).get(); + const PortionObj& rPortion = **it; if ( rPortion.mpFieldEntry ) { const FieldEntry* pFieldEntry = rPortion.mpFieldEntry.get(); @@ -3352,7 +3352,7 @@ void TextObjBinary::WriteTextSpecInfo( SvStream* pStrm ) ParagraphObj* pPtr = GetParagraph(i); for ( std::vector<std::unique_ptr<PortionObj> >::const_iterator it = pPtr->begin(); nCharactersLeft && it != pPtr->end(); ++it ) { - const PortionObj& rPortion = *(*it).get(); + const PortionObj& rPortion = **it; sal_Int32 nPortionSize = rPortion.mnTextSize >= nCharactersLeft ? nCharactersLeft : rPortion.mnTextSize; sal_Int32 const nFlags = 7; nCharactersLeft -= nPortionSize; diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx index 7968a60d0054..a446914b6c57 100644 --- a/sd/source/filter/html/pubdlg.cxx +++ b/sd/source/filter/html/pubdlg.cxx @@ -1318,7 +1318,7 @@ void SdPublishingDlg::UpdatePage() */ void SdPublishingDlg::LoadPreviewButtons() { - if( mpButtonSet.get() ) + if (mpButtonSet) { const int nButtonCount = 8; static const char *pButtonNames[nButtonCount] = diff --git a/sd/source/filter/ppt/propread.cxx b/sd/source/filter/ppt/propread.cxx index 112d8a0befe8..629efdca58df 100644 --- a/sd/source/filter/ppt/propread.cxx +++ b/sd/source/filter/ppt/propread.cxx @@ -206,7 +206,7 @@ Section::Section( const Section& rSection ) for ( int i = 0; i < 16; i++ ) aFMTID[ i ] = rSection.aFMTID[ i ]; for(const std::unique_ptr<PropEntry>& rEntry : rSection.maEntries) - maEntries.push_back(o3tl::make_unique<PropEntry>(*rEntry.get())); + maEntries.push_back(o3tl::make_unique<PropEntry>(*rEntry)); } Section::Section( const sal_uInt8* pFMTID ) @@ -528,7 +528,7 @@ Section& Section::operator=( const Section& rSection ) memcpy( static_cast<void*>(aFMTID), static_cast<void const *>(rSection.aFMTID), 16 ); for(const std::unique_ptr<PropEntry>& rEntry : rSection.maEntries) - maEntries.push_back(o3tl::make_unique<PropEntry>(*rEntry.get())); + maEntries.push_back(o3tl::make_unique<PropEntry>(*rEntry)); } return *this; } @@ -609,7 +609,7 @@ PropRead& PropRead::operator=( const PropRead& rPropRead ) memcpy( mApplicationCLSID, rPropRead.mApplicationCLSID, 16 ); for(const std::unique_ptr<Section>& rSection : rPropRead.maSections) - maSections.push_back(o3tl::make_unique<Section>(*rSection.get())); + maSections.push_back(o3tl::make_unique<Section>(*rSection)); } return *this; } diff --git a/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx b/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx index ea004a876ccb..0c7736a6680c 100644 --- a/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx +++ b/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx @@ -187,9 +187,9 @@ namespace accessibility { ::std::unique_ptr< SfxHint > aHint( SvxEditSourceHelper::EENotification2Hint( &rNotify) ); - if( aHint.get() ) - { - Broadcast( *aHint.get() ); + if (aHint) + { + Broadcast(*aHint); } } diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx index 02cb2ac1292c..fb76dca613b5 100644 --- a/sd/source/ui/annotations/annotationmanager.cxx +++ b/sd/source/ui/annotations/annotationmanager.cxx @@ -589,7 +589,7 @@ void AnnotationManagerImpl::ExecuteReplyToAnnotation( SfxRequest const & rReq ) pOutliner->Insert(sReplyText); std::unique_ptr< OutlinerParaObject > pOPO( pOutliner->CreateParaObject() ); - pTextApi->SetText( *pOPO.get() ); + pTextApi->SetText(*pOPO); OUString sReplyAuthor; if (comphelper::LibreOfficeKit::isActive()) @@ -811,7 +811,7 @@ void AnnotationManagerImpl::SelectNextAnnotation(bool bForeward) { // switch to next/previous slide with annotations std::shared_ptr<DrawViewShell> pDrawViewShell(std::dynamic_pointer_cast<DrawViewShell>(mrBase.GetMainViewShell())); - if (pDrawViewShell.get() != nullptr) + if (pDrawViewShell != nullptr) { pDrawViewShell->ChangeEditMode(pPage->IsMasterPage() ? EditMode::MasterPage : EditMode::Page, false); pDrawViewShell->SwitchPage((pPage->GetPageNum() - 1) >> 1); diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx index d6ddd78d23cd..757cda4e8727 100644 --- a/sd/source/ui/annotations/annotationwindow.cxx +++ b/sd/source/ui/annotations/annotationwindow.cxx @@ -518,7 +518,7 @@ void AnnotationWindow::setAnnotation( const Reference< XAnnotation >& xAnnotatio if( pTextApi ) { std::unique_ptr< OutlinerParaObject > pOPO( pTextApi->CreateText() ); - Engine()->SetText( *pOPO.get() ); + Engine()->SetText(*pOPO); } Engine()->ClearModifyFlag(); diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx index 7bc2370302ab..923926e4d320 100644 --- a/sd/source/ui/app/sdmod1.cxx +++ b/sd/source/ui/app/sdmod1.cxx @@ -601,7 +601,7 @@ void OutlineToImpressFinalizer::operator() (bool) ::sd::OutlineViewShell* pOutlineShell = dynamic_cast<sd::OutlineViewShell*>(FrameworkHelper::Instance(mrBase)->GetViewShell(FrameworkHelper::msCenterPaneURL).get()); - if (pOutlineShell != nullptr && mpStream.get() != nullptr) + if (pOutlineShell != nullptr && mpStream != nullptr) { sd::OutlineView* pView = static_cast<sd::OutlineView*>(pOutlineShell->GetView()); // mba: the stream can't contain any relative URLs, because we don't diff --git a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx index e278b6817c0d..debdc348acf1 100644 --- a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx +++ b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx @@ -152,7 +152,7 @@ void ChangeRequestQueueProcessor::ProcessOneEvent() SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": All requests are processed"); // The queue is empty so tell the ConfigurationManager to update // its state. - if (mpConfigurationUpdater.get() != nullptr) + if (mpConfigurationUpdater != nullptr) { #if DEBUG_SD_CONFIGURATION_TRACE ConfigurationTracer::TraceConfiguration ( diff --git a/sd/source/ui/framework/configuration/ConfigurationController.cxx b/sd/source/ui/framework/configuration/ConfigurationController.cxx index a27fd4e54f75..018a814ed525 100644 --- a/sd/source/ui/framework/configuration/ConfigurationController.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationController.cxx @@ -116,7 +116,7 @@ ConfigurationController::~ConfigurationController() throw() void SAL_CALL ConfigurationController::disposing() { - if (mpImplementation.get() == nullptr) + if (mpImplementation == nullptr) return; SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": ConfigurationController::disposing"); @@ -148,9 +148,9 @@ void SAL_CALL ConfigurationController::disposing() void ConfigurationController::ProcessEvent() { - if (mpImplementation.get() != nullptr) + if (mpImplementation != nullptr) { - OSL_ASSERT(mpImplementation->mpQueueProcessor.get()!=nullptr); + OSL_ASSERT(mpImplementation->mpQueueProcessor != nullptr); mpImplementation->mpQueueProcessor->ProcessOneEvent(); } @@ -158,9 +158,9 @@ void ConfigurationController::ProcessEvent() void ConfigurationController::RequestSynchronousUpdate() { - if (mpImplementation.get() == nullptr) + if (mpImplementation == nullptr) return; - if (mpImplementation->mpQueueProcessor.get() == nullptr) + if (mpImplementation->mpQueueProcessor == nullptr) return; mpImplementation->mpQueueProcessor->ProcessUntilEmpty(); } @@ -175,7 +175,7 @@ void SAL_CALL ConfigurationController::addConfigurationChangeListener ( ::osl::MutexGuard aGuard (maMutex); ThrowIfDisposed(); - OSL_ASSERT(mpImplementation.get()!=nullptr); + OSL_ASSERT(mpImplementation != nullptr); mpImplementation->mpBroadcaster->AddListener(rxListener, rsEventType, rUserData); } @@ -199,14 +199,14 @@ void SAL_CALL ConfigurationController::notifyEvent ( void SAL_CALL ConfigurationController::lock() { - OSL_ASSERT(mpImplementation.get()!=nullptr); - OSL_ASSERT(mpImplementation->mpConfigurationUpdater.get()!=nullptr); + OSL_ASSERT(mpImplementation != nullptr); + OSL_ASSERT(mpImplementation->mpConfigurationUpdater != nullptr); ::osl::MutexGuard aGuard (maMutex); ThrowIfDisposed(); ++mpImplementation->mnLockCount; - if (mpImplementation->mpConfigurationUpdaterLock.get()==nullptr) + if (mpImplementation->mpConfigurationUpdaterLock == nullptr) mpImplementation->mpConfigurationUpdaterLock = mpImplementation->mpConfigurationUpdater->GetLock(); } @@ -509,9 +509,9 @@ void ConfigurationController::ThrowIfDisposed () const const_cast<uno::XWeak*>(static_cast<const uno::XWeak*>(this))); } - if (mpImplementation.get() == nullptr) + if (mpImplementation == nullptr) { - OSL_ASSERT(mpImplementation.get() != nullptr); + OSL_ASSERT(mpImplementation != nullptr); throw RuntimeException("ConfigurationController not initialized", const_cast<uno::XWeak*>(static_cast<const uno::XWeak*>(this))); } diff --git a/sd/source/ui/framework/configuration/ResourceId.cxx b/sd/source/ui/framework/configuration/ResourceId.cxx index 3036438b9fae..c6c961a2a6f8 100644 --- a/sd/source/ui/framework/configuration/ResourceId.cxx +++ b/sd/source/ui/framework/configuration/ResourceId.cxx @@ -119,7 +119,7 @@ OUString SAL_CALL util::URL SAL_CALL ResourceId::getFullResourceURL() { - if (mpURL.get() != nullptr) + if (mpURL != nullptr) return *mpURL; Reference<util::XURLTransformer> xURLTransformer (mxURLTransformerWeak); diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.cxx b/sd/source/ui/framework/factories/BasicPaneFactory.cxx index 1b02e63da18d..432b459087b4 100644 --- a/sd/source/ui/framework/factories/BasicPaneFactory.cxx +++ b/sd/source/ui/framework/factories/BasicPaneFactory.cxx @@ -406,7 +406,7 @@ Reference<XResource> BasicPaneFactory::CreateChildWindowPane ( // With shell and child window id create the ChildWindowPane // wrapper. - if (pShell.get() != nullptr) + if (pShell != nullptr) { xPane = new ChildWindowPane( rxPaneId, diff --git a/sd/source/ui/framework/factories/BasicViewFactory.cxx b/sd/source/ui/framework/factories/BasicViewFactory.cxx index 7c2a78872e15..864f305e6009 100644 --- a/sd/source/ui/framework/factories/BasicViewFactory.cxx +++ b/sd/source/ui/framework/factories/BasicViewFactory.cxx @@ -162,12 +162,12 @@ Reference<XResource> SAL_CALL BasicViewFactory::createResource ( std::shared_ptr<ViewDescriptor> pDescriptor (GetViewFromCache(rxViewId, xPane)); // When the requested view is not in the cache then create a new view. - if (pDescriptor.get() == nullptr) + if (pDescriptor == nullptr) { pDescriptor = CreateView(rxViewId, *pFrame, *pWindow, xPane, pFrameView, bIsCenterPane); } - if (pDescriptor.get() != nullptr) + if (pDescriptor != nullptr) xView = pDescriptor->mxView; mpViewShellContainer->push_back(pDescriptor); @@ -287,7 +287,7 @@ std::shared_ptr<BasicViewFactory::ViewDescriptor> BasicViewFactory::CreateView ( pFrameView); pDescriptor->mxViewId = rxViewId; - if (pDescriptor->mpViewShell.get() != nullptr) + if (pDescriptor->mpViewShell != nullptr) { pDescriptor->mpViewShell->Init(bIsCenterPane); mpBase->GetViewShellManager()->ActivateViewShell(pDescriptor->mpViewShell.get()); @@ -485,7 +485,7 @@ std::shared_ptr<BasicViewFactory::ViewDescriptor> BasicViewFactory::GetViewFromC // When the view has been found then relocate it to the given pane and // remove it from the cache. - if (pDescriptor.get() != nullptr) + if (pDescriptor != nullptr) { bool bRelocationSuccessfull (false); Reference<XRelocatableResource> xResource (pDescriptor->mxView, UNO_QUERY); diff --git a/sd/source/ui/framework/factories/ChildWindowPane.cxx b/sd/source/ui/framework/factories/ChildWindowPane.cxx index 4f373fe33209..3ad243701290 100644 --- a/sd/source/ui/framework/factories/ChildWindowPane.cxx +++ b/sd/source/ui/framework/factories/ChildWindowPane.cxx @@ -134,7 +134,7 @@ vcl::Window* ChildWindowPane::GetWindow() // visible to early then some layouting seems to be made twice or at // an inconvenient time and the overall process of initializing the // Impress takes longer. - if ( ! mbHasBeenActivated && mpShell.get()!=nullptr && ! mpShell->IsActive()) + if (!mbHasBeenActivated && mpShell != nullptr && !mpShell->IsActive()) break; mbHasBeenActivated = true; diff --git a/sd/source/ui/framework/factories/ViewShellWrapper.cxx b/sd/source/ui/framework/factories/ViewShellWrapper.cxx index cd38dc210db8..488cad3b1932 100644 --- a/sd/source/ui/framework/factories/ViewShellWrapper.cxx +++ b/sd/source/ui/framework/factories/ViewShellWrapper.cxx @@ -196,7 +196,7 @@ sal_Bool SAL_CALL ViewShellWrapper::relocateToAnchor ( xWindow->removeWindowListener(this); mxWindow = nullptr; - if (mpViewShell.get() != nullptr) + if (mpViewShell != nullptr) { VclPtr<vcl::Window> pWindow = VCLUnoHelper::GetWindow(xPane->getWindow()); if (pWindow && mpViewShell->RelocateToParentWindow(pWindow)) diff --git a/sd/source/ui/framework/module/CenterViewFocusModule.cxx b/sd/source/ui/framework/module/CenterViewFocusModule.cxx index 705325619a7b..4cbe71f7564e 100644 --- a/sd/source/ui/framework/module/CenterViewFocusModule.cxx +++ b/sd/source/ui/framework/module/CenterViewFocusModule.cxx @@ -139,7 +139,7 @@ void CenterViewFocusModule::HandleNewView ( if (pViewShellWrapper != nullptr) { std::shared_ptr<ViewShell> pViewShell = pViewShellWrapper->GetViewShell(); - if (pViewShell.get() != nullptr) + if (pViewShell != nullptr) mpBase->GetViewShellManager()->MoveToTop(*pViewShell); } } diff --git a/sd/source/ui/framework/module/ShellStackGuard.cxx b/sd/source/ui/framework/module/ShellStackGuard.cxx index c02843769dd9..180aa5119f9a 100644 --- a/sd/source/ui/framework/module/ShellStackGuard.cxx +++ b/sd/source/ui/framework/module/ShellStackGuard.cxx @@ -93,7 +93,7 @@ void SAL_CALL ShellStackGuard::notifyConfigurationChange ( { if (rEvent.Type == FrameworkHelper::msConfigurationUpdateStartEvent) { - if (mpUpdateLock.get() == nullptr && IsPrinting()) + if (mpUpdateLock == nullptr && IsPrinting()) { // Prevent configuration updates while the printer is printing. mpUpdateLock.reset(new ConfigurationController::Lock(mxConfigurationController)); @@ -122,7 +122,7 @@ IMPL_LINK(ShellStackGuard, TimeoutHandler, Timer*, pIdle, void) #else (void)pIdle; #endif - if (mpUpdateLock.get() != nullptr) + if (mpUpdateLock != nullptr) { if ( ! IsPrinting()) { diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx index 9e582fa0078d..fb1c2acf35f0 100644 --- a/sd/source/ui/framework/tools/FrameworkHelper.cxx +++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx @@ -815,7 +815,7 @@ void SAL_CALL FrameworkHelper::DisposeListener::disposing() void SAL_CALL FrameworkHelper::DisposeListener::disposing (const lang::EventObject& rEventObject) { - if (mpHelper.get() != nullptr) + if (mpHelper != nullptr) mpHelper->disposing(rEventObject); } diff --git a/sd/source/ui/func/fuformatpaintbrush.cxx b/sd/source/ui/func/fuformatpaintbrush.cxx index 47c401498f58..c0da5576d66a 100644 --- a/sd/source/ui/func/fuformatpaintbrush.cxx +++ b/sd/source/ui/func/fuformatpaintbrush.cxx @@ -228,7 +228,7 @@ void FuFormatPaintBrush::Deactivate() bool FuFormatPaintBrush::HasContentForThisType( SdrInventor nObjectInventor, sal_uInt16 nObjectIdentifier ) const { - if( mxItemSet.get() == nullptr ) + if (mxItemSet == nullptr) return false; if( !mpView || (!SdrObjEditView::SupportsFormatPaintbrush( nObjectInventor, nObjectIdentifier) ) ) return false; diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx index 8c9c47f5aff3..1fe20d09b107 100644 --- a/sd/source/ui/func/fupage.cxx +++ b/sd/source/ui/func/fupage.cxx @@ -387,8 +387,8 @@ const SfxItemSet* FuPage::ExecuteDialog(weld::Window* pParent) if( mbMasterPage ) { - mpDocSh->GetUndoManager()->AddUndoAction( - o3tl::make_unique<StyleSheetUndoAction>(mpDoc, static_cast<SfxStyleSheet*>(pStyleSheet), &(*pTempSet.get()))); + mpDocSh->GetUndoManager()->AddUndoAction(o3tl::make_unique<StyleSheetUndoAction>( + mpDoc, static_cast<SfxStyleSheet*>(pStyleSheet), &(*pTempSet))); pStyleSheet->GetItemSet().Put( *(pTempSet.get()) ); sdr::properties::CleanupFillProperties( pStyleSheet->GetItemSet() ); pStyleSheet->Broadcast(SfxHint(SfxHintId::DataChanged)); diff --git a/sd/source/ui/presenter/PresenterCanvas.cxx b/sd/source/ui/presenter/PresenterCanvas.cxx index 4d893c704215..220418706256 100644 --- a/sd/source/ui/presenter/PresenterCanvas.cxx +++ b/sd/source/ui/presenter/PresenterCanvas.cxx @@ -410,7 +410,7 @@ sal_Bool SAL_CALL PresenterCanvas::updateScreen (sal_Bool bUpdateAll) ThrowIfDisposed(); mbOffsetUpdatePending = true; - if (m_pUpdateRequester.get() != nullptr) + if (m_pUpdateRequester != nullptr) { m_pUpdateRequester->RequestUpdate(bUpdateAll); return true; diff --git a/sd/source/ui/presenter/PresenterPreviewCache.cxx b/sd/source/ui/presenter/PresenterPreviewCache.cxx index c98584bad753..63238d56904a 100644 --- a/sd/source/ui/presenter/PresenterPreviewCache.cxx +++ b/sd/source/ui/presenter/PresenterPreviewCache.cxx @@ -97,7 +97,7 @@ void SAL_CALL PresenterPreviewCache::setDocumentSlides ( const Reference<XInterface>& rxDocument) { ThrowIfDisposed(); - OSL_ASSERT(mpCacheContext.get()!=nullptr); + OSL_ASSERT(mpCacheContext != nullptr); mpCacheContext->SetDocumentSlides(rxSlides, rxDocument); } @@ -107,7 +107,7 @@ void SAL_CALL PresenterPreviewCache::setVisibleRange ( sal_Int32 nLastVisibleSlideIndex) { ThrowIfDisposed(); - OSL_ASSERT(mpCacheContext.get()!=nullptr); + OSL_ASSERT(mpCacheContext != nullptr); mpCacheContext->SetVisibleSlideRange (nFirstVisibleSlideIndex, nLastVisibleSlideIndex); } @@ -116,7 +116,7 @@ void SAL_CALL PresenterPreviewCache::setPreviewSize ( const css::geometry::IntegerSize2D& rSize) { ThrowIfDisposed(); - OSL_ASSERT(mpCache.get()!=nullptr); + OSL_ASSERT(mpCache != nullptr); maPreviewSize = Size(rSize.Width, rSize.Height); mpCache->ChangeSize(maPreviewSize, Bitmap::HasFastScale()); @@ -127,7 +127,7 @@ Reference<rendering::XBitmap> SAL_CALL PresenterPreviewCache::getSlidePreview ( const Reference<rendering::XCanvas>& rxCanvas) { ThrowIfDisposed(); - OSL_ASSERT(mpCacheContext.get()!=nullptr); + OSL_ASSERT(mpCacheContext != nullptr); cppcanvas::CanvasSharedPtr pCanvas ( cppcanvas::VCLFactory::createCanvas(rxCanvas)); @@ -164,14 +164,14 @@ void SAL_CALL PresenterPreviewCache::removePreviewCreationNotifyListener ( void SAL_CALL PresenterPreviewCache::pause() { ThrowIfDisposed(); - OSL_ASSERT(mpCache.get()!=nullptr); + OSL_ASSERT(mpCache != nullptr); mpCache->Pause(); } void SAL_CALL PresenterPreviewCache::resume() { ThrowIfDisposed(); - OSL_ASSERT(mpCache.get()!=nullptr); + OSL_ASSERT(mpCache != nullptr); mpCache->Resume(); } diff --git a/sd/source/ui/presenter/PresenterTextView.cxx b/sd/source/ui/presenter/PresenterTextView.cxx index 9c4fec708b5f..8b9a7248e088 100644 --- a/sd/source/ui/presenter/PresenterTextView.cxx +++ b/sd/source/ui/presenter/PresenterTextView.cxx @@ -204,8 +204,7 @@ Any PresenterTextView::SetPropertyValue ( void PresenterTextView::ThrowIfDisposed() { if (PresenterTextViewInterfaceBase::rBHelper.bDisposed - || PresenterTextViewInterfaceBase::rBHelper.bInDispose - || mpImplementation.get()==nullptr) + || PresenterTextViewInterfaceBase::rBHelper.bInDispose || mpImplementation == nullptr) { throw lang::DisposedException ("PresenterTextView object has already been disposed", static_cast<uno::XWeak*>(this)); diff --git a/sd/source/ui/sidebar/MasterPageContainer.cxx b/sd/source/ui/sidebar/MasterPageContainer.cxx index 16cc04b26294..6f7cd12b64a8 100644 --- a/sd/source/ui/sidebar/MasterPageContainer.cxx +++ b/sd/source/ui/sidebar/MasterPageContainer.cxx @@ -203,8 +203,8 @@ std::shared_ptr<MasterPageContainer::Implementation> Implementation::mpInstance); } - DBG_ASSERT (pInstance.get()!=nullptr, - "MasterPageContainer::Implementation::Instance(): instance is nullptr"); + DBG_ASSERT(pInstance != nullptr, + "MasterPageContainer::Implementation::Instance(): instance is nullptr"); return pInstance; } @@ -625,8 +625,8 @@ MasterPageContainer::Token MasterPageContainer::Implementation::PutMasterPage ( if (aEntry == maContainer.end()) { // Insert a new MasterPageDescriptor. - bool bIgnore (rpDescriptor->mpPageObjectProvider.get()==nullptr - && rpDescriptor->msURL.isEmpty()); + bool bIgnore(rpDescriptor->mpPageObjectProvider == nullptr + && rpDescriptor->msURL.isEmpty()); if ( ! bIgnore) { @@ -661,7 +661,7 @@ MasterPageContainer::Token MasterPageContainer::Implementation::PutMasterPage ( aResult = (*aEntry)->maToken; std::unique_ptr<std::vector<MasterPageContainerChangeEvent::EventType> > pEventTypes( (*aEntry)->Update(*rpDescriptor)); - if (pEventTypes.get()!=nullptr && pEventTypes->size()>0) + if (pEventTypes != nullptr && pEventTypes->size() > 0) { // One or more aspects of the descriptor have changed. Send // appropriate events to the listeners. @@ -780,7 +780,7 @@ MasterPageContainer::PreviewState MasterPageContainer::Implementation::GetPrevie { if (pDescriptor->maLargePreview.GetSizePixel().Width() != 0) eState = PS_AVAILABLE; - else if (pDescriptor->mpPreviewProvider.get() != nullptr) + else if (pDescriptor->mpPreviewProvider != nullptr) { // The preview does not exist but can be created. When that is // not expensive then do it at once. diff --git a/sd/source/ui/sidebar/MasterPageContainerFiller.cxx b/sd/source/ui/sidebar/MasterPageContainerFiller.cxx index 27d9cbe66078..d007e524f969 100644 --- a/sd/source/ui/sidebar/MasterPageContainerFiller.cxx +++ b/sd/source/ui/sidebar/MasterPageContainerFiller.cxx @@ -85,7 +85,7 @@ void MasterPageContainerFiller::RunNextStep() { case DONE: case ERROR: - if (mpScannerTask.get() != nullptr) + if (mpScannerTask != nullptr) { mrContainerAdapter.FillingDone(); mpScannerTask.reset(); @@ -113,7 +113,7 @@ MasterPageContainerFiller::State MasterPageContainerFiller::ScanTemplate() { State eState (ERROR); - if (mpScannerTask.get() != nullptr) + if (mpScannerTask != nullptr) { if (mpScannerTask->HasNextStep()) { diff --git a/sd/source/ui/sidebar/MasterPageContainerQueue.cxx b/sd/source/ui/sidebar/MasterPageContainerQueue.cxx index 98e42367e1f6..4690ad283d7a 100644 --- a/sd/source/ui/sidebar/MasterPageContainerQueue.cxx +++ b/sd/source/ui/sidebar/MasterPageContainerQueue.cxx @@ -153,11 +153,11 @@ sal_Int32 MasterPageContainerQueue::CalculatePriority ( // The cost is used as a starting value. int nCost (0); - if (rpDescriptor->mpPreviewProvider.get() != nullptr) + if (rpDescriptor->mpPreviewProvider != nullptr) { nCost = rpDescriptor->mpPreviewProvider->GetCostIndex(); if (rpDescriptor->mpPreviewProvider->NeedsPageObject()) - if (rpDescriptor->mpPageObjectProvider.get() != nullptr) + if (rpDescriptor->mpPageObjectProvider != nullptr) nCost += rpDescriptor->mpPageObjectProvider->GetCostIndex(); } @@ -220,7 +220,7 @@ IMPL_LINK(MasterPageContainerQueue, DelayedPreviewCreation, Timer*, pTimer, void if ( ! mpWeakContainer.expired()) { std::shared_ptr<ContainerAdapter> pContainer (mpWeakContainer); - if (pContainer.get() != nullptr) + if (pContainer != nullptr) pContainer->UpdateDescriptor(aRequest.mpDescriptor,false,true,true); } } diff --git a/sd/source/ui/sidebar/MasterPageDescriptor.cxx b/sd/source/ui/sidebar/MasterPageDescriptor.cxx index 168288094687..2f87f3db6423 100644 --- a/sd/source/ui/sidebar/MasterPageDescriptor.cxx +++ b/sd/source/ui/sidebar/MasterPageDescriptor.cxx @@ -102,16 +102,16 @@ const Image& MasterPageDescriptor::GetPreview (MasterPageContainer::PreviewSize bDataChanged = true; } - if (mpPageObjectProvider.get()==nullptr && rDescriptor.mpPageObjectProvider.get()!=nullptr) + if (mpPageObjectProvider == nullptr && rDescriptor.mpPageObjectProvider != nullptr) { mpPageObjectProvider = rDescriptor.mpPageObjectProvider; bDataChanged = true; } - if (mpPreviewProvider.get()==nullptr && rDescriptor.mpPreviewProvider.get()!=nullptr) - { - mpPreviewProvider = rDescriptor.mpPreviewProvider; - bPreviewChanged = true; + if (mpPreviewProvider == nullptr && rDescriptor.mpPreviewProvider != nullptr) + { + mpPreviewProvider = rDescriptor.mpPreviewProvider; + bPreviewChanged = true; } if (mnTemplateIndex<0 && rDescriptor.mnTemplateIndex>=0) @@ -143,9 +143,8 @@ int MasterPageDescriptor::UpdatePageObject ( int nModified = 0; // Update the page object when that is not yet known. - if (mpMasterPage == nullptr - && mpPageObjectProvider.get()!=nullptr - && (nCostThreshold<0 || mpPageObjectProvider->GetCostIndex()<=nCostThreshold)) + if (mpMasterPage == nullptr && mpPageObjectProvider != nullptr + && (nCostThreshold < 0 || mpPageObjectProvider->GetCostIndex() <= nCostThreshold)) { // Note that pDocument may be NULL. @@ -198,9 +197,8 @@ bool MasterPageDescriptor::UpdatePreview ( bool bModified (false); // Update the preview when that is not yet known. - if (maLargePreview.GetSizePixel().Width()==0 - && mpPreviewProvider.get()!=nullptr - && (nCostThreshold<0 || mpPreviewProvider->GetCostIndex()<=nCostThreshold)) + if (maLargePreview.GetSizePixel().Width() == 0 && mpPreviewProvider != nullptr + && (nCostThreshold < 0 || mpPreviewProvider->GetCostIndex() <= nCostThreshold)) { SdPage* pPage = mpSlide; if (pPage == nullptr) @@ -323,20 +321,17 @@ bool MasterPageDescriptor::AllComparator::operator() (const SharedMasterPageDesc // identical in any of these values then there are thought of as // equivalent. Only the Origin has to be the same in both // descriptors. - return - mpDescriptor->meOrigin == rDescriptor->meOrigin - && ( - (!mpDescriptor->msURL.isEmpty() - && mpDescriptor->msURL == rDescriptor->msURL) - || (!mpDescriptor->msPageName.isEmpty() - && mpDescriptor->msPageName == rDescriptor->msPageName) - || (!mpDescriptor->msStyleName.isEmpty() - && mpDescriptor->msStyleName == rDescriptor->msStyleName) - || (mpDescriptor->mpMasterPage!=nullptr - && mpDescriptor->mpMasterPage==rDescriptor->mpMasterPage) - || (mpDescriptor->mpPageObjectProvider.get()!=nullptr - && rDescriptor->mpPageObjectProvider.get()!=nullptr - && mpDescriptor->mpPageObjectProvider==rDescriptor->mpPageObjectProvider)); + return mpDescriptor->meOrigin == rDescriptor->meOrigin + && ((!mpDescriptor->msURL.isEmpty() && mpDescriptor->msURL == rDescriptor->msURL) + || (!mpDescriptor->msPageName.isEmpty() + && mpDescriptor->msPageName == rDescriptor->msPageName) + || (!mpDescriptor->msStyleName.isEmpty() + && mpDescriptor->msStyleName == rDescriptor->msStyleName) + || (mpDescriptor->mpMasterPage != nullptr + && mpDescriptor->mpMasterPage == rDescriptor->mpMasterPage) + || (mpDescriptor->mpPageObjectProvider != nullptr + && rDescriptor->mpPageObjectProvider != nullptr + && mpDescriptor->mpPageObjectProvider == rDescriptor->mpPageObjectProvider)); } } diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx index abe81bd05ae3..edbd197f4342 100644 --- a/sd/source/ui/slideshow/slideshow.cxx +++ b/sd/source/ui/slideshow/slideshow.cxx @@ -948,7 +948,7 @@ void SlideShow::activate( ViewShellBase& rBase ) if( (mpFullScreenViewShellBase == &rBase) && !mxController.is() ) { ::std::shared_ptr<PresentationViewShell> pShell = std::dynamic_pointer_cast<PresentationViewShell>(rBase.GetMainViewShell()); - if(pShell.get() != nullptr) + if (pShell != nullptr) { pShell->FinishInitialization( mpFullScreenFrameView ); mpFullScreenFrameView = nullptr; diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index eef3ea1f6251..32b271647157 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -1923,7 +1923,7 @@ IMPL_LINK_NOARG(SlideshowImpl, ContextMenuHdl, void*, void) { mnContextMenuEvent = nullptr; - if( mpSlideController.get() == nullptr ) + if (mpSlideController == nullptr) return; mbWasPaused = mbIsPaused; @@ -2568,7 +2568,8 @@ sal_Int32 SAL_CALL SlideshowImpl::getCurrentSlideIndex() Reference< XDrawPage > SAL_CALL SlideshowImpl::getSlideByIndex(::sal_Int32 Index) { - if( (mpSlideController.get() == nullptr ) || (Index < 0) || (Index >= mpSlideController->getSlideIndexCount() ) ) + if ((mpSlideController == nullptr) || (Index < 0) + || (Index >= mpSlideController->getSlideIndexCount())) throw IndexOutOfBoundsException(); return mpSlideController->getSlideByNumber( mpSlideController->getSlideNumber( Index ) ); diff --git a/sd/source/ui/slideshow/slideshowviewimpl.cxx b/sd/source/ui/slideshow/slideshowviewimpl.cxx index 07dcbda5be92..c2fc2fb8f498 100644 --- a/sd/source/ui/slideshow/slideshowviewimpl.cxx +++ b/sd/source/ui/slideshow/slideshowviewimpl.cxx @@ -237,19 +237,23 @@ void SAL_CALL SlideShowView::disposing( const lang::EventObject& ) // notify all listeners that _we_ are going down (send a disposing()), // then delete listener containers: lang::EventObject const evt( static_cast<OWeakObject *>(this) ); - if (mpViewListeners.get() != nullptr) { + if (mpViewListeners != nullptr) + { mpViewListeners->disposing( evt ); mpViewListeners.reset(); } - if (mpPaintListeners.get() != nullptr) { + if (mpPaintListeners != nullptr) + { mpPaintListeners->disposing( evt ); mpPaintListeners.reset(); } - if (mpMouseListeners.get() != nullptr) { + if (mpMouseListeners != nullptr) + { mpMouseListeners->disposing( evt ); mpMouseListeners.reset(); } - if (mpMouseMotionListeners.get() != nullptr) { + if (mpMouseMotionListeners != nullptr) + { mpMouseMotionListeners->disposing( evt ); mpMouseMotionListeners.reset(); } @@ -380,7 +384,7 @@ void SAL_CALL SlideShowView::addTransformationChangedListener( const Reference< { ::osl::MutexGuard aGuard( m_aMutex ); - if( mpViewListeners.get() ) + if (mpViewListeners) mpViewListeners->addListener( xListener ); } @@ -388,7 +392,7 @@ void SAL_CALL SlideShowView::removeTransformationChangedListener( const Referenc { ::osl::MutexGuard aGuard( m_aMutex ); - if( mpViewListeners.get() ) + if (mpViewListeners) mpViewListeners->removeListener( xListener ); } @@ -396,7 +400,7 @@ void SAL_CALL SlideShowView::addPaintListener( const Reference< awt::XPaintListe { ::osl::MutexGuard aGuard( m_aMutex ); - if( mpPaintListeners.get() ) + if (mpPaintListeners) mpPaintListeners->addTypedListener( xListener ); } @@ -404,7 +408,7 @@ void SAL_CALL SlideShowView::removePaintListener( const Reference< awt::XPaintLi { ::osl::MutexGuard aGuard( m_aMutex ); - if( mpPaintListeners.get() ) + if (mpPaintListeners) mpPaintListeners->removeTypedListener( xListener ); } @@ -412,7 +416,7 @@ void SAL_CALL SlideShowView::addMouseListener( const Reference< awt::XMouseListe { ::osl::MutexGuard aGuard( m_aMutex ); - if( mpMouseListeners.get() ) + if (mpMouseListeners) mpMouseListeners->addTypedListener( xListener ); } @@ -420,7 +424,7 @@ void SAL_CALL SlideShowView::removeMouseListener( const Reference< awt::XMouseLi { ::osl::MutexGuard aGuard( m_aMutex ); - if( mpMouseListeners.get() ) + if (mpMouseListeners) mpMouseListeners->removeTypedListener( xListener ); } @@ -436,7 +440,7 @@ void SAL_CALL SlideShowView::addMouseMotionListener( const Reference< awt::XMous mxWindow->addMouseMotionListener( this ); } - if( mpMouseMotionListeners.get() ) + if (mpMouseMotionListeners) mpMouseMotionListeners->addTypedListener( xListener ); } @@ -444,7 +448,7 @@ void SAL_CALL SlideShowView::removeMouseMotionListener( const Reference< awt::XM { ::osl::MutexGuard aGuard( m_aMutex ); - if( mpMouseMotionListeners.get() ) + if (mpMouseMotionListeners) mpMouseMotionListeners->removeTypedListener( xListener ); // TODO(P1): Might be nice to deregister for mouse motion @@ -500,7 +504,7 @@ void SAL_CALL SlideShowView::windowResized( const awt::WindowEvent& e ) { ::osl::ClearableMutexGuard aGuard( m_aMutex ); - if( mpViewListeners.get() ) + if (mpViewListeners) { // Change event source, to enable listeners to match event // with view @@ -546,7 +550,7 @@ void SAL_CALL SlideShowView::mousePressed( const awt::MouseEvent& e ) aEvent.maEvent = e; aEvent.maEvent.Source = static_cast< ::cppu::OWeakObject* >( this ); - if( mpMouseListeners.get() ) + if (mpMouseListeners) mpMouseListeners->notify( aEvent ); updateimpl( aGuard, mpSlideShow ); // warning: clears guard! } @@ -569,7 +573,7 @@ void SAL_CALL SlideShowView::mouseReleased( const awt::MouseEvent& e ) aEvent.maEvent = e; aEvent.maEvent.Source = static_cast< ::cppu::OWeakObject* >( this ); - if( mpMouseListeners.get() ) + if (mpMouseListeners) mpMouseListeners->notify( aEvent ); updateimpl( aGuard, mpSlideShow ); // warning: clears guard! } @@ -586,7 +590,7 @@ void SAL_CALL SlideShowView::mouseEntered( const awt::MouseEvent& e ) aEvent.maEvent = e; aEvent.maEvent.Source = static_cast< ::cppu::OWeakObject* >( this ); - if( mpMouseListeners.get() ) + if (mpMouseListeners) mpMouseListeners->notify( aEvent ); updateimpl( aGuard, mpSlideShow ); // warning: clears guard! } @@ -602,7 +606,7 @@ void SAL_CALL SlideShowView::mouseExited( const awt::MouseEvent& e ) aEvent.maEvent = e; aEvent.maEvent.Source = static_cast< ::cppu::OWeakObject* >( this ); - if( mpMouseListeners.get() ) + if (mpMouseListeners) mpMouseListeners->notify( aEvent ); updateimpl( aGuard, mpSlideShow ); // warning: clears guard! } @@ -619,7 +623,7 @@ void SAL_CALL SlideShowView::mouseDragged( const awt::MouseEvent& e ) aEvent.maEvent = e; aEvent.maEvent.Source = static_cast< ::cppu::OWeakObject* >( this ); - if( mpMouseMotionListeners.get() ) + if (mpMouseMotionListeners) mpMouseMotionListeners->notify( aEvent ); updateimpl( aGuard, mpSlideShow ); // warning: clears guard! } @@ -635,7 +639,7 @@ void SAL_CALL SlideShowView::mouseMoved( const awt::MouseEvent& e ) aEvent.maEvent = e; aEvent.maEvent.Source = static_cast< ::cppu::OWeakObject* >( this ); - if( mpMouseMotionListeners.get() ) + if (mpMouseMotionListeners) mpMouseMotionListeners->notify( aEvent ); updateimpl( aGuard, mpSlideShow ); // warning: clears guard! } diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx index c3c2535ab22e..9cfd0867d6fc 100644 --- a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx +++ b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx @@ -59,7 +59,7 @@ public: const BitmapEx& GetMarkedPreview() const { return maMarkedPreview; } inline void SetMarkedPreview (const BitmapEx& rMarkePreview); - bool HasReplacement() const { return (mpReplacement.get() != nullptr); } + bool HasReplacement() const { return (mpReplacement != nullptr); } inline bool HasLosslessReplacement() const; void Invalidate() { mpReplacement.reset(); mpCompressor.reset(); mbIsUpToDate = false; } bool IsPrecious() const { return mbIsPrecious; } @@ -490,7 +490,7 @@ inline sal_Int32 BitmapCache::CacheEntry::GetMemorySize() const sal_Int32 nSize (0); nSize += maPreview.GetSizeBytes(); nSize += maMarkedPreview.GetSizeBytes(); - if (mpReplacement.get() != nullptr) + if (mpReplacement != nullptr) nSize += mpReplacement->GetMemorySize(); return nSize; } @@ -499,7 +499,7 @@ void BitmapCache::CacheEntry::Compress (const std::shared_ptr<BitmapCompressor>& { if ( ! maPreview.IsEmpty()) { - if (mpReplacement.get() == nullptr) + if (mpReplacement == nullptr) { mpReplacement = rpCompressor->Compress(maPreview); @@ -522,7 +522,7 @@ void BitmapCache::CacheEntry::Compress (const std::shared_ptr<BitmapCompressor>& inline void BitmapCache::CacheEntry::Decompress() { - if (mpReplacement.get()!=nullptr && mpCompressor.get()!=nullptr && maPreview.IsEmpty()) + if (mpReplacement != nullptr && mpCompressor != nullptr && maPreview.IsEmpty()) { maPreview = mpCompressor->Decompress(*mpReplacement); maMarkedPreview.SetEmpty(); @@ -551,9 +551,7 @@ inline void BitmapCache::CacheEntry::SetMarkedPreview (const BitmapEx& rMarkedPr inline bool BitmapCache::CacheEntry::HasLosslessReplacement() const { - return mpReplacement.get()!=nullptr - && mpCompressor.get()!=nullptr - && mpCompressor->IsLossless(); + return mpReplacement != nullptr && mpCompressor != nullptr && mpCompressor->IsLossless(); } } } } // end of namespace ::sd::slidesorter::cache diff --git a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx index 13f68447b4f4..9eb380a8af08 100644 --- a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx +++ b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx @@ -49,24 +49,24 @@ GenericPageCache::GenericPageCache ( GenericPageCache::~GenericPageCache() { - if (mpQueueProcessor.get() != nullptr) + if (mpQueueProcessor != nullptr) mpQueueProcessor->Stop(); maRequestQueue.Clear(); mpQueueProcessor.reset(); - if (mpBitmapCache.get() != nullptr) + if (mpBitmapCache != nullptr) PageCacheManager::Instance()->ReleaseCache(mpBitmapCache); mpBitmapCache.reset(); } void GenericPageCache::ProvideCacheAndProcessor() { - if (mpBitmapCache.get() == nullptr) + if (mpBitmapCache == nullptr) mpBitmapCache = PageCacheManager::Instance()->GetCache( mpCacheContext->GetModel(), maPreviewSize); - if (mpQueueProcessor.get() == nullptr) + if (mpQueueProcessor == nullptr) mpQueueProcessor.reset(new QueueProcessor( maRequestQueue, mpBitmapCache, @@ -87,11 +87,11 @@ void GenericPageCache::ChangePreviewSize ( "GenericPageCache<>::GetPreviewBitmap(): bitmap requested with large width. " "This may indicate an error."); - if (mpBitmapCache.get() != nullptr) + if (mpBitmapCache != nullptr) { mpBitmapCache = PageCacheManager::Instance()->ChangeSize( mpBitmapCache, maPreviewSize, rPreviewSize); - if (mpQueueProcessor.get() != nullptr) + if (mpQueueProcessor != nullptr) { mpQueueProcessor->SetPreviewSize(rPreviewSize, bDoSuperSampling); mpQueueProcessor->SetBitmapCache(mpBitmapCache); @@ -209,7 +209,7 @@ bool GenericPageCache::InvalidatePreviewBitmap (const CacheKey aKey) return pCacheManager->InvalidatePreviewBitmap( mpCacheContext->GetModel(), aKey); - else if (mpBitmapCache.get() != nullptr) + else if (mpBitmapCache != nullptr) return mpBitmapCache->InvalidateBitmap(mpCacheContext->GetPage(aKey)); else return false; @@ -265,14 +265,14 @@ void GenericPageCache::SetPreciousFlag ( void GenericPageCache::Pause() { ProvideCacheAndProcessor(); - if (mpQueueProcessor.get() != nullptr) + if (mpQueueProcessor != nullptr) mpQueueProcessor->Pause(); } void GenericPageCache::Resume() { ProvideCacheAndProcessor(); - if (mpQueueProcessor.get() != nullptr) + if (mpQueueProcessor != nullptr) mpQueueProcessor->Resume(); } diff --git a/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx b/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx index 6192c75c0576..feca2cee49a1 100644 --- a/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx +++ b/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx @@ -168,7 +168,7 @@ std::shared_ptr<PageCacheManager> PageCacheManager::Instance() ::osl::MutexGuard aGuard (::osl::Mutex::getGlobalMutex()); pInstance = mpInstance.lock(); - if (pInstance.get() == nullptr) + if (pInstance == nullptr) { pInstance = std::shared_ptr<PageCacheManager>( new PageCacheManager(), @@ -202,11 +202,11 @@ std::shared_ptr<BitmapCache> PageCacheManager::GetCache ( pResult = iCache->second; // Look for the cache in the list of recently used caches. - if (pResult.get() == nullptr) + if (pResult == nullptr) pResult = GetRecentlyUsedCache(pDocument, rPreviewSize); // Create the cache when no suitable one does exist. - if (pResult.get() == nullptr) + if (pResult == nullptr) pResult.reset(new BitmapCache()); // The cache may be newly created and thus empty or is old and may @@ -215,7 +215,7 @@ std::shared_ptr<BitmapCache> PageCacheManager::GetCache ( Recycle(pResult, pDocument,rPreviewSize); // Put the new (or old) cache into the container. - if (pResult.get() != nullptr) + if (pResult != nullptr) mpPageCaches->emplace(aKey, pResult); return pResult; @@ -280,7 +280,7 @@ std::shared_ptr<BitmapCache> PageCacheManager::ChangeSize ( { std::shared_ptr<BitmapCache> pResult; - if (rpCache.get() != nullptr) + if (rpCache != nullptr) { // Look up the given cache in the list of active caches. PageCacheContainer::iterator iCacheToChange (::std::find_if( diff --git a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx index 399a1ef7b584..3c4801926b23 100644 --- a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx +++ b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx @@ -146,8 +146,7 @@ void QueueProcessor::ProcessOneRequest ( ::osl::MutexGuard aGuard (maMutex); // Create a new preview bitmap and store it in the cache. - if (mpCache.get() != nullptr - && mpCacheContext.get() != nullptr) + if (mpCache != nullptr && mpCacheContext.get() != nullptr) { const SdPage* pSdPage = dynamic_cast<const SdPage*>(mpCacheContext->GetPage(aKey)); if (pSdPage != nullptr) diff --git a/sd/source/ui/slidesorter/cache/SlsRequestFactory.cxx b/sd/source/ui/slidesorter/cache/SlsRequestFactory.cxx index b18b585196e5..471b8b47147e 100644 --- a/sd/source/ui/slidesorter/cache/SlsRequestFactory.cxx +++ b/sd/source/ui/slidesorter/cache/SlsRequestFactory.cxx @@ -38,7 +38,7 @@ void RequestFactory::operator()( // Add the requests for the visible pages. aKeys = rpCacheContext->GetEntryList(true); - if (aKeys.get() != nullptr) + if (aKeys != nullptr) { std::vector<CacheKey>::const_iterator iKey; std::vector<CacheKey>::const_iterator iEnd (aKeys->end()); @@ -48,7 +48,7 @@ void RequestFactory::operator()( // Add the requests for the non-visible pages. aKeys = rpCacheContext->GetEntryList(false); - if (aKeys.get() != nullptr) + if (aKeys != nullptr) { std::vector<CacheKey>::const_iterator iKey; std::vector<CacheKey>::const_iterator iEnd (aKeys->end()); diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx index 52e817eba7dc..207d288c29f3 100644 --- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx +++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx @@ -213,50 +213,50 @@ model::SharedPageDescriptor SlideSorterController::GetPageAt ( PageSelector& SlideSorterController::GetPageSelector() { - OSL_ASSERT(mpPageSelector.get()!=nullptr); - return *mpPageSelector.get(); + OSL_ASSERT(mpPageSelector != nullptr); + return *mpPageSelector; } FocusManager& SlideSorterController::GetFocusManager() { - OSL_ASSERT(mpFocusManager.get()!=nullptr); - return *mpFocusManager.get(); + OSL_ASSERT(mpFocusManager != nullptr); + return *mpFocusManager; } Clipboard& SlideSorterController::GetClipboard() { - OSL_ASSERT(mpClipboard.get()!=nullptr); - return *mpClipboard.get(); + OSL_ASSERT(mpClipboard != nullptr); + return *mpClipboard; } ScrollBarManager& SlideSorterController::GetScrollBarManager() { - OSL_ASSERT(mpScrollBarManager.get()!=nullptr); - return *mpScrollBarManager.get(); + OSL_ASSERT(mpScrollBarManager != nullptr); + return *mpScrollBarManager; } std::shared_ptr<CurrentSlideManager> const & SlideSorterController::GetCurrentSlideManager() const { - OSL_ASSERT(mpCurrentSlideManager.get()!=nullptr); + OSL_ASSERT(mpCurrentSlideManager != nullptr); return mpCurrentSlideManager; } std::shared_ptr<SlotManager> const & SlideSorterController::GetSlotManager() const { - OSL_ASSERT(mpSlotManager.get()!=nullptr); + OSL_ASSERT(mpSlotManager != nullptr); return mpSlotManager; } std::shared_ptr<SelectionManager> const & SlideSorterController::GetSelectionManager() const { - OSL_ASSERT(mpSelectionManager.get()!=nullptr); + OSL_ASSERT(mpSelectionManager != nullptr); return mpSelectionManager; } std::shared_ptr<InsertionIndicatorHandler> const & SlideSorterController::GetInsertionIndicatorHandler() const { - OSL_ASSERT(mpInsertionIndicatorHandler.get()!=nullptr); + OSL_ASSERT(mpInsertionIndicatorHandler != nullptr); return mpInsertionIndicatorHandler; } diff --git a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx index 1ffe7e69c59e..31f64af88d7f 100644 --- a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx +++ b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx @@ -892,7 +892,7 @@ sal_Int8 Clipboard::ExecuteOrAcceptShapeDrop ( if (mrSlideSorter.GetViewShell() != nullptr) pDrawViewShell = std::dynamic_pointer_cast<DrawViewShell>( mrSlideSorter.GetViewShell()->GetViewShellBase().GetMainViewShell()); - if (pDrawViewShell.get() != nullptr + if (pDrawViewShell != nullptr && (pDrawViewShell->GetShellType() == ViewShell::ST_IMPRESS || pDrawViewShell->GetShellType() == ViewShell::ST_DRAW)) { diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx index 0ff831453faf..e46dd4ed1e95 100644 --- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx @@ -361,7 +361,7 @@ void SlotManager::FuSupport (SfxRequest& rRequest) { std::shared_ptr<DrawViewShell> pDrawViewShell ( std::dynamic_pointer_cast<DrawViewShell>(pBase->GetMainViewShell())); - if (pDrawViewShell.get() != nullptr) + if (pDrawViewShell != nullptr) pDrawViewShell->FuSupport(rRequest); } } @@ -706,7 +706,7 @@ void SlotManager::GetClipboardState ( SfxItemSet& rSet) { std::shared_ptr<DrawViewShell> pDrawViewShell ( std::dynamic_pointer_cast<DrawViewShell>(pBase->GetMainViewShell())); - if (pDrawViewShell.get() != nullptr) + if (pDrawViewShell != nullptr) { TransferableDataHelper aDataHelper ( TransferableDataHelper::CreateFromSystemClipboard( diff --git a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx index 10a4a8cdd18f..2965b5808eb1 100644 --- a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx +++ b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx @@ -322,7 +322,7 @@ void SlideSorterModel::ClearDescriptorList() iDescriptor!=iEnd; ++iDescriptor) { - if (iDescriptor->get() != nullptr) + if (*iDescriptor != nullptr) { if (iDescriptor->use_count() > 1) { diff --git a/sd/source/ui/slidesorter/shell/SlideSorter.cxx b/sd/source/ui/slidesorter/shell/SlideSorter.cxx index 56daffae9add..5e6520b45d2b 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorter.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorter.cxx @@ -298,8 +298,7 @@ void SlideSorter::ReleaseListeners() void SlideSorter::CreateModelViewController() { mpSlideSorterModel.reset(CreateModel()); - DBG_ASSERT (mpSlideSorterModel.get()!=nullptr, - "Can not create model for slide browser"); + DBG_ASSERT(mpSlideSorterModel != nullptr, "Can not create model for slide browser"); mpSlideSorterView.reset(new view::SlideSorterView (*this)); mpSlideSorterController.reset(new controller::SlideSorterController(*this)); diff --git a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx index 2ad22829365b..d416a3efcf9d 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx @@ -148,7 +148,7 @@ void SAL_CALL SlideSorterService::disposing (const lang::EventObject& rEvent) void SAL_CALL SlideSorterService::setCurrentPage(const Reference<drawing::XDrawPage>& rxSlide) { ThrowIfDisposed(); - if (mpSlideSorter.get() != nullptr) + if (mpSlideSorter != nullptr) mpSlideSorter->GetController().GetCurrentSlideManager()->NotifyCurrentSlideChange( mpSlideSorter->GetModel().GetIndex(rxSlide)); } @@ -156,7 +156,7 @@ void SAL_CALL SlideSorterService::setCurrentPage(const Reference<drawing::XDrawP Reference<drawing::XDrawPage> SAL_CALL SlideSorterService::getCurrentPage() { ThrowIfDisposed(); - if (mpSlideSorter.get() != nullptr) + if (mpSlideSorter != nullptr) return mpSlideSorter->GetController().GetCurrentSlideManager()->GetCurrentSlide()->GetXDrawPage(); else return nullptr; @@ -173,14 +173,14 @@ void SAL_CALL SlideSorterService::setDocumentSlides ( const Reference<container::XIndexAccess >& rxSlides) { ThrowIfDisposed(); - if (mpSlideSorter.get() != nullptr && mpSlideSorter->IsValid()) + if (mpSlideSorter != nullptr && mpSlideSorter->IsValid()) mpSlideSorter->GetController().SetDocumentSlides(rxSlides); } sal_Bool SAL_CALL SlideSorterService::getIsHighlightCurrentSlide() { ThrowIfDisposed(); - if (mpSlideSorter.get() == nullptr || ! mpSlideSorter->IsValid()) + if (mpSlideSorter == nullptr || !mpSlideSorter->IsValid()) return false; else return mpSlideSorter->GetProperties()->IsHighlightCurrentSlide(); @@ -189,7 +189,7 @@ sal_Bool SAL_CALL SlideSorterService::getIsHighlightCurrentSlide() void SAL_CALL SlideSorterService::setIsHighlightCurrentSlide (sal_Bool bValue) { ThrowIfDisposed(); - if (mpSlideSorter.get() != nullptr && mpSlideSorter->IsValid()) + if (mpSlideSorter != nullptr && mpSlideSorter->IsValid()) { mpSlideSorter->GetProperties()->SetHighlightCurrentSlide(bValue); controller::SlideSorterController::ModelChangeLock aLock (mpSlideSorter->GetController()); @@ -200,7 +200,7 @@ void SAL_CALL SlideSorterService::setIsHighlightCurrentSlide (sal_Bool bValue) sal_Bool SAL_CALL SlideSorterService::getIsShowSelection() { ThrowIfDisposed(); - if (mpSlideSorter.get() == nullptr || ! mpSlideSorter->IsValid()) + if (mpSlideSorter == nullptr || !mpSlideSorter->IsValid()) return false; else return mpSlideSorter->GetProperties()->IsShowSelection(); @@ -209,14 +209,14 @@ sal_Bool SAL_CALL SlideSorterService::getIsShowSelection() void SAL_CALL SlideSorterService::setIsShowSelection (sal_Bool bValue) { ThrowIfDisposed(); - if (mpSlideSorter.get() != nullptr && mpSlideSorter->IsValid()) + if (mpSlideSorter != nullptr && mpSlideSorter->IsValid()) mpSlideSorter->GetProperties()->SetShowSelection(bValue); } sal_Bool SAL_CALL SlideSorterService::getIsShowFocus() { ThrowIfDisposed(); - if (mpSlideSorter.get() == nullptr || ! mpSlideSorter->IsValid()) + if (mpSlideSorter == nullptr || !mpSlideSorter->IsValid()) return false; else return mpSlideSorter->GetProperties()->IsShowFocus(); @@ -225,14 +225,14 @@ sal_Bool SAL_CALL SlideSorterService::getIsShowFocus() void SAL_CALL SlideSorterService::setIsShowFocus (sal_Bool bValue) { ThrowIfDisposed(); - if (mpSlideSorter.get() != nullptr && mpSlideSorter->IsValid()) + if (mpSlideSorter != nullptr && mpSlideSorter->IsValid()) mpSlideSorter->GetProperties()->SetShowFocus(bValue); } sal_Bool SAL_CALL SlideSorterService::getIsCenterSelection() { ThrowIfDisposed(); - if (mpSlideSorter.get() == nullptr || ! mpSlideSorter->IsValid()) + if (mpSlideSorter == nullptr || !mpSlideSorter->IsValid()) return false; else return mpSlideSorter->GetProperties()->IsCenterSelection(); @@ -241,14 +241,14 @@ sal_Bool SAL_CALL SlideSorterService::getIsCenterSelection() void SAL_CALL SlideSorterService::setIsCenterSelection (sal_Bool bValue) { ThrowIfDisposed(); - if (mpSlideSorter.get() != nullptr && mpSlideSorter->IsValid()) + if (mpSlideSorter != nullptr && mpSlideSorter->IsValid()) mpSlideSorter->GetProperties()->SetCenterSelection(bValue); } sal_Bool SAL_CALL SlideSorterService::getIsSuspendPreviewUpdatesDuringFullScreenPresentation() { ThrowIfDisposed(); - if (mpSlideSorter.get() == nullptr || ! mpSlideSorter->IsValid()) + if (mpSlideSorter == nullptr || !mpSlideSorter->IsValid()) return true; else return mpSlideSorter->GetProperties() @@ -259,7 +259,7 @@ void SAL_CALL SlideSorterService::setIsSuspendPreviewUpdatesDuringFullScreenPres sal_Bool bValue) { ThrowIfDisposed(); - if (mpSlideSorter.get() != nullptr && mpSlideSorter->IsValid()) + if (mpSlideSorter != nullptr && mpSlideSorter->IsValid()) mpSlideSorter->GetProperties() ->SetSuspendPreviewUpdatesDuringFullScreenPresentation(bValue); } @@ -267,7 +267,7 @@ void SAL_CALL SlideSorterService::setIsSuspendPreviewUpdatesDuringFullScreenPres sal_Bool SAL_CALL SlideSorterService::getIsOrientationVertical() { ThrowIfDisposed(); - if (mpSlideSorter.get() == nullptr || ! mpSlideSorter->IsValid()) + if (mpSlideSorter == nullptr || !mpSlideSorter->IsValid()) return true; else return mpSlideSorter->GetView().GetOrientation() != Layouter::HORIZONTAL; @@ -276,7 +276,7 @@ sal_Bool SAL_CALL SlideSorterService::getIsOrientationVertical() void SAL_CALL SlideSorterService::setIsOrientationVertical (sal_Bool bValue) { ThrowIfDisposed(); - if (mpSlideSorter.get() != nullptr && mpSlideSorter->IsValid()) + if (mpSlideSorter != nullptr && mpSlideSorter->IsValid()) mpSlideSorter->GetView().SetOrientation(bValue ? Layouter::GRID : Layouter::HORIZONTAL); @@ -285,7 +285,7 @@ void SAL_CALL SlideSorterService::setIsOrientationVertical (sal_Bool bValue) sal_Bool SAL_CALL SlideSorterService::getIsSmoothScrolling() { ThrowIfDisposed(); - if (mpSlideSorter.get() == nullptr || ! mpSlideSorter->IsValid()) + if (mpSlideSorter == nullptr || !mpSlideSorter->IsValid()) return false; else return mpSlideSorter->GetProperties()->IsSmoothSelectionScrolling(); @@ -294,14 +294,14 @@ sal_Bool SAL_CALL SlideSorterService::getIsSmoothScrolling() void SAL_CALL SlideSorterService::setIsSmoothScrolling (sal_Bool bValue) { ThrowIfDisposed(); - if (mpSlideSorter.get() != nullptr && mpSlideSorter->IsValid()) + if (mpSlideSorter != nullptr && mpSlideSorter->IsValid()) mpSlideSorter->GetProperties()->SetSmoothSelectionScrolling(bValue); } util::Color SAL_CALL SlideSorterService::getBackgroundColor() { ThrowIfDisposed(); - if (mpSlideSorter.get() == nullptr || ! mpSlideSorter->IsValid()) + if (mpSlideSorter == nullptr || !mpSlideSorter->IsValid()) return util::Color(); else return util::Color( @@ -311,14 +311,14 @@ util::Color SAL_CALL SlideSorterService::getBackgroundColor() void SAL_CALL SlideSorterService::setBackgroundColor (util::Color aBackgroundColor) { ThrowIfDisposed(); - if (mpSlideSorter.get() != nullptr && mpSlideSorter->IsValid()) + if (mpSlideSorter != nullptr && mpSlideSorter->IsValid()) mpSlideSorter->GetProperties()->SetBackgroundColor(Color(aBackgroundColor)); } util::Color SAL_CALL SlideSorterService::getTextColor() { ThrowIfDisposed(); - if (mpSlideSorter.get() == nullptr || ! mpSlideSorter->IsValid()) + if (mpSlideSorter == nullptr || !mpSlideSorter->IsValid()) return util::Color(); else return util::Color( @@ -328,14 +328,14 @@ util::Color SAL_CALL SlideSorterService::getTextColor() void SAL_CALL SlideSorterService::setTextColor (util::Color aTextColor) { ThrowIfDisposed(); - if (mpSlideSorter.get() != nullptr && mpSlideSorter->IsValid()) + if (mpSlideSorter != nullptr && mpSlideSorter->IsValid()) mpSlideSorter->GetProperties()->SetTextColor(Color(aTextColor)); } util::Color SAL_CALL SlideSorterService::getSelectionColor() { ThrowIfDisposed(); - if (mpSlideSorter.get() == nullptr || ! mpSlideSorter->IsValid()) + if (mpSlideSorter == nullptr || !mpSlideSorter->IsValid()) return util::Color(); else return util::Color( @@ -345,14 +345,14 @@ util::Color SAL_CALL SlideSorterService::getSelectionColor() void SAL_CALL SlideSorterService::setSelectionColor (util::Color aSelectionColor) { ThrowIfDisposed(); - if (mpSlideSorter.get() != nullptr && mpSlideSorter->IsValid()) + if (mpSlideSorter != nullptr && mpSlideSorter->IsValid()) mpSlideSorter->GetProperties()->SetSelectionColor(Color(aSelectionColor)); } util::Color SAL_CALL SlideSorterService::getHighlightColor() { ThrowIfDisposed(); - if (mpSlideSorter.get() == nullptr || ! mpSlideSorter->IsValid()) + if (mpSlideSorter == nullptr || !mpSlideSorter->IsValid()) return util::Color(); else return util::Color( @@ -362,14 +362,14 @@ util::Color SAL_CALL SlideSorterService::getHighlightColor() void SAL_CALL SlideSorterService::setHighlightColor (util::Color aHighlightColor) { ThrowIfDisposed(); - if (mpSlideSorter.get() != nullptr && mpSlideSorter->IsValid()) + if (mpSlideSorter != nullptr && mpSlideSorter->IsValid()) mpSlideSorter->GetProperties()->SetHighlightColor(Color(aHighlightColor)); } sal_Bool SAL_CALL SlideSorterService::getIsUIReadOnly() { ThrowIfDisposed(); - if (mpSlideSorter.get() == nullptr || ! mpSlideSorter->IsValid()) + if (mpSlideSorter == nullptr || !mpSlideSorter->IsValid()) return true; else return mpSlideSorter->GetProperties()->IsUIReadOnly(); @@ -378,7 +378,7 @@ sal_Bool SAL_CALL SlideSorterService::getIsUIReadOnly() void SAL_CALL SlideSorterService::setIsUIReadOnly (sal_Bool bIsUIReadOnly) { ThrowIfDisposed(); - if (mpSlideSorter.get() != nullptr && mpSlideSorter->IsValid()) + if (mpSlideSorter != nullptr && mpSlideSorter->IsValid()) mpSlideSorter->GetProperties()->SetUIReadOnly(bIsUIReadOnly); } diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx index 6ffeedea6153..4811c360b4b4 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx @@ -99,7 +99,7 @@ std::shared_ptr<SlideSorterViewShell> SlideSorterViewShell::Create ( pViewShell.reset( new SlideSorterViewShell(pFrame,rViewShellBase,pParentWindow,pFrameViewArgument)); pViewShell->Initialize(); - if (pViewShell->mpSlideSorter.get() == nullptr) + if (pViewShell->mpSlideSorter == nullptr) pViewShell.reset(); } catch(Exception&) @@ -247,7 +247,7 @@ css::uno::Reference<css::accessibility::XAccessible> { // When the view is not set then the initialization is not yet complete // and we can not yet provide an accessibility object. - if (mpView == nullptr || mpSlideSorter.get() == nullptr) + if (mpView == nullptr || mpSlideSorter == nullptr) return nullptr; assert(mpSlideSorter.get()!=nullptr); @@ -329,7 +329,7 @@ SdPage* SlideSorterViewShell::GetActualPage() if ( ! IsMainViewShell()) { std::shared_ptr<ViewShell> pMainViewShell = GetViewShellBase().GetMainViewShell(); - if (pMainViewShell.get() != nullptr) + if (pMainViewShell != nullptr) pCurrentPage = pMainViewShell->GetActualPage(); } @@ -528,7 +528,7 @@ void SlideSorterViewShell::ReadFrameViewData (FrameView* pFrameView) if ( ! IsMainViewShell()) { std::shared_ptr<ViewShell> pMainViewShell = GetViewShellBase().GetMainViewShell(); - if (pMainViewShell.get() != nullptr) + if (pMainViewShell != nullptr) mpSlideSorter->GetController().GetCurrentSlideManager()->NotifyCurrentSlideChange( pMainViewShell->getCurrentPage()); } diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx b/sd/source/ui/slidesorter/view/SlideSorterView.cxx index 4c0e7af496bd..0e87021d7155 100644 --- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx +++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx @@ -220,10 +220,7 @@ sal_Int32 SlideSorterView::GetPageIndexAtPoint (const Point& rWindowPosition) co return nIndex; } -Layouter& SlideSorterView::GetLayouter() -{ - return *mpLayouter.get(); -} +Layouter& SlideSorterView::GetLayouter() { return *mpLayouter; } void SlideSorterView::ModelHasChanged() { @@ -688,7 +685,7 @@ void SlideSorterView::ConfigurationChanged ( std::shared_ptr<cache::PageCache> const & SlideSorterView::GetPreviewCache() { sd::Window *pWindow (mrSlideSorter.GetContentWindow().get()); - if (pWindow && mpPreviewCache.get() == nullptr) + if (pWindow && mpPreviewCache == nullptr) { mpPreviewCache.reset( new cache::PageCache( diff --git a/sd/source/ui/tools/PreviewRenderer.cxx b/sd/source/ui/tools/PreviewRenderer.cxx index 83812ebbe69a..c12930b10ece 100644 --- a/sd/source/ui/tools/PreviewRenderer.cxx +++ b/sd/source/ui/tools/PreviewRenderer.cxx @@ -208,7 +208,7 @@ bool PreviewRenderer::Initialize ( // Create view ProvideView (pDocShell); - if (mpView.get() == nullptr) + if (mpView == nullptr) return false; // Adjust contrast mode. @@ -390,7 +390,7 @@ void PreviewRenderer::ProvideView (DrawDocShell* pDocShell) if (mpDocShellOfView != nullptr) StartListening (*mpDocShellOfView); } - if (mpView.get() == nullptr) + if (mpView == nullptr) { mpView.reset (new DrawView (pDocShell, mpPreviewDevice.get(), nullptr)); } diff --git a/sd/source/ui/tools/TimerBasedTaskExecution.cxx b/sd/source/ui/tools/TimerBasedTaskExecution.cxx index af1b9ff6f065..379665e32f6a 100644 --- a/sd/source/ui/tools/TimerBasedTaskExecution.cxx +++ b/sd/source/ui/tools/TimerBasedTaskExecution.cxx @@ -48,7 +48,7 @@ std::shared_ptr<TimerBasedTaskExecution> TimerBasedTaskExecution::Create ( // Let the new object have a shared_ptr to itself, so that it can // release itself when the AsynchronousTask has been executed // completely. - if (pExecution->mpTask.get() != nullptr) + if (pExecution->mpTask != nullptr) pExecution->mpSelf = pExecution; return pExecution; } @@ -101,7 +101,7 @@ TimerBasedTaskExecution::~TimerBasedTaskExecution() IMPL_LINK_NOARG(TimerBasedTaskExecution, TimerCallback, Timer *, void) { - if (mpTask.get() != nullptr) + if (mpTask != nullptr) { if (mpTask->HasNextStep()) { diff --git a/sd/source/ui/unoidl/DrawController.cxx b/sd/source/ui/unoidl/DrawController.cxx index 915c804ff91e..8f7cd937efa4 100644 --- a/sd/source/ui/unoidl/DrawController.cxx +++ b/sd/source/ui/unoidl/DrawController.cxx @@ -642,14 +642,14 @@ IPropertyArrayHelper & DrawController::getInfoHelper() { SolarMutexGuard aGuard; - if (mpPropertyArrayHelper.get() == nullptr) + if (mpPropertyArrayHelper == nullptr) { ::std::vector<beans::Property> aProperties; FillPropertyTable(aProperties); mpPropertyArrayHelper.reset(new OPropertyArrayHelper(comphelper::containerToSequence(aProperties), false)); } - return *mpPropertyArrayHelper.get(); + return *mpPropertyArrayHelper; } Reference < beans::XPropertySetInfo > DrawController::getPropertySetInfo() diff --git a/sd/source/ui/unoidl/facreg.cxx b/sd/source/ui/unoidl/facreg.cxx index f506830f48ae..2da5885a34d5 100644 --- a/sd/source/ui/unoidl/facreg.cxx +++ b/sd/source/ui/unoidl/facreg.cxx @@ -47,7 +47,7 @@ namespace { static std::shared_ptr<FactoryMap> spFactoryMap; std::shared_ptr<FactoryMap> const & GetFactoryMap() { - if (spFactoryMap.get() == nullptr) + if (spFactoryMap == nullptr) { spFactoryMap.reset(new FactoryMap); (*spFactoryMap)[SdDrawingDocument_getImplementationName()] = SdDrawingDocumentFactoryId; diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx index f0513c0f16f1..5cb954286aba 100644 --- a/sd/source/ui/view/Outliner.cxx +++ b/sd/source/ui/view/Outliner.cxx @@ -450,7 +450,7 @@ bool SdOutliner::StartSearchAndReplace (const SvxSearchItem* pSearchItem) { std::shared_ptr<sd::ViewShell> pShell (pBase->GetMainViewShell()); SetViewShell(pShell); - if (pShell.get() == nullptr) + if (pShell == nullptr) bAbort = true; else switch (pShell->GetShellType()) @@ -859,7 +859,7 @@ void SdOutliner::DetectChange() std::dynamic_pointer_cast<sd::DrawViewShell>(pViewShell)); // Detect whether the view has been switched from the outside. - if (pDrawViewShell.get() != nullptr + if (pDrawViewShell != nullptr && (aPosition.meEditMode != pDrawViewShell->GetEditMode() || aPosition.mePageKind != pDrawViewShell->GetPageKind())) { @@ -962,7 +962,7 @@ void SdOutliner::RememberStartPosition() { std::shared_ptr<sd::DrawViewShell> pDrawViewShell ( std::dynamic_pointer_cast<sd::DrawViewShell>(pViewShell)); - if (pDrawViewShell.get() != nullptr) + if (pDrawViewShell != nullptr) { meStartViewMode = pDrawViewShell->GetPageKind(); meStartEditMode = pDrawViewShell->GetEditMode(); @@ -1018,7 +1018,7 @@ void SdOutliner::RestoreStartPosition() std::shared_ptr<sd::DrawViewShell> pDrawViewShell ( std::dynamic_pointer_cast<sd::DrawViewShell>(pViewShell)); SetViewMode (meStartViewMode); - if (pDrawViewShell.get() != nullptr) + if (pDrawViewShell != nullptr) { SetPage (meStartEditMode, mnStartPageIndex); mpObj = mpStartEditedObject; @@ -1332,7 +1332,7 @@ void SdOutliner::SetViewMode (PageKind ePageKind) std::shared_ptr<sd::ViewShell> pViewShell (mpWeakViewShell.lock()); std::shared_ptr<sd::DrawViewShell> pDrawViewShell( std::dynamic_pointer_cast<sd::DrawViewShell>(pViewShell)); - if (pDrawViewShell.get()!=nullptr && ePageKind != pDrawViewShell->GetPageKind()) + if (pDrawViewShell != nullptr && ePageKind != pDrawViewShell->GetPageKind()) { // Restore old edit mode. pDrawViewShell->ChangeEditMode(mpImpl->meOriginalEditMode, false); @@ -1385,8 +1385,8 @@ void SdOutliner::SetViewMode (PageKind ePageKind) // Save edit mode so that it can be restored when switching the view // shell again. pDrawViewShell = std::dynamic_pointer_cast<sd::DrawViewShell>(pViewShell); - OSL_ASSERT(pDrawViewShell.get()!=nullptr); - if (pDrawViewShell.get() != nullptr) + OSL_ASSERT(pDrawViewShell != nullptr); + if (pDrawViewShell != nullptr) mpImpl->meOriginalEditMode = pDrawViewShell->GetEditMode(); } } @@ -1398,8 +1398,8 @@ void SdOutliner::SetPage (EditMode eEditMode, sal_uInt16 nPageIndex) std::shared_ptr<sd::ViewShell> pViewShell (mpWeakViewShell.lock()); std::shared_ptr<sd::DrawViewShell> pDrawViewShell( std::dynamic_pointer_cast<sd::DrawViewShell>(pViewShell)); - OSL_ASSERT(pDrawViewShell.get()!=nullptr); - if (pDrawViewShell.get() != nullptr) + OSL_ASSERT(pDrawViewShell != nullptr); + if (pDrawViewShell != nullptr) { pDrawViewShell->ChangeEditMode(eEditMode, false); pDrawViewShell->SwitchPage(nPageIndex); @@ -1752,7 +1752,7 @@ void SdOutliner::Implementation::ProvideOutlinerView ( const std::shared_ptr<sd::ViewShell>& rpViewShell, vcl::Window* pWindow) { - if (rpViewShell.get() != nullptr) + if (rpViewShell != nullptr) { switch (rpViewShell->GetShellType()) { diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx index d82b529ea24c..cb802fd3ef9d 100644 --- a/sd/source/ui/view/ToolBarManager.cxx +++ b/sd/source/ui/view/ToolBarManager.cxx @@ -368,13 +368,13 @@ ToolBarManager::~ToolBarManager() void ToolBarManager::Shutdown() { - if (mpImpl.get() != nullptr) + if (mpImpl != nullptr) mpImpl.reset(); } void ToolBarManager::ResetToolBars (ToolBarGroup eGroup) { - if (mpImpl.get() != nullptr) + if (mpImpl != nullptr) { UpdateLock aLock (shared_from_this()); mpImpl->ResetToolBars(eGroup); @@ -383,7 +383,7 @@ void ToolBarManager::ResetToolBars (ToolBarGroup eGroup) void ToolBarManager::ResetAllToolBars() { - if (mpImpl.get() != nullptr) + if (mpImpl != nullptr) { UpdateLock aLock (shared_from_this()); mpImpl->ResetAllToolBars(); @@ -394,7 +394,7 @@ void ToolBarManager::AddToolBar ( ToolBarGroup eGroup, const OUString& rsToolBarName) { - if (mpImpl.get() != nullptr) + if (mpImpl != nullptr) { UpdateLock aLock (shared_from_this()); mpImpl->AddToolBar(eGroup,rsToolBarName); @@ -405,7 +405,7 @@ void ToolBarManager::AddToolBarShell ( ToolBarGroup eGroup, ShellId nToolBarId) { - if (mpImpl.get() != nullptr) + if (mpImpl != nullptr) { UpdateLock aLock (shared_from_this()); mpImpl->AddToolBarShell(eGroup,nToolBarId); @@ -416,7 +416,7 @@ void ToolBarManager::RemoveToolBar ( ToolBarGroup eGroup, const OUString& rsToolBarName) { - if (mpImpl.get() != nullptr) + if (mpImpl != nullptr) { UpdateLock aLock (shared_from_this()); mpImpl->RemoveToolBar(eGroup,rsToolBarName); @@ -427,7 +427,7 @@ void ToolBarManager::SetToolBar ( ToolBarGroup eGroup, const OUString& rsToolBarName) { - if (mpImpl.get() != nullptr) + if (mpImpl != nullptr) { UpdateLock aLock (shared_from_this()); mpImpl->ResetToolBars(eGroup); @@ -439,7 +439,7 @@ void ToolBarManager::SetToolBarShell ( ToolBarGroup eGroup, ShellId nToolBarId) { - if (mpImpl.get() != nullptr) + if (mpImpl != nullptr) { UpdateLock aLock (shared_from_this()); mpImpl->ResetToolBars(eGroup); @@ -449,37 +449,37 @@ void ToolBarManager::SetToolBarShell ( void ToolBarManager::PreUpdate() { - if (mpImpl.get()!=nullptr) + if (mpImpl != nullptr) mpImpl->PreUpdate(); } void ToolBarManager::RequestUpdate() { - if (mpImpl.get()!=nullptr) + if (mpImpl != nullptr) mpImpl->RequestUpdate(); } void ToolBarManager::LockViewShellManager() { - if (mpImpl.get() != nullptr) + if (mpImpl != nullptr) mpImpl->LockViewShellManager(); } void ToolBarManager::LockUpdate() { - if (mpImpl.get()!=nullptr) + if (mpImpl != nullptr) mpImpl->LockUpdate(); } void ToolBarManager::UnlockUpdate() { - if (mpImpl.get()!=nullptr) + if (mpImpl != nullptr) mpImpl->UnlockUpdate(); } void ToolBarManager::MainViewShellChanged () { - if (mpImpl.get() != nullptr) + if (mpImpl != nullptr) { mpImpl->ReleaseAllToolBarShells(); mpImpl->GetToolBarRules().MainViewShellChanged(ViewShell::ST_NONE); @@ -488,7 +488,7 @@ void ToolBarManager::MainViewShellChanged () void ToolBarManager::MainViewShellChanged (const ViewShell& rMainViewShell) { - if (mpImpl.get() != nullptr) + if (mpImpl != nullptr) { mpImpl->ReleaseAllToolBarShells(); mpImpl->GetToolBarRules().MainViewShellChanged(rMainViewShell); @@ -499,13 +499,13 @@ void ToolBarManager::SelectionHasChanged ( const ViewShell& rViewShell, const SdrView& rView) { - if (mpImpl.get() != nullptr) + if (mpImpl != nullptr) mpImpl->GetToolBarRules().SelectionHasChanged(rViewShell,rView); } void ToolBarManager::ToolBarsDestroyed() { - if (mpImpl.get() != nullptr) + if (mpImpl != nullptr) mpImpl->ToolBarsDestroyed(); } @@ -727,7 +727,7 @@ void ToolBarManager::Implementation::PostUpdate() void ToolBarManager::Implementation::LockViewShellManager() { - if (mpViewShellManagerLock.get() == nullptr) + if (mpViewShellManagerLock == nullptr) mpViewShellManagerLock.reset( new ViewShellManager::UpdateLock(mrBase.GetViewShellManager())); } @@ -740,7 +740,7 @@ void ToolBarManager::Implementation::LockUpdate() DBG_ASSERT(mnLockCount<100, "ToolBarManager lock count unusually high"); if (mnLockCount == 0) { - OSL_ASSERT(mpSynchronousLayouterLock.get()==nullptr); + OSL_ASSERT(mpSynchronousLayouterLock == nullptr); mpSynchronousLayouterLock.reset(new LayouterLock(mxLayouter)); } @@ -792,7 +792,7 @@ void ToolBarManager::Implementation::Update ( // functionality. Those that are not used anymore are // deactivated now. Those that are missing are activated in the // next step together with the view shells. - if (mpViewShellManagerLock.get() == nullptr) + if (mpViewShellManagerLock == nullptr) mpViewShellManagerLock.reset( new ViewShellManager::UpdateLock(mrBase.GetViewShellManager())); maToolBarShellList.UpdateShells( @@ -1384,7 +1384,7 @@ void ToolBarShellList::UpdateShells ( const std::shared_ptr<ViewShell>& rpMainViewShell, const std::shared_ptr<ViewShellManager>& rpManager) { - if (rpMainViewShell.get() != nullptr) + if (rpMainViewShell != nullptr) { GroupedShellList aList; diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index a01519d09661..a5c135d6e645 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -382,7 +382,7 @@ std::shared_ptr<ViewShell> ViewShellBase::GetMainViewShell() const std::shared_ptr<ViewShell> pMainViewShell ( framework::FrameworkHelper::Instance(*const_cast<ViewShellBase*>(this)) ->GetViewShell(framework::FrameworkHelper::msCenterPaneURL)); - if (pMainViewShell.get() == nullptr) + if (pMainViewShell == nullptr) pMainViewShell = framework::FrameworkHelper::Instance(*const_cast<ViewShellBase*>(this)) ->GetViewShell(framework::FrameworkHelper::msFullScreenPaneURL); return pMainViewShell; @@ -532,7 +532,7 @@ Reference<view::XRenderable> ViewShellBase::GetRenderable() SfxPrinter* ViewShellBase::GetPrinter (bool bCreate) { - OSL_ASSERT(mpImpl.get()!=nullptr); + OSL_ASSERT(mpImpl != nullptr); return GetDocShell()->GetPrinter (bCreate); } @@ -541,7 +541,7 @@ sal_uInt16 ViewShellBase::SetPrinter ( SfxPrinter* pNewPrinter, SfxPrinterChangeFlags nDiffFlags) { - OSL_ASSERT(mpImpl.get()!=nullptr); + OSL_ASSERT(mpImpl != nullptr); GetDocShell()->SetPrinter(pNewPrinter); @@ -920,8 +920,8 @@ OUString ViewShellBase::GetInitialViewShellType() std::shared_ptr<tools::EventMultiplexer> const & ViewShellBase::GetEventMultiplexer() { - OSL_ASSERT(mpImpl.get()!=nullptr); - OSL_ASSERT(mpImpl->mpEventMultiplexer.get()!=nullptr); + OSL_ASSERT(mpImpl != nullptr); + OSL_ASSERT(mpImpl->mpEventMultiplexer != nullptr); return mpImpl->mpEventMultiplexer; } @@ -933,37 +933,37 @@ const ::tools::Rectangle& ViewShellBase::getClientRectangle() const std::shared_ptr<ToolBarManager> const & ViewShellBase::GetToolBarManager() const { - OSL_ASSERT(mpImpl.get()!=nullptr); - OSL_ASSERT(mpImpl->mpToolBarManager.get()!=nullptr); + OSL_ASSERT(mpImpl != nullptr); + OSL_ASSERT(mpImpl->mpToolBarManager != nullptr); return mpImpl->mpToolBarManager; } std::shared_ptr<FormShellManager> const & ViewShellBase::GetFormShellManager() const { - OSL_ASSERT(mpImpl.get()!=nullptr); - OSL_ASSERT(mpImpl->mpFormShellManager.get()!=nullptr); + OSL_ASSERT(mpImpl != nullptr); + OSL_ASSERT(mpImpl->mpFormShellManager != nullptr); return mpImpl->mpFormShellManager; } DrawController& ViewShellBase::GetDrawController() const { - OSL_ASSERT(mpImpl.get()!=nullptr); + OSL_ASSERT(mpImpl != nullptr); return *mpImpl->mpController; } void ViewShellBase::SetViewTabBar (const ::rtl::Reference<ViewTabBar>& rViewTabBar) { - OSL_ASSERT(mpImpl.get()!=nullptr); + OSL_ASSERT(mpImpl != nullptr); mpImpl->mpViewTabBar = rViewTabBar; } vcl::Window* ViewShellBase::GetViewWindow() { - OSL_ASSERT(mpImpl.get()!=nullptr); + OSL_ASSERT(mpImpl != nullptr); return mpImpl->mpViewWindow.get(); } @@ -1438,7 +1438,7 @@ void FocusForwardingWindow::dispose() void FocusForwardingWindow::KeyInput (const KeyEvent& rKEvt) { std::shared_ptr<ViewShell> pViewShell = mrBase.GetMainViewShell(); - if (pViewShell.get() != nullptr) + if (pViewShell != nullptr) { vcl::Window* pWindow = pViewShell->GetActiveWindow(); if (pWindow != nullptr) @@ -1455,7 +1455,7 @@ void FocusForwardingWindow::KeyInput (const KeyEvent& rKEvt) void FocusForwardingWindow::Command (const CommandEvent& rEvent) { std::shared_ptr<ViewShell> pViewShell = mrBase.GetMainViewShell(); - if (pViewShell.get() != nullptr) + if (pViewShell != nullptr) { vcl::Window* pWindow = pViewShell->GetActiveWindow(); if (pWindow != nullptr) diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx index 110e752b389b..a0957f886984 100644 --- a/sd/source/ui/view/ViewShellImplementation.cxx +++ b/sd/source/ui/view/ViewShellImplementation.cxx @@ -74,7 +74,7 @@ ViewShell::Implementation::~Implementation() COVERITY_NOEXCEPT_FALSE if ( ! mpUpdateLockForMouse.expired()) { std::shared_ptr<ToolBarManagerLock> pLock(mpUpdateLockForMouse); - if (pLock.get() != nullptr) + if (pLock != nullptr) { // Force the ToolBarManagerLock to be released even when the // IsUICaptured() returns <TRUE/>. diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx index 129f7904a949..f66533ea1a84 100644 --- a/sd/source/ui/view/drviews7.cxx +++ b/sd/source/ui/view/drviews7.cxx @@ -682,7 +682,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) } else if( SfxItemState::DEFAULT == rSet.GetItemState( SID_CLIPBOARD_FORMAT_ITEMS ) ) { - if (mpCurrentClipboardFormats.get() != nullptr) + if (mpCurrentClipboardFormats != nullptr) rSet.Put(*mpCurrentClipboardFormats); } } diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx index 6fc9e12def03..d19758c1b1d7 100644 --- a/sd/source/ui/view/drviewsa.cxx +++ b/sd/source/ui/view/drviewsa.cxx @@ -747,13 +747,13 @@ void DrawViewShell::Notify (SfxBroadcaster&, const SfxHint& rHint) void DrawViewShell::ExecuteAnnotation (SfxRequest const & rRequest) { - if( mpAnnotationManager.get() ) + if (mpAnnotationManager) mpAnnotationManager->ExecuteAnnotation( rRequest ); } void DrawViewShell::GetAnnotationState (SfxItemSet& rItemSet ) { - if( mpAnnotationManager.get() ) + if (mpAnnotationManager) mpAnnotationManager->GetAnnotationState( rItemSet ); } diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx index 5df2438bd791..796f29347eed 100644 --- a/sd/source/ui/view/outlview.cxx +++ b/sd/source/ui/view/outlview.cxx @@ -136,7 +136,8 @@ OutlineView::OutlineView( DrawDocShell& rDocSh, vcl::Window* pWindow, OutlineVie */ OutlineView::~OutlineView() { - DBG_ASSERT(maDragAndDropModelGuard.get() == nullptr, "sd::OutlineView::~OutlineView(), prior drag operation not finished correctly!" ); + DBG_ASSERT(maDragAndDropModelGuard == nullptr, + "sd::OutlineView::~OutlineView(), prior drag operation not finished correctly!"); Link<tools::EventMultiplexerEvent&,void> aLink( LINK(this,OutlineView,EventMultiplexerListener) ); mrOutlineViewShell.GetViewShellBase().GetEventMultiplexer()->RemoveEventListener( aLink ); @@ -332,7 +333,7 @@ IMPL_LINK( OutlineView, ParagraphInsertedHdl, Outliner::ParagraphHdlParam, aPara { // we get calls to this handler during binary insert of drag and drop contents but // we ignore it here and handle it later in OnEndPasteOrDrop() - if( maDragAndDropModelGuard.get() == nullptr ) + if (maDragAndDropModelGuard == nullptr) { OutlineViewPageChangesGuard aGuard(this); @@ -751,7 +752,8 @@ IMPL_LINK_NOARG(OutlineView, StatusEventHdl, EditStatus&, void) IMPL_LINK_NOARG(OutlineView, BeginDropHdl, EditView*, void) { - DBG_ASSERT(maDragAndDropModelGuard.get() == nullptr, "sd::OutlineView::BeginDropHdl(), prior drag operation not finished correctly!" ); + DBG_ASSERT(maDragAndDropModelGuard == nullptr, + "sd::OutlineView::BeginDropHdl(), prior drag operation not finished correctly!"); maDragAndDropModelGuard.reset( new OutlineViewModelChangeGuard( *this ) ); } diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx index 6d1ce78e86ec..bed0ee921646 100644 --- a/sd/source/ui/view/viewshe2.cxx +++ b/sd/source/ui/view/viewshe2.cxx @@ -911,7 +911,7 @@ void ViewShell::WriteUserDataSequence ( css::uno::Sequence < css::beans::Propert // usually be the called view shell, but to be on the safe side we call // the main view shell explicitly. SfxInterfaceId nViewID (IMPRESS_FACTORY_ID); - if (GetViewShellBase().GetMainViewShell().get() != nullptr) + if (GetViewShellBase().GetMainViewShell() != nullptr) nViewID = GetViewShellBase().GetMainViewShell()->mpImpl->GetViewId(); rSequence[nIndex].Name = sUNO_View_ViewId; rSequence[nIndex].Value <<= "view" + OUString::number( static_cast<sal_uInt16>(nViewID)); diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx index 47917c01647f..0398ff0488f5 100644 --- a/sd/source/ui/view/viewshel.cxx +++ b/sd/source/ui/view/viewshel.cxx @@ -608,7 +608,7 @@ void ViewShell::MouseMove(const MouseEvent& rMEvt, ::sd::Window* pWin) { std::shared_ptr<ViewShell::Implementation::ToolBarManagerLock> pLock( mpImpl->mpUpdateLockForMouse); - if (pLock.get() != nullptr) + if (pLock != nullptr) pLock->Release(); } } @@ -665,7 +665,7 @@ void ViewShell::MouseButtonUp(const MouseEvent& rMEvt, ::sd::Window* pWin) { std::shared_ptr<ViewShell::Implementation::ToolBarManagerLock> pLock( mpImpl->mpUpdateLockForMouse); - if (pLock.get() != nullptr) + if (pLock != nullptr) pLock->Release(); } } |