diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2009-09-16 16:17:27 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2009-09-16 16:17:27 +0000 |
| commit | 8c895561f63ed7161947a04da8e6a3d3fb195fa7 (patch) | |
| tree | 0c1c450c45fdeb8cdc550eebe3e58ae2f58e57cd /desktop/source/app/dispatchwatcher.cxx | |
| parent | cb6a7b19436d658990b582c98612d95da8d17afd (diff) | |
CWS-TOOLING: integrate CWS fwk116
2009-09-03 Mikhail Voytenko #i101453# write the default values for old entries
2009-09-03 Mikhail Voytenko #i101453# let the new default value be used
2009-09-03 Mikhail Voytenko #i101453# revert the change for xslt-transformation, the duplicate nodes should not be allowed
2009-09-03 Mikhail Voytenko #i101453# allow duplicate nodes for different modules
2009-09-03 Mikhail Voytenko #i101453# fix the special mac installation
2009-09-02 Mikhail Voytenko #i101453# correct the usage of configuration files
2009-09-02 Mikhail Voytenko #i10000# fix warning
2009-09-02 Mikhail Voytenko #i10000# fix warning
2009-09-02 Mikhail Voytenko #i96918# try to open the file for editing always
2009-09-02 Mikhail Voytenko #i51058# remove unused strings
2009-09-02 Mikhail Voytenko #i51058# remove unused strings
2009-09-01 Mikhail Voytenko #i10000# fix typo
2009-08-30 Mikhail Voytenko Rebase on DEV300_m56
2009-08-19 Mikhail Voytenko #i101732# do not generate a transparent bitmap for thumbnail
2009-08-13 Mikhail Voytenko #i101453# do not use system temporary location on Mac
2009-08-13 Mikhail Voytenko #i101453# do not use system temporary location on Mac
2009-08-07 Mikhail Voytenko #i103617# fix warning
2009-07-31 Carsten Driesner #i103924# Fix wrong number of arguments
2009-07-31 Mikhail Voytenko #i101207# integrate the patch
2009-07-31 Mikhail Voytenko #i103783# integrate the patch; get rid of CRLF
2009-07-31 Mikhail Voytenko #i97969# integrate the patch
2009-07-27 Carsten Driesner #i103423# Use correct request count in the ctor. Don't descrease value before checking the request count
Diffstat (limited to 'desktop/source/app/dispatchwatcher.cxx')
| -rw-r--r-- | desktop/source/app/dispatchwatcher.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx index 0c6de1db2225..c1dd167ea39a 100644 --- a/desktop/source/app/dispatchwatcher.cxx +++ b/desktop/source/app/dispatchwatcher.cxx @@ -122,7 +122,7 @@ DispatchWatcher* DispatchWatcher::GetDispatchWatcher() DispatchWatcher::DispatchWatcher() - : m_nRequestCount(1) + : m_nRequestCount(0) { } @@ -437,12 +437,13 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatch } ::osl::ClearableMutexGuard aGuard( GetMutex() ); - m_nRequestCount--; + bool bEmpty = (m_nRequestCount == 0); + aGuard.clear(); // No more asynchronous requests? // The requests are removed from the request container after they called back to this // implementation via statusChanged!! - if ( !m_nRequestCount && ! bNoTerminate /*m_aRequestContainer.empty()*/ ) + if ( bEmpty && !bNoTerminate /*m_aRequestContainer.empty()*/ ) { // We have to check if we have an open task otherwise we have to shutdown the office. Reference< XFramesSupplier > xTasksSupplier( xDesktop, UNO_QUERY ); |