diff options
author | Xisco Fauli <anistenis@gmail.com> | 2011-03-29 22:09:35 +0200 |
---|---|---|
committer | Christina Rossmanith <ChrRossmanith@web.de> | 2011-03-29 22:10:18 +0200 |
commit | 1c9e7d47bef1aeb53cb74a8b24cff33ab5fbc692 (patch) | |
tree | 4a51efe48b8563e5f8f7934a64e85a8aa8094464 /framework/source/loadenv | |
parent | 151837450c0bb64ea9e1738d2d3086d823aebd77 (diff) |
Remove commented code in libs-core/framework
Diffstat (limited to 'framework/source/loadenv')
-rwxr-xr-x | framework/source/loadenv/loadenv.cxx | 136 |
1 files changed, 24 insertions, 112 deletions
diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx index 267c31399fba..e4f73e58c16f 100755 --- a/framework/source/loadenv/loadenv.cxx +++ b/framework/source/loadenv/loadenv.cxx @@ -149,9 +149,7 @@ class LoadEnvListener : private ThreadHelpBase throw(css::uno::RuntimeException); }; -/*----------------------------------------------- - 14.10.2003 13:43 ------------------------------------------------*/ + LoadEnv::LoadEnv(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR) throw(LoadEnvException, css::uno::RuntimeException) : ThreadHelpBase( ) @@ -161,17 +159,13 @@ LoadEnv::LoadEnv(const css::uno::Reference< css::lang::XMultiServiceFactory >& x { } -/*----------------------------------------------- - 14.10.2003 13:43 ------------------------------------------------*/ + LoadEnv::~LoadEnv() { m_pCheck = 0; } -/*----------------------------------------------- - 10.09.2003 14:05 ------------------------------------------------*/ + css::uno::Reference< css::lang::XComponent > LoadEnv::loadComponentFromURL(const css::uno::Reference< css::frame::XComponentLoader >& xLoader, const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR , const ::rtl::OUString& sURL , @@ -241,9 +235,7 @@ css::uno::Reference< css::lang::XComponent > LoadEnv::loadComponentFromURL(const return lDescriptor; } -/*----------------------------------------------- - 20.08.2003 09:49 ------------------------------------------------*/ + void LoadEnv::initializeLoading(const ::rtl::OUString& sURL , const css::uno::Sequence< css::beans::PropertyValue >& lMediaDescriptor, const css::uno::Reference< css::frame::XFrame >& xBaseFrame , @@ -326,9 +318,7 @@ void LoadEnv::initializeLoading(const ::rtl::OUString& // <- SAFE ---------------------------------- } -/*----------------------------------------------- - 22.01.2010 ------------------------------------------------*/ + void LoadEnv::initializeUIDefaults( const css::uno::Reference< css::lang::XMultiServiceFactory >& i_rSMGR, ::comphelper::MediaDescriptor& io_lMediaDescriptor, const bool i_bUIMode, QuietInteraction** o_ppQuietInteraction ) @@ -377,9 +367,7 @@ void LoadEnv::initializeUIDefaults( const css::uno::Reference< css::lang::XMulti io_lMediaDescriptor[::comphelper::MediaDescriptor::PROP_UPDATEDOCMODE()] <<= nUpdateMode; } -/*----------------------------------------------- - 15.08.2003 08:16 ------------------------------------------------*/ + void LoadEnv::startLoading() throw(LoadEnvException, css::uno::RuntimeException) { @@ -430,7 +418,6 @@ void LoadEnv::startLoading() } /*----------------------------------------------- - 15.08.2003 09:50 TODO First draft does not implement timeout using [ms]. Current implementation counts yield calls only ... @@ -471,9 +458,7 @@ sal_Bool LoadEnv::waitWhileLoading(sal_uInt32 nTimeout) // <- SAFE ---------------------------------- } -/*----------------------------------------------- - 20.08.2003 10:00 ------------------------------------------------*/ + void LoadEnv::cancelLoading() throw(LoadEnvException, css::uno::RuntimeException) { @@ -515,9 +500,7 @@ void LoadEnv::cancelLoading() // <- PARTIAL(!) SAFE ------------------------------ } -/*----------------------------------------------- - 14.08.2003 13:33 ------------------------------------------------*/ + css::uno::Reference< css::frame::XFrame > LoadEnv::getTarget() const { // SAFE -> @@ -526,9 +509,7 @@ css::uno::Reference< css::frame::XFrame > LoadEnv::getTarget() const // <- SAFE } -/*----------------------------------------------- - 14.08.2003 13:35 ------------------------------------------------*/ + css::uno::Reference< css::lang::XComponent > LoadEnv::getTargetComponent() const { // SAFE -> @@ -549,9 +530,7 @@ css::uno::Reference< css::lang::XComponent > LoadEnv::getTargetComponent() const // <- SAFE } -/*----------------------------------------------- - 15.08.2003 11:15 ------------------------------------------------*/ + void SAL_CALL LoadEnvListener::loadFinished(const css::uno::Reference< css::frame::XFrameLoader >&) throw(css::uno::RuntimeException) { @@ -566,9 +545,7 @@ void SAL_CALL LoadEnvListener::loadFinished(const css::uno::Reference< css::fram // <- SAFE ---------------------------------- } -/*----------------------------------------------- - 14.10.2003 12:23 ------------------------------------------------*/ + void SAL_CALL LoadEnvListener::loadCancelled(const css::uno::Reference< css::frame::XFrameLoader >&) throw(css::uno::RuntimeException) { @@ -583,9 +560,7 @@ void SAL_CALL LoadEnvListener::loadCancelled(const css::uno::Reference< css::fra // <- SAFE ---------------------------------- } -/*----------------------------------------------- - 14.10.2003 12:23 ------------------------------------------------*/ + void SAL_CALL LoadEnvListener::dispatchFinished(const css::frame::DispatchResultEvent& aEvent) throw(css::uno::RuntimeException) { @@ -615,9 +590,7 @@ void SAL_CALL LoadEnvListener::dispatchFinished(const css::frame::DispatchResult // <- SAFE ---------------------------------- } -/*----------------------------------------------- - 14.10.2003 12:24 ------------------------------------------------*/ + void SAL_CALL LoadEnvListener::disposing(const css::lang::EventObject&) throw(css::uno::RuntimeException) { @@ -632,9 +605,7 @@ void SAL_CALL LoadEnvListener::disposing(const css::lang::EventObject&) // <- SAFE ---------------------------------- } -/*----------------------------------------------- - 14.10.2003 12:20 ------------------------------------------------*/ + void LoadEnv::impl_setResult(sal_Bool bResult) { // SAFE -> ---------------------------------- @@ -654,7 +625,6 @@ void LoadEnv::impl_setResult(sal_Bool bResult) } /*----------------------------------------------- - 06.02.2004 14:03 TODO: Is it a good idea to change Sequence<> parameter to stl-adapter? -----------------------------------------------*/ @@ -743,17 +713,6 @@ LoadEnv::EContentType LoadEnv::classifyContent(const ::rtl::OUString& css::uno::Reference< css::container::XEnumeration > xSet ; css::uno::Sequence< ::rtl::OUString > lTypesReg(1); - /* - //------------------------------------------- - lQuery[0].Name = ::framework::constant::Filter::PROP_TYPE; - lQuery[0].Value <<= sType; - - xContainer = css::uno::Reference< css::container::XContainerQuery >(xSMGR->createInstance(SERVICENAME_FILTERFACTORY), css::uno::UNO_QUERY); - xSet = xContainer->createSubSetEnumerationByProperties(lQuery); - // at least one registered frame loader is enough! - if (xSet->hasMoreElements()) - return E_CAN_BE_LOADED; - */ //------------------------------------------- // (iii) If a FrameLoader service (or at least @@ -811,9 +770,7 @@ LoadEnv::EContentType LoadEnv::classifyContent(const ::rtl::OUString& return E_UNSUPPORTED_CONTENT; } -/*----------------------------------------------- - 03.11.2003 09:31 ------------------------------------------------*/ + void LoadEnv::impl_detectTypeAndFilter() throw(LoadEnvException, css::uno::RuntimeException) { @@ -918,9 +875,7 @@ void LoadEnv::impl_detectTypeAndFilter() } } -/*----------------------------------------------- - 15.08.2003 09:38 ------------------------------------------------*/ + sal_Bool LoadEnv::impl_handleContent() throw(LoadEnvException, css::uno::RuntimeException) { @@ -1209,9 +1164,7 @@ sal_Bool LoadEnv::impl_loadContent() return sal_False; } -/*----------------------------------------------- - 06.02.2004 14:40 ------------------------------------------------*/ + css::uno::Reference< css::uno::XInterface > LoadEnv::impl_searchLoader() { // SAFE -> ----------------------------------- @@ -1277,9 +1230,7 @@ css::uno::Reference< css::uno::XInterface > LoadEnv::impl_searchLoader() return css::uno::Reference< css::uno::XInterface >(); } -/*----------------------------------------------- - 24.01.2006 15:11 ------------------------------------------------*/ + void LoadEnv::impl_jumpToMark(const css::uno::Reference< css::frame::XFrame >& xFrame, const css::util::URL& aURL ) { @@ -1311,9 +1262,7 @@ void LoadEnv::impl_jumpToMark(const css::uno::Reference< css::frame::XFrame >& x xDispatcher->dispatch(aCmd, lArgs.getAsConstPropertyValueList()); } -/*----------------------------------------------- - 31.07.2003 09:02 ------------------------------------------------*/ + css::uno::Reference< css::frame::XFrame > LoadEnv::impl_searchAlreadyLoaded() throw(LoadEnvException, css::uno::RuntimeException) { @@ -1459,9 +1408,7 @@ css::uno::Reference< css::frame::XFrame > LoadEnv::impl_searchAlreadyLoaded() return xResult; } -/*----------------------------------------------- - 30.03.2004 09:12 ------------------------------------------------*/ + sal_Bool LoadEnv::impl_isFrameAlreadyUsedForLoading(const css::uno::Reference< css::frame::XFrame >& xFrame) const { css::uno::Reference< css::document::XActionLockable > xLock(xFrame, css::uno::UNO_QUERY); @@ -1476,9 +1423,7 @@ sal_Bool LoadEnv::impl_isFrameAlreadyUsedForLoading(const css::uno::Reference< c return xLock->isActionLocked(); } -/*----------------------------------------------- - 30.03.2004 09:12 ------------------------------------------------*/ + css::uno::Reference< css::frame::XFrame > LoadEnv::impl_searchRecycleTarget() throw(LoadEnvException, css::uno::RuntimeException) { @@ -1610,9 +1555,7 @@ css::uno::Reference< css::frame::XFrame > LoadEnv::impl_searchRecycleTarget() return xTask; } -/*----------------------------------------------- - 15.08.2003 12:39 ------------------------------------------------*/ + void LoadEnv::impl_reactForLoadingState() throw(LoadEnvException, css::uno::RuntimeException) { @@ -1731,9 +1674,7 @@ void LoadEnv::impl_reactForLoadingState() // <- SAFE ---------------------------------- } -/*----------------------------------------------- - 16.01.2005 13:04 ------------------------------------------------*/ + void LoadEnv::impl_makeFrameWindowVisible(const css::uno::Reference< css::awt::XWindow >& xWindow , sal_Bool bForceToFront) { @@ -1761,38 +1702,9 @@ void LoadEnv::impl_makeFrameWindowVisible(const css::uno::Reference< css::awt::X else pWindow->Show(sal_True, (bForceFrontAndFocus || bForceToFront) ? SHOW_FOREGROUNDTASK : 0 ); } - -/* #i19976# - We tried to prevent a toFront() call in case the user putted the - loading document into the background .. - But we had several errors trying that. So we decided to - rollback these changes and bring the new loaded document to front hardly ! - - css::uno::Reference< css::awt::XWindow2 > xWindow2(xWindow, css::uno::UNO_QUERY); - - sal_Bool bIsVisible = sal_False; - if (xWindow2.is()) - bIsVisible = xWindow2->isVisible(); // TODO is parent visible too ? .-) - - if (!bIsVisible) - { - xWindow->setVisible(sal_True); - bForceToFront = sal_True; - } - - if ( - (bForceToFront ) && - (xTopWindow.is()) - ) - { - xTopWindow->toFront(); - } -*/ } -/*----------------------------------------------- - 15.03.2005 11:12 ------------------------------------------------*/ + void LoadEnv::impl_applyPersistentWindowState(const css::uno::Reference< css::awt::XWindow >& xWindow) { static ::rtl::OUString PACKAGE_SETUP_MODULES(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup/Office/Factories")); |