diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2020-05-28 08:26:51 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2020-05-28 09:48:09 +0200 |
| commit | e84d05483cc5f30161dc5b15f93fb3bf71ed636e (patch) | |
| tree | 2a343319cb4c1e06060b632de4fc840ba96bb70f /slideshow/source/engine | |
| parent | 412ff42bf0a6d078b9a6fd1daa8d0eb0b9a78c4a (diff) | |
Make loplugin:simplifypointertobool handle parenthesized expressions
...as discussed as an open TODO in the commit message of
fe6cce01c88d045a1fcf09acf049c34c22299b02 "Fix loplugin:simplifypointertobool for
libstdc++ std::shared_ptr". The necessary changes across the code base have
been done fully automatically with the rewriting plugin on Linux. (All those
changes apparently involve uses of macro arguments wrapped in parentheses in the
macro body, but always in conditionally-converted-to-bool contexts. In other
contexts, such automatic rewriting would add the "bool" to the macro body, which
would be wrong in general, but we apparently get away with that sloppy coding
for now.)
The parenExprs_ stack that fe6cce01c88d045a1fcf09acf049c34c22299b02 had
introduced to treat such (then-undetected, it had turned out) parenthesized
cases now turns out to not be needed after all.
Change-Id: I2021f61c2e2805be7e18b38edf8744d186cac3cb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95010
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'slideshow/source/engine')
| -rw-r--r-- | slideshow/source/engine/slideshowimpl.cxx | 2 | ||||
| -rw-r--r-- | slideshow/source/engine/slideview.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx index ebae0d83276d..9fd3d536dbce 100644 --- a/slideshow/source/engine/slideshowimpl.cxx +++ b/slideshow/source/engine/slideshowimpl.cxx @@ -1830,7 +1830,7 @@ void SlideShowImpl::removeShapeEventListener( // entry for this shape found -> remove listener from // helper object ENSURE_OR_THROW( - aIter->second.get(), + aIter->second, "SlideShowImpl::removeShapeEventListener(): " "listener map contains NULL broadcast helper" ); diff --git a/slideshow/source/engine/slideview.cxx b/slideshow/source/engine/slideview.cxx index 10398f88e13f..979ab06424fa 100644 --- a/slideshow/source/engine/slideview.cxx +++ b/slideshow/source/engine/slideview.cxx @@ -831,7 +831,7 @@ bool SlideView::updateScreen() const { osl::MutexGuard aGuard( m_aMutex ); - ENSURE_OR_RETURN_FALSE( mpCanvas.get(), + ENSURE_OR_RETURN_FALSE( mpCanvas, "SlideView::updateScreen(): Disposed" ); return mpCanvas->updateScreen( false ); @@ -841,7 +841,7 @@ bool SlideView::paintScreen() const { osl::MutexGuard aGuard( m_aMutex ); - ENSURE_OR_RETURN_FALSE( mpCanvas.get(), + ENSURE_OR_RETURN_FALSE( mpCanvas, "SlideView::paintScreen(): Disposed" ); return mpCanvas->updateScreen( true ); |