Revert ImagePreparer to plain osl::Thread, suicide in onTerminate

This amends 4ab63a3a - since osl
will still call into the object, e.g. for onTerminate. Kill
ourselves there.

Change-Id: I2e88f3a61ba32971e08d4cbb1590d3325d1c5364

sd/source/ui/remotecontrol/ImagePreparer.cxx

@@ -55,8 +55,7 @@ using namespace ::com::sun::star::uno;
 ImagePreparer::ImagePreparer(
     const uno::Reference<presentation::XSlideShowController>& rxController,
     Transmitter *aTransmitter )
- :  Thread( "ImagePreparer Thread" ),
-    xController( rxController ),
+ :  xController( rxController ),
     pTransmitter( aTransmitter )
 {
 }
@@ -65,7 +64,7 @@ ImagePreparer::~ImagePreparer()
 {
 }
 
-void ImagePreparer::execute()
+void SAL_CALL ImagePreparer::run()
 {
     sal_uInt32 aSlides = xController->getSlideCount();
     for ( sal_uInt32 i = 0; i < aSlides; i++ )
@@ -84,6 +83,10 @@ void ImagePreparer::execute()
         }
         sendNotes( i );
     }
+}
+
+void SAL_CALL ImagePreparer::onTerminated()
+{
     delete this;
 }
 

sd/source/ui/remotecontrol/ImagePreparer.hxx

@@ -9,7 +9,7 @@
 #ifndef _SD_IMPRESSREMOTE_IMAGEPREPARER_HXX
 #define _SD_IMPRESSREMOTE_IMAGEPREPARER_HXX
 
-#include <salhelper/thread.hxx>
+#include <osl/thread.hxx>
 
 #include <com/sun/star/presentation/XSlideShowController.hpp>
 
@@ -21,7 +21,7 @@ namespace sd
 {
 
 class ImagePreparer:
-    public salhelper::Thread
+    public osl::Thread
 {
 public:
     ImagePreparer( const
@@ -34,7 +34,8 @@ private:
     Transmitter *pTransmitter;
 
     // Thread method
-    void execute();
+    virtual void SAL_CALL run();
+    virtual void SAL_CALL onTerminated();
 
     void sendPreview( sal_uInt32 aSlideNumber );
     css::uno::Sequence<sal_Int8> preparePreview( sal_uInt32 aSlideNumber,