diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-03-06 17:45:24 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-03-06 17:45:24 +0000 |
| commit | 301c6a1557e9eb26e1cb195b52d40e3904da0ea8 (patch) | |
| tree | c67ee8e64e0be5cfb68a3529b1552cc9a5da1c11 /starmath | |
| parent | 586eda8a7f07306014cdcfb4bfa70976ff20d9da (diff) | |
INTEGRATION: CWS odbmacros2 (1.12.60); FILE MERGED
2007/12/22 13:39:56 fs 1.12.60.2: during #i49133#: extended the previous change (per AS' request) so the factory method does not take two booleans, but a 64 bit field instead
2007/12/12 11:22:56 fs 1.12.60.1: #i49133# allow creating documents which do not support scripting.
For this purpose, use a DocShell ctor which allows disabling scripting,
plus a service factory creator (::sfx2::createSfxModelFacrtory instead
of ::cppu::createSingleFactory) which extracts this setting from the
arguments given to createInstanceWithArguments
Diffstat (limited to 'starmath')
| -rw-r--r-- | starmath/source/register.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/starmath/source/register.cxx b/starmath/source/register.cxx index faed9311742d..4d4df00f599d 100644 --- a/starmath/source/register.cxx +++ b/starmath/source/register.cxx @@ -4,9 +4,9 @@ * * $RCSfile: register.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: vg $ $Date: 2007-05-25 12:14:48 $ + * last change: $Author: kz $ $Date: 2008-03-06 18:45:24 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -49,6 +49,8 @@ #include <rtl/ustring.hxx> #endif +#include <sfx2/sfxmodelfactory.hxx> + #include "smdll.hxx" #include "document.hxx" #include "unomodel.hxx" @@ -64,7 +66,7 @@ extern Sequence< OUString > SAL_CALL extern OUString SAL_CALL SmDocument_getImplementationName() throw(); extern Reference< XInterface >SAL_CALL - SmDocument_createInstance(const Reference< XMultiServiceFactory > & rSMgr) throw( Exception ); + SmDocument_createInstance(const Reference< XMultiServiceFactory > & rSMgr, const sal_uInt64 _nCreationFlags) throw( Exception ); //MathML import extern Sequence< OUString > SAL_CALL @@ -310,7 +312,7 @@ void* SAL_CALL component_getFactory( const sal_Char* pImplementationName, else if( SmDocument_getImplementationName().equalsAsciiL( pImplementationName, strlen(pImplementationName)) ) { - xFactory = ::cppu::createSingleFactory( xServiceManager, + xFactory = ::sfx2::createSfxModelFactory( xServiceManager, SmDocument_getImplementationName(), SmDocument_createInstance, SmDocument_getSupportedServiceNames() ); |