incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From o..@apache.org
Subject svn commit: r1346816 - in /incubator/ooo/branches/AOO34: ./ main/sd/source/ui/slideshow/slideshowimpl.cxx
Date Wed, 06 Jun 2012 10:44:22 GMT
Author: orw
Date: Wed Jun  6 10:44:21 2012
New Revision: 1346816

URL: http://svn.apache.org/viewvc?rev=1346816&view=rev
Log:
#118879# - merge fix from trunk into branch AOO34

Modified:
    incubator/ooo/branches/AOO34/   (props changed)
    incubator/ooo/branches/AOO34/main/sd/source/ui/slideshow/slideshowimpl.cxx

Propchange: incubator/ooo/branches/AOO34/
------------------------------------------------------------------------------
  Merged /incubator/ooo/trunk:r1341841

Modified: incubator/ooo/branches/AOO34/main/sd/source/ui/slideshow/slideshowimpl.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/AOO34/main/sd/source/ui/slideshow/slideshowimpl.cxx?rev=1346816&r1=1346815&r2=1346816&view=diff
==============================================================================
--- incubator/ooo/branches/AOO34/main/sd/source/ui/slideshow/slideshowimpl.cxx (original)
+++ incubator/ooo/branches/AOO34/main/sd/source/ui/slideshow/slideshowimpl.cxx Wed Jun  6
10:44:21 2012
@@ -1907,10 +1907,20 @@ IMPL_LINK( SlideshowImpl, PostYieldListe
 {
     Application::EnableNoYieldMode(false);
     Application::RemovePostYieldListener(LINK(this, SlideshowImpl, PostYieldListener));
+
     if (mbDisposed)
         return 0;
+
+    // Call Reschedule() but make sure that we are not destroyed during its
+    // execution (we still can be disposed, though.)
+    const rtl::Reference<SlideshowImpl> pSelf (this);
     Application::Reschedule(true);
-    return updateSlideShow();
+
+    // Update the slide show if we are still alive.
+    if ( ! mbDisposed)
+        return updateSlideShow();
+    else
+        return 0;
 }
 
 



Mime
View raw message