[Libreoffice-commits] .: 3 commits -

[Petr Mladek]

 0 files changed

New commits:
commit 3a8c74ddc47656d1d7ed3f0c133946d878e01631
Merge: 57288f9... d99c488...
Author: Petr Mladek <pmladek at suse.cz>
Date:   Fri Oct 8 22:48:34 2010 +0200

    Merge branch 'master' of ssh://pmladek@git.freedesktop.org/git/libreoffice/libs-core

commit 57288f9c94e167e93bbbc75750e0f932cc964370
Author: Petr Mladek <pmladek at suse.cz>
Date:   Fri Oct 8 15:56:13 2010 +0200

    Version 3.2.99.2, tag LIBREOFFICE_3_2_99_2 (3.3-beta2)
commit 457091536c3b3540fccc8fdc299b7eec1f3ea5c7
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Fri Oct 8 11:21:02 2010 +0100

    remove daft sleeps on start

diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx
index e2a6429..99aa634 100644
--- a/desktop/source/app/dispatchwatcher.cxx
+++ b/desktop/source/app/dispatchwatcher.cxx
@@ -88,16 +88,6 @@ struct DispatchHolder
     Reference< XDispatch > xDispatch;
 };
 
-// Temporary code
-static void impl_sleep( sal_uInt32 nSec )
-{
-    TimeValue aTime;
-    aTime.Seconds = nSec;
-    aTime.Nanosec = 0;
-
-    osl::Thread::wait( aTime );
-}
-
 static String impl_GetFilterFromExt( OUString aUrl, SfxFilterFlags nFlags,
                                         String aAppl )
 {
@@ -618,16 +608,9 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatch
     // implementation via statusChanged!!
     if ( bEmpty && !bNoTerminate /*m_aRequestContainer.empty()*/ )
     {
-        // Delay give a chance for threads to complete work
-        impl_sleep(2);
-
         // We have to check if we have an open task otherwise we have to shutdown the office.
         Reference< XFramesSupplier > xTasksSupplier( xDesktop, UNO_QUERY );
         aGuard.clear();
-
-        // Delay give a chance for threads to complete work
-        impl_sleep(1);
-
         Reference< XElementAccess > xList( xTasksSupplier->getFrames(), UNO_QUERY );
 
         if ( !xList->hasElements() )