diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-03-06 17:59:14 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-03-06 17:59:14 +0000 |
| commit | 2c0be4402ab0cad638cb46491bef78633ffbfdd2 (patch) | |
| tree | aba95f8c965e84f051c4a6d9ca647f6c5e886467 /sd | |
| parent | a19463e3da06b1f91007092cf2518d92a5267363 (diff) | |
INTEGRATION: CWS odbmacros2 (1.12.178); FILE MERGED
2007/12/22 13:38:14 fs 1.12.178.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:15:44 fs 1.12.178.1: #i49133# allow creating text 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 'sd')
| -rw-r--r-- | sd/source/ui/unoidl/facreg.cxx | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/sd/source/ui/unoidl/facreg.cxx b/sd/source/ui/unoidl/facreg.cxx index ea34a840209c..30b9af34fa13 100644 --- a/sd/source/ui/unoidl/facreg.cxx +++ b/sd/source/ui/unoidl/facreg.cxx @@ -4,9 +4,9 @@ * * $RCSfile: facreg.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: rt $ $Date: 2007-04-03 16:25:27 $ + * last change: $Author: kz $ $Date: 2008-03-06 18:59:14 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -47,6 +47,10 @@ #include <uno/lbnames.h> #endif +#ifndef SFX2_SFXMODELFACTORY_HXX +#include <sfx2/sfxmodelfactory.hxx> +#endif + #ifndef _OSL_DIAGNOSE_H_ #include "osl/diagnose.h" #endif @@ -67,11 +71,11 @@ using namespace com::sun::star; // Forward declarations of the factories. -extern uno::Reference< uno::XInterface > SAL_CALL SdDrawingDocument_createInstance( const uno::Reference< lang::XMultiServiceFactory > & _rxFactory ); +extern uno::Reference< uno::XInterface > SAL_CALL SdDrawingDocument_createInstance( const uno::Reference< lang::XMultiServiceFactory > & _rxFactory, const sal_uInt64 _nCreationFlags ); extern OUString SdDrawingDocument_getImplementationName() throw( uno::RuntimeException ); extern uno::Sequence< OUString > SAL_CALL SdDrawingDocument_getSupportedServiceNames() throw( uno::RuntimeException ); -extern uno::Reference< uno::XInterface > SAL_CALL SdPresentationDocument_createInstance( const uno::Reference< lang::XMultiServiceFactory > & _rxFactory ); +extern uno::Reference< uno::XInterface > SAL_CALL SdPresentationDocument_createInstance( const uno::Reference< lang::XMultiServiceFactory > & _rxFactory, const sal_uInt64 _nCreationFlags ); extern OUString SdPresentationDocument_getImplementationName() throw( uno::RuntimeException ); extern uno::Sequence< OUString > SAL_CALL SdPresentationDocument_getSupportedServiceNames() throw( uno::RuntimeException ); @@ -364,7 +368,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( break; case SdDrawingDocumentFactory: - xFactory = ::cppu::createSingleFactory( + xFactory = ::sfx2::createSfxModelFactory( xMSF, SdDrawingDocument_getImplementationName(), SdDrawingDocument_createInstance, @@ -372,7 +376,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( break; case SdPresentationDocumentFactory: - xFactory = ::cppu::createSingleFactory( + xFactory = ::sfx2::createSfxModelFactory( xMSF, SdPresentationDocument_getImplementationName(), SdPresentationDocument_createInstance, |