diff options
Diffstat (limited to 'sd/source/ui/framework')
10 files changed, 24 insertions, 24 deletions
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); } |