diff options
| author | Kurt Zenker <kz@openoffice.org> | 2004-01-28 13:32:51 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2004-01-28 13:32:51 +0000 |
| commit | d5bb9d22603040f791826c37cd8c732e3917be12 (patch) | |
| tree | dc6e18b7b1d8db9da188f4597efa1c75794f2c41 /framework/source/helper/persistentwindowstate.cxx | |
| parent | 78dedba232f30ccaee99688b597754907b64af21 (diff) | |
INTEGRATION: CWS filtercfg (1.3.106); FILE MERGED
2003/09/08 08:11:38 as 1.3.106.3: #102620# replace some internal classes with external helper
2003/08/21 11:14:29 as 1.3.106.2: #102620# remove code for ArgumentAnalyzer, Plugin ...; restructure include dirs; establish new shared loader source
2003/08/14 11:20:18 as 1.3.106.1: #102620# classify app module using moduleoptions instead of obsolete componentloader
Diffstat (limited to 'framework/source/helper/persistentwindowstate.cxx')
| -rw-r--r-- | framework/source/helper/persistentwindowstate.cxx | 37 |
1 files changed, 14 insertions, 23 deletions
diff --git a/framework/source/helper/persistentwindowstate.cxx b/framework/source/helper/persistentwindowstate.cxx index 89c1925c6d..e4da9cc988 100644 --- a/framework/source/helper/persistentwindowstate.cxx +++ b/framework/source/helper/persistentwindowstate.cxx @@ -2,9 +2,9 @@ * * $RCSfile: persistentwindowstate.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: ssa $ $Date: 2002-10-15 07:39:01 $ + * last change: $Author: kz $ $Date: 2004-01-28 14:32:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -63,22 +63,10 @@ // my own includes //_________________________________________________________________________________________________________________ -#ifndef __FRAMEWORK_HELPER_COMPONENTLOADER_HXX_ -#include <helper/componentloader.hxx> -#endif - #ifndef __FRAMEWORK_HELPER_PERSISTENTWINDOWSTATE_HXX_ #include <helper/persistentwindowstate.hxx> #endif -#ifndef __FRAMEWORK_CLASSES_ARGUMENTANALYZER_HXX_ -#include <classes/argumentanalyzer.hxx> -#endif - -#ifndef __FRAMEWORK_CLASSES_FILTERCACHE_HXX_ -#include <classes/filtercache.hxx> -#endif - #ifndef __FRAMEWORK_THREADHELP_WRITEGUARD_HXX_ #include <threadhelp/writeguard.hxx> #endif @@ -119,6 +107,10 @@ // other includes //_________________________________________________________________________________________________________________ +#ifndef INCLUDED_SVTOOLS_MODULEOPTIONS_HXX +#include <svtools/moduleoptions.hxx> +#endif + #ifndef _SV_WINDOW_HXX #include <vcl/window.hxx> #endif @@ -494,7 +486,7 @@ sal_Bool PersistentWindowState::implst_getFrameProps( const css::uno::Reference< SvtModuleOptions::EFactory* pModule , css::uno::Reference< css::awt::XWindow >* pContainerWindow ) { - if ( ! xFrame.is()) + if (!xFrame.is()) return sal_False; css::uno::Reference< css::awt::XWindow > xContainerWindow = xFrame->getContainerWindow(); @@ -503,18 +495,17 @@ sal_Bool PersistentWindowState::implst_getFrameProps( const css::uno::Reference< // may its an empty frame - can occure only in case first load request failed // and framework try to close this frame immediatly // But then we hav nothing to do here! - if ( ! xContainerWindow.is() || ! xController.is() ) - return sal_False; - - ::rtl::OUString sDocumentService = ComponentLoader::specifyDocServiceByDocument(xFactory,xController); - if (sDocumentService.getLength() < 1) + if ( + (!xContainerWindow.is()) || + (!xController.is() ) + ) return sal_False; - SvtModuleOptions::EFactory eModule; - if ( ! SvtModuleOptions::ClassifyFactoryByName(sDocumentService,eModule)) + css::uno::Reference< css::frame::XModel > xModel = xController->getModel(); + if (!xModel.is()) return sal_False; - *pModule = eModule; + *pModule = SvtModuleOptions::ClassifyFactoryByModel(xModel); *pContainerWindow = xContainerWindow; return sal_True; |