diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:23:02 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:31:38 +0100 |
commit | 92c697c0e3e4bde88424322875c993c161696b1e (patch) | |
tree | ea1be62a0cb8fd7f7e63dd03a52441cedd8e96eb /sd/source/ui/presenter/PresenterPreviewCache.cxx | |
parent | 65464ed0985802edb96dbcbd1c3eed996f3778bd (diff) |
loplugin:nullptr (automatic rewrite)
Change-Id: If1b80da64ba575f07b31dce9bc0e34b7eb9f11a4
Diffstat (limited to 'sd/source/ui/presenter/PresenterPreviewCache.cxx')
-rw-r--r-- | sd/source/ui/presenter/PresenterPreviewCache.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sd/source/ui/presenter/PresenterPreviewCache.cxx b/sd/source/ui/presenter/PresenterPreviewCache.cxx index 9be1ee005d37..dac0ce3baddf 100644 --- a/sd/source/ui/presenter/PresenterPreviewCache.cxx +++ b/sd/source/ui/presenter/PresenterPreviewCache.cxx @@ -102,7 +102,7 @@ void SAL_CALL PresenterPreviewCache::setDocumentSlides ( throw (RuntimeException, std::exception) { ThrowIfDisposed(); - OSL_ASSERT(mpCacheContext.get()!=NULL); + OSL_ASSERT(mpCacheContext.get()!=nullptr); mpCacheContext->SetDocumentSlides(rxSlides, rxDocument); } @@ -113,7 +113,7 @@ void SAL_CALL PresenterPreviewCache::setVisibleRange ( throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); - OSL_ASSERT(mpCacheContext.get()!=NULL); + OSL_ASSERT(mpCacheContext.get()!=nullptr); mpCacheContext->SetVisibleSlideRange (nFirstVisibleSlideIndex, nLastVisibleSlideIndex); } @@ -123,7 +123,7 @@ void SAL_CALL PresenterPreviewCache::setPreviewSize ( throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); - OSL_ASSERT(mpCache.get()!=NULL); + OSL_ASSERT(mpCache.get()!=nullptr); maPreviewSize = Size(rSize.Width, rSize.Height); mpCache->ChangeSize(maPreviewSize, Bitmap::HasFastScale()); @@ -135,18 +135,18 @@ Reference<rendering::XBitmap> SAL_CALL PresenterPreviewCache::getSlidePreview ( throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); - OSL_ASSERT(mpCacheContext.get()!=NULL); + OSL_ASSERT(mpCacheContext.get()!=nullptr); cppcanvas::CanvasSharedPtr pCanvas ( cppcanvas::VCLFactory::createCanvas(rxCanvas)); const SdrPage* pPage = mpCacheContext->GetPage(nSlideIndex); - if (pPage == NULL) + if (pPage == nullptr) throw RuntimeException(); const BitmapEx aPreview (mpCache->GetPreviewBitmap(pPage,true)); if (aPreview.IsEmpty()) - return NULL; + return nullptr; else return cppcanvas::VCLFactory::createBitmap( pCanvas, @@ -175,7 +175,7 @@ void SAL_CALL PresenterPreviewCache::pause() throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); - OSL_ASSERT(mpCache.get()!=NULL); + OSL_ASSERT(mpCache.get()!=nullptr); mpCache->Pause(); } @@ -183,7 +183,7 @@ void SAL_CALL PresenterPreviewCache::resume() throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); - OSL_ASSERT(mpCache.get()!=NULL); + OSL_ASSERT(mpCache.get()!=nullptr); mpCache->Resume(); } @@ -346,9 +346,9 @@ const SdrPage* PresenterPreviewCache::PresenterCacheContext::GetPage ( const sal_Int32 nSlideIndex) const { if ( ! mxSlides.is()) - return NULL; + return nullptr; if (nSlideIndex < 0 || nSlideIndex >= mxSlides->getCount()) - return NULL; + return nullptr; Reference<drawing::XDrawPage> xSlide (mxSlides->getByIndex(nSlideIndex), UNO_QUERY); const SdPage* pPage = SdPage::getImplementation(xSlide); |