diff options
| -rw-r--r-- | toolkit/source/awt/vclxwindow.cxx | 2 | ||||
| -rw-r--r-- | vcl/inc/vcl/svapp.hxx | 25 |
2 files changed, 4 insertions, 23 deletions
diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx index 819c6d4d1b01..76eab5bf0e37 100644 --- a/toolkit/source/awt/vclxwindow.cxx +++ b/toolkit/source/awt/vclxwindow.cxx @@ -310,7 +310,7 @@ IMPL_LINK( VCLXWindowImpl, OnProcessCallbacks, void*, EMPTYARG ) } { - SolarMutexReleaser aReleaseSolar( SolarMutexReleaser::RescheduleDuringAcquire ); + SolarMutexReleaser aReleaseSolar; for ( CallbackArray::const_iterator loop = aCallbacksCopy.begin(); loop != aCallbacksCopy.end(); ++loop diff --git a/vcl/inc/vcl/svapp.hxx b/vcl/inc/vcl/svapp.hxx index ba33ee2109ee..2c26c55e33d7 100644 --- a/vcl/inc/vcl/svapp.hxx +++ b/vcl/inc/vcl/svapp.hxx @@ -531,32 +531,13 @@ protected: class SolarMutexReleaser { sal_uLong mnReleased; - const bool mbRescheduleDuringAcquire; + public: - enum - { - RescheduleDuringAcquire = true - }; - SolarMutexReleaser( const bool i_rescheduleDuringAcquire = false ) - : mnReleased( Application::ReleaseSolarMutex()) - , mbRescheduleDuringAcquire( i_rescheduleDuringAcquire ) - { - } + SolarMutexReleaser(): mnReleased(Application::ReleaseSolarMutex()) {} ~SolarMutexReleaser() { - if ( mnReleased > 0 ) - { - if ( mbRescheduleDuringAcquire ) - { - while ( !Application::GetSolarMutex().tryToAcquire() ) - { - Application::Reschedule(); - } - --mnReleased; - } - Application::AcquireSolarMutex( mnReleased ); - } + Application::AcquireSolarMutex( mnReleased ); } }; |