Kaydet (Commit) fd1e39ca authored tarafından Luboš Luňák's avatar Luboš Luňák

if/else placement

Change-Id: I1f1cd86b66123f9c14423de685263f295629e4b2
üst 1f02853e
...@@ -319,23 +319,21 @@ IMPL_LINK_NOARG(CloseDispatcher, impl_asyncCallback) ...@@ -319,23 +319,21 @@ IMPL_LINK_NOARG(CloseDispatcher, impl_asyncCallback)
// by others. // by others.
if ( ! xCloseFrame->getCreator().is()) if ( ! xCloseFrame->getCreator().is())
bCloseFrame = sal_True; bCloseFrame = sal_True;
else
// b) The help window cant disagree with any request. // b) The help window cant disagree with any request.
// Because it doesnt implement a controller - it uses a window only. // 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 // Further t cant be the last open frame - if we do all other things
// right inside this CloseDispatcher implementation. // right inside this CloseDispatcher implementation.
// => close it! // => close it!
if (aCheck1.m_bReferenceIsHelp) else if (aCheck1.m_bReferenceIsHelp)
bCloseFrame = sal_True; bCloseFrame = sal_True;
else
// c) If we are already in "backing mode", we have to terminate // c) If we are already in "backing mode", we have to terminate
// the application, if this special frame is closed. // the application, if this special frame is closed.
// It doesnt matter, how many other frames (can be the help or hidden frames only) // It doesnt matter, how many other frames (can be the help or hidden frames only)
// are open then. // are open then.
// => terminate the application! // => terminate the application!
if (aCheck1.m_bReferenceIsBacking) else if (aCheck1.m_bReferenceIsBacking)
bTerminateApp = sal_True; bTerminateApp = sal_True;
else else
...@@ -386,10 +384,9 @@ IMPL_LINK_NOARG(CloseDispatcher, impl_asyncCallback) ...@@ -386,10 +384,9 @@ IMPL_LINK_NOARG(CloseDispatcher, impl_asyncCallback)
sal_Bool bSuccess = sal_False; sal_Bool bSuccess = sal_False;
if (bCloseFrame) if (bCloseFrame)
bSuccess = implts_closeFrame(); bSuccess = implts_closeFrame();
else else if (bEstablishBackingMode)
if (bEstablishBackingMode)
#if defined QUARTZ
{ {
#if defined QUARTZ
// on mac close down, quickstarter keeps the process alive // on mac close down, quickstarter keeps the process alive
// however if someone has shut down the quickstarter // however if someone has shut down the quickstarter
// behave as any other platform // behave as any other platform
...@@ -411,12 +408,11 @@ IMPL_LINK_NOARG(CloseDispatcher, impl_asyncCallback) ...@@ -411,12 +408,11 @@ IMPL_LINK_NOARG(CloseDispatcher, impl_asyncCallback)
{ {
} }
bSuccess = bQuickstarterRunning ? implts_terminateApplication() : implts_establishBackingMode(); bSuccess = bQuickstarterRunning ? implts_terminateApplication() : implts_establishBackingMode();
}
#else #else
bSuccess = implts_establishBackingMode(); bSuccess = implts_establishBackingMode();
#endif #endif
else }
if (bTerminateApp) else if (bTerminateApp)
bSuccess = implts_terminateApplication(); bSuccess = implts_terminateApplication();
if ( if (
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment