summaryrefslogtreecommitdiff
path: root/slideshow/source/engine/slideview.cxx
diff options
context:
space:
mode:
authorFrank Schoenheit [fs] <frank.schoenheit@sun.com>2010-02-19 13:52:10 +0100
committerFrank Schoenheit [fs] <frank.schoenheit@sun.com>2010-02-19 13:52:10 +0100
commitea73702eb1b6a662c430474e06fbe33c1200347c (patch)
tree6a83e697269a00f01684b36b71a0fe6abc6f3293 /slideshow/source/engine/slideview.cxx
parent02f1b698feb68c70166be96eae9f557fbf076ac2 (diff)
parentc96b2fdb508b945fc85b8cfb77c2af6f5381630c (diff)
Automated merge with ssh://hg@hg.services.openoffice.org/cws/dba33e
Diffstat (limited to 'slideshow/source/engine/slideview.cxx')
-rw-r--r--slideshow/source/engine/slideview.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/slideshow/source/engine/slideview.cxx b/slideshow/source/engine/slideview.cxx
index dcca4a51b4d7..ef1a8f98b6b2 100644
--- a/slideshow/source/engine/slideview.cxx
+++ b/slideshow/source/engine/slideview.cxx
@@ -855,7 +855,7 @@ bool SlideView::updateScreen() const
{
osl::MutexGuard aGuard( m_aMutex );
- ENSURE_OR_RETURN( mpCanvas.get(),
+ ENSURE_OR_RETURN_FALSE( mpCanvas.get(),
"SlideView::updateScreen(): Disposed" );
return mpCanvas->updateScreen( false );
@@ -865,7 +865,7 @@ bool SlideView::paintScreen() const
{
osl::MutexGuard aGuard( m_aMutex );
- ENSURE_OR_RETURN( mpCanvas.get(),
+ ENSURE_OR_RETURN_FALSE( mpCanvas.get(),
"SlideView::paintScreen(): Disposed" );
return mpCanvas->updateScreen( true );