diff options
Diffstat (limited to 'framework/source/dispatch/closedispatcher.cxx')
| -rw-r--r-- | framework/source/dispatch/closedispatcher.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/framework/source/dispatch/closedispatcher.cxx b/framework/source/dispatch/closedispatcher.cxx index b49c29e2c8..4652b768e1 100644 --- a/framework/source/dispatch/closedispatcher.cxx +++ b/framework/source/dispatch/closedispatcher.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,7 +58,7 @@ #include <vcl/window.hxx> #include <vcl/svapp.hxx> #include <vos/mutex.hxx> -#include <svtools/moduleoptions.hxx> +#include <unotools/moduleoptions.hxx> //_______________________________________________ // namespace @@ -394,7 +394,7 @@ IMPL_LINK( CloseDispatcher, impl_asyncCallback, void*, EMPTYARG ) // on mac close down, quickstarter keeps the process alive // however if someone has shut down the quickstarter // behave as any other platform - + bool bQuickstarterRunning = false; // get quickstart service try @@ -429,7 +429,7 @@ IMPL_LINK( CloseDispatcher, impl_asyncCallback, void*, EMPTYARG ) if (xController.is()) xController->suspend(sal_False); } - + // inform listener sal_Int16 nState = css::frame::DispatchResultState::FAILURE; if (bSuccess) @@ -469,7 +469,7 @@ sal_Bool CloseDispatcher::implts_prepareFrameForClosing(const css::uno::Referenc // Frame already dead ... so this view is closed ... is closed ... is ... .-) if (! xFrame.is()) return sal_True; - + // Close all views to the same document ... if forced to do so. // But dont touch our own frame here! // We must do so ... because the may be following controller->suspend() @@ -481,7 +481,7 @@ sal_Bool CloseDispatcher::implts_prepareFrameForClosing(const css::uno::Referenc css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR = m_xSMGR; aReadLock.unlock(); // <- SAFE ---------------------------------- - + css::uno::Reference< css::frame::XFramesSupplier > xDesktop(xSMGR->createInstance(SERVICENAME_DESKTOP), css::uno::UNO_QUERY_THROW); FrameListAnalyzer aCheck(xDesktop, xFrame, FrameListAnalyzer::E_ALL); @@ -614,14 +614,14 @@ css::uno::Reference< css::frame::XFrame > CloseDispatcher::static_impl_searchRig return xFrame; OSL_ENSURE((sTarget.getLength() < 1), "CloseDispatch used for unexpected target. Magic things will happen now .-)"); - + css::uno::Reference< css::frame::XFrame > xTarget = xFrame; while(sal_True) { // a) top frames wil be closed if (xTarget->isTop()) return xTarget; - + // b) even child frame containing top level windows (e.g. query designer of database) will be closed css::uno::Reference< css::awt::XWindow > xWindow = xTarget->getContainerWindow(); css::uno::Reference< css::awt::XTopWindow > xTopWindowCheck(xWindow, css::uno::UNO_QUERY); @@ -640,14 +640,14 @@ css::uno::Reference< css::frame::XFrame > CloseDispatcher::static_impl_searchRig ) return xTarget; } - + // c) try to find better results on parent frame // If no parent frame exists (because this frame is used outside the desktop tree) // the given frame must be used directly. css::uno::Reference< css::frame::XFrame > xParent(xTarget->getCreator(), css::uno::UNO_QUERY); if ( ! xParent.is()) return xTarget; - + // c1) check parent frame inside next loop ... xTarget = xParent; } |