diff options
Diffstat (limited to 'framework/source/loadenv/loadenv.cxx')
-rw-r--r-- | framework/source/loadenv/loadenv.cxx | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx index d131a3b6e8..9fb939e9db 100644 --- a/framework/source/loadenv/loadenv.cxx +++ b/framework/source/loadenv/loadenv.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 @@ -106,7 +106,7 @@ #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/unohlp.hxx> #endif -#include <svtools/moduleoptions.hxx> +#include <unotools/moduleoptions.hxx> #include <svtools/sfxecode.hxx> #include <unotools/processfactory.hxx> #include <comphelper/configurationhelper.hxx> @@ -252,7 +252,7 @@ css::uno::Reference< css::lang::XComponent > LoadEnv::loadComponentFromURL(const if ( pIt != lModelDescriptor.end() ) lDescriptor[::comphelper::MediaDescriptor::PROP_MACROEXECUTIONMODE()] = pIt->second; } - + return lDescriptor; } @@ -1363,7 +1363,7 @@ css::uno::Reference< css::frame::XFrame > LoadEnv::impl_searchAlreadyLoaded() // frame we referr to any hidden frame also (but as fallback only). css::uno::Reference< css::frame::XFrame > xHiddenTask; css::uno::Reference< css::frame::XFrame > xTask; - + sal_Int32 count = xTaskList->getCount(); for (sal_Int32 i=0; i<count; ++i) { @@ -1410,7 +1410,7 @@ css::uno::Reference< css::frame::XFrame > LoadEnv::impl_searchAlreadyLoaded() xTask.clear (); continue; } - + // Hidden frames are special. // They will be used as "last chance" if there is no visible frame pointing to the same model. // Safe the result but continue with current loop might be looking for other visible frames. @@ -1424,7 +1424,7 @@ css::uno::Reference< css::frame::XFrame > LoadEnv::impl_searchAlreadyLoaded() xTask.clear (); continue; } - + // We found a visible task pointing to the right model ... // Break search. break; @@ -1441,7 +1441,7 @@ css::uno::Reference< css::frame::XFrame > LoadEnv::impl_searchAlreadyLoaded() else if (xHiddenTask.is()) xResult = xHiddenTask; - + if (xResult.is()) { // Now we are shure, that this task includes the searched document. @@ -1449,11 +1449,11 @@ css::uno::Reference< css::frame::XFrame > LoadEnv::impl_searchAlreadyLoaded() // if an optional jumpmark is given too. if (m_aURL.Mark.getLength()) impl_jumpToMark(xResult, m_aURL); - + // bring it to front and make sure it's visible... impl_makeFrameWindowVisible(xResult->getContainerWindow(), sal_True); } - + aReadLock.unlock(); // <- SAFE @@ -1604,7 +1604,7 @@ css::uno::Reference< css::frame::XFrame > LoadEnv::impl_searchRecycleTarget() m_bReactivateControllerOnError = bReactivateOldControllerOnError; aWriteLock.unlock(); // <- SAFE .................................. - + // bring it to front ... impl_makeFrameWindowVisible(xTask->getContainerWindow(), sal_True); @@ -1738,7 +1738,7 @@ void LoadEnv::impl_reactForLoadingState() 16.01.2005 13:04 -----------------------------------------------*/ void LoadEnv::impl_makeFrameWindowVisible(const css::uno::Reference< css::awt::XWindow >& xWindow , - sal_Bool bForceToFront) + sal_Bool bForceToFront) { // SAFE -> ---------------------------------- ReadGuard aReadLock(m_aLock); |