summaryrefslogtreecommitdiff
path: root/sd/source/ui/presenter
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-10-16 15:23:12 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-10-17 08:25:47 +0200
commitccb2a1f650bc505f8a4f1abebf8ce4f9396562a8 (patch)
tree2ee2fd4f300ae95cf23bade1f242e02f9b276c07 /sd/source/ui/presenter
parentda5c3a1ee43dd1a07cbd1b8005488bf05432593d (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/source/ui/presenter')
-rw-r--r--sd/source/ui/presenter/PresenterCanvas.cxx2
-rw-r--r--sd/source/ui/presenter/PresenterPreviewCache.cxx12
-rw-r--r--sd/source/ui/presenter/PresenterTextView.cxx3
3 files changed, 8 insertions, 9 deletions
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));