[Libreoffice-commits] .: framework/source

[Libreoffice Gerrit user]

 framework/source/dispatch/closedispatcher.cxx |   16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

New commits:
commit 6f79b2e35be0778bfec3e1854483f2e9a68f68f3
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Tue Nov 6 14:46:04 2012 +0100

    Revert "if/else placement"
    
    This reverts commit fd1e39cad891282e4343be4d5e80125d7954b347.
    I don't see how this cosmetic change can actually affect anything,
    but tinderbox #27 seems to claim one of the unittests fails because
    of this one single commits, so let's see.

diff --git a/framework/source/dispatch/closedispatcher.cxx b/framework/source/dispatch/closedispatcher.cxx
index 95ecbff..7f9185e 100644
--- a/framework/source/dispatch/closedispatcher.cxx
+++ b/framework/source/dispatch/closedispatcher.cxx
@@ -319,21 +319,23 @@ IMPL_LINK_NOARG(CloseDispatcher, impl_asyncCallback)
     //    by others.
     if ( ! xCloseFrame->getCreator().is())
         bCloseFrame = sal_True;
+    else
 
     // b) The help window cant disagree with any request.
     //    Because it doesnt implement a controller - it uses a window only.
     //    Further t cant be the last open frame - if we do all other things
     //    right inside this CloseDispatcher implementation.
     //    => close it!
-    else if (aCheck1.m_bReferenceIsHelp)
+    if (aCheck1.m_bReferenceIsHelp)
         bCloseFrame = sal_True;
+    else
 
     // c) If we are already in "backing mode", we have to terminate
     //    the application, if this special frame is closed.
     //    It doesnt matter, how many other frames (can be the help or hidden frames only)
     //    are open then.
     //    => terminate the application!
-    else if (aCheck1.m_bReferenceIsBacking)
+    if (aCheck1.m_bReferenceIsBacking)
         bTerminateApp = sal_True;
     else
 
@@ -384,9 +386,10 @@ IMPL_LINK_NOARG(CloseDispatcher, impl_asyncCallback)
     sal_Bool bSuccess = sal_False;
     if (bCloseFrame)
         bSuccess = implts_closeFrame();
-    else if (bEstablishBackingMode)
-    {
+    else
+    if (bEstablishBackingMode)
     #if defined QUARTZ
+    {
         // on mac close down, quickstarter keeps the process alive
         // however if someone has shut down the quickstarter
         // behave as any other platform
@@ -408,11 +411,12 @@ IMPL_LINK_NOARG(CloseDispatcher, impl_asyncCallback)
         {
         }
         bSuccess = bQuickstarterRunning ? implts_terminateApplication() : implts_establishBackingMode();
+    }
     #else
         bSuccess = implts_establishBackingMode();
     #endif
-    }
-    else if (bTerminateApp)
+    else
+    if (bTerminateApp)
         bSuccess = implts_terminateApplication();
 
     if (