diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2013-12-04 15:00:36 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2013-12-04 15:00:36 +0000 |
| commit | 4bad16b2a27ba44998b107cb3cc5fdca92753ccf (patch) | |
| tree | a92426facc373d4e1962f7f6c1c675120419f60f /include | |
| parent | d1539f91810cb4b426f3c823c25ab6ac25f6283e (diff) | |
oox: render progress bar in main thread for threaded import.
Experimental only.
This avoids ,us deadlocking as the main thread tries to join it's children,
and the child threads wait to 'Yield' in the progress bar update.
Also it's generally safer to move progress reporting out of the other
threads, and to have the mainloop spinning here.
Finally this allows people to continue to use the LibreOffice suite while
large XLSX spreadsheets are loading.
Change-Id: Id41c18f3941d6fc5eea593f7cfcf6a8b7215b3f8
Diffstat (limited to 'include')
| -rw-r--r-- | include/oox/helper/progressbar.hxx | 4 | ||||
| -rw-r--r-- | include/vcl/timer.hxx | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/include/oox/helper/progressbar.hxx b/include/oox/helper/progressbar.hxx index 1f6105888b0b..cdcbd0f462e3 100644 --- a/include/oox/helper/progressbar.hxx +++ b/include/oox/helper/progressbar.hxx @@ -35,7 +35,7 @@ namespace oox { /** Interface for progress bar classes. */ -class IProgressBar +class OOX_DLLPUBLIC IProgressBar { public: virtual ~IProgressBar(); @@ -66,7 +66,7 @@ typedef ::boost::shared_ptr< ISegmentProgressBar > ISegmentProgressBarRef; /** Interface for a segment in a progress bar, that is able to create sub segments from itself. */ -class ISegmentProgressBar : public IProgressBar +class OOX_DLLPUBLIC ISegmentProgressBar : public IProgressBar { public: virtual ~ISegmentProgressBar(); diff --git a/include/vcl/timer.hxx b/include/vcl/timer.hxx index ff9a4cf5dcc0..a5b1c95b21fa 100644 --- a/include/vcl/timer.hxx +++ b/include/vcl/timer.hxx @@ -46,7 +46,8 @@ public: void Start(); void Stop(); - void SetTimeout( sal_uLong nTimeout ); + /// set the timeout in milliseconds + void SetTimeout( sal_uLong nTimeoutMs ); sal_uLong GetTimeout() const { return mnTimeout; } sal_Bool IsActive() const { return mbActive ? sal_True : sal_False; } |