ooo-build r13893 - in branches/ooo-build-3-0: . patches/dev300

[thorstenb svn gnome org]

Author: thorstenb
Date: Fri Sep 12 22:25:38 2008
New Revision: 13893
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13893&view=rev

Log:
    * patches/dev300/apply:
    * patches/dev300/sdext-presenterview-thread-suicide.diff: don't
    commit suicide in thread::run, wait for thread::onTerminate
    (n#425072)



Added:
   branches/ooo-build-3-0/patches/dev300/sdext-presenterview-thread-suicide.diff
Modified:
   branches/ooo-build-3-0/ChangeLog
   branches/ooo-build-3-0/patches/dev300/apply

Modified: branches/ooo-build-3-0/patches/dev300/apply
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/apply	(original)
+++ branches/ooo-build-3-0/patches/dev300/apply	Fri Sep 12 22:25:38 2008
@@ -2612,6 +2612,7 @@
 [ Fixes ]
 svtools-update-ole.diff, n#411855, thorsten
 vcl-logical-bmp-size.diff, i#92902, thorsten
+sdext-presenterview-thread-suicide.diff, n#425072, thorsten
 
 [ Fixes < dev300-m30 < ooo300-m3 ]
 pdfimport-system-poppler-m29.diff, i#92920, cmc

Added: branches/ooo-build-3-0/patches/dev300/sdext-presenterview-thread-suicide.diff
==============================================================================
--- (empty file)
+++ branches/ooo-build-3-0/patches/dev300/sdext-presenterview-thread-suicide.diff	Fri Sep 12 22:25:38 2008
@@ -0,0 +1,42 @@
+--- sdext/source/presenter/PresenterTimer.cxx	29 Aug 2008 07:38:01 -0000	1.3.32.1
++++ sdext/source/presenter/PresenterTimer.cxx	12 Sep 2008 22:08:51 -0000
+@@ -76,7 +76,6 @@ class TimerScheduler
+ {
+ public:
+     static ::boost::shared_ptr<TimerScheduler> Instance (void);
+-    static void Release (void);
+     static SharedTimerTask CreateTimerTask (
+         const PresenterTimer::Task& rTask,
+         const TimeValue& rDueTime,
+@@ -107,12 +106,15 @@ private:
+     ::osl::Mutex maCurrentTaskMutex;
+     SharedTimerTask mpCurrentTask;
+ 
++    static void Release (void);
++
+     TimerScheduler (void);
+     virtual ~TimerScheduler (void);
+     class Deleter {public: void operator () (TimerScheduler* pScheduler) { delete pScheduler; } };
+     friend class Deleter;
+     
+     virtual void SAL_CALL run (void);
++    virtual void SAL_CALL onTerminated();
+ };
+ 
+ 
+@@ -380,11 +382,13 @@ void SAL_CALL TimerScheduler::run (void)
+             mpCurrentTask.reset();
+         }
+     }
+-
+-    Release();
+ }
+ 
+ 
++void SAL_CALL TimerScheduler::onTerminated (void)
++{
++    Release();
++}
+ 
+ 
+ bool TimerScheduler::GetCurrentTime (TimeValue& rCurrentTime)