diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2013-01-28 20:03:20 +1100 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2013-01-29 09:45:24 +0000 |
| commit | dad7a304cbf58d24180e57091140b9f53a48a9b9 (patch) | |
| tree | 3dce7a13c264300c2fb4d3424374a456047e5c6c /sd/source/ui/remotecontrol/ImagePreparer.hxx | |
| parent | b91a02c539b107231555e551bda340dcab105e88 (diff) | |
fdo#59881 - sdremote: give up on threaded / UNO usage.
Process incoming commands in the main thread in a Timeout, build
thumbnail / previews there too - to avoid the deadlocks mentioned
in the bug.
The following commits got squashed into one:
(cherry picked from commit f07efaa3bbeb6c2160d6ccbe83ea4183df7115a3)
(cherry picked from commit 88cb36db72775c116c4721163763beb1b2ec0ea3)
(cherry picked from commit 9b696a67f92c7206fe947996931995a70229752e)
Change-Id: I7e825228fcc7ba4e1c40a161c29a0f9a371abdfb
Signed-off-by: Thorsten Behrens <tbehrens@suse.com>
Reviewed-on: https://gerrit.libreoffice.org/1915
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Reviewed-by: Petr Mladek <pmladek@suse.cz>
Tested-by: Petr Mladek <pmladek@suse.cz>
Diffstat (limited to 'sd/source/ui/remotecontrol/ImagePreparer.hxx')
| -rw-r--r-- | sd/source/ui/remotecontrol/ImagePreparer.hxx | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sd/source/ui/remotecontrol/ImagePreparer.hxx b/sd/source/ui/remotecontrol/ImagePreparer.hxx index aa013d766c16..66b30aeeee4c 100644 --- a/sd/source/ui/remotecontrol/ImagePreparer.hxx +++ b/sd/source/ui/remotecontrol/ImagePreparer.hxx @@ -10,7 +10,7 @@ #define _SD_IMPRESSREMOTE_IMAGEPREPARER_HXX #include <osl/thread.hxx> - +#include <vcl/timer.hxx> #include <com/sun/star/presentation/XSlideShowController.hpp> #include "Transmitter.hxx" @@ -18,9 +18,9 @@ namespace sd { -class ImagePreparer: - public osl::Thread +class ImagePreparer : Timer { + sal_uInt32 mnSendingSlide; public: ImagePreparer( const css::uno::Reference<css::presentation::XSlideShowController>& @@ -31,9 +31,7 @@ private: css::uno::Reference<css::presentation::XSlideShowController> xController; Transmitter *pTransmitter; - // Thread method - virtual void SAL_CALL run(); - virtual void SAL_CALL onTerminated(); + virtual void Timeout(); void sendPreview( sal_uInt32 aSlideNumber ); css::uno::Sequence<sal_Int8> preparePreview( sal_uInt32 aSlideNumber, |