diff options
| author | Caolán McNamara <cmc@openoffice.org> | 2010-04-09 09:31:27 +0100 |
|---|---|---|
| committer | Caolán McNamara <cmc@openoffice.org> | 2010-04-09 09:31:27 +0100 |
| commit | e8c667fcf38286ca9944dfca3c07b63f3939679b (patch) | |
| tree | 6f24d0de713104c869d95adf38aa9ef434d7f206 /sd/source/ui/unoidl/unodoc.cxx | |
| parent | 92005938ab0d211ac9d49afc48bf218078fb1b5e (diff) | |
| parent | e725e315399f527e63f919a9a6861066b1f41512 (diff) | |
cmcfixes74: merge with DEV300 m76
Diffstat (limited to 'sd/source/ui/unoidl/unodoc.cxx')
| -rw-r--r-- | sd/source/ui/unoidl/unodoc.cxx | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/sd/source/ui/unoidl/unodoc.cxx b/sd/source/ui/unoidl/unodoc.cxx index 48aed3ccad39..a423692caa4f 100644 --- a/sd/source/ui/unoidl/unodoc.cxx +++ b/sd/source/ui/unoidl/unodoc.cxx @@ -66,12 +66,9 @@ uno::Reference< uno::XInterface > SAL_CALL SdDrawingDocument_createInstance( SdDLL::Init(); - const SfxObjectCreateMode eCreateMode = ( _nCreationFlags & SFXMODEL_EMBEDDED_OBJECT ) ? SFX_CREATE_MODE_EMBEDDED : SFX_CREATE_MODE_STANDARD; - const bool bScriptSupport = ( _nCreationFlags & SFXMODEL_DISABLE_EMBEDDED_SCRIPTS ) == 0; - SfxObjectShell* pShell = new ::sd::GraphicDocShell( - eCreateMode, FALSE, DOCUMENT_TYPE_DRAW, bScriptSupport ); + _nCreationFlags, FALSE, DOCUMENT_TYPE_DRAW ); return uno::Reference< uno::XInterface >( pShell->GetModel() ); } @@ -98,12 +95,9 @@ uno::Reference< uno::XInterface > SAL_CALL SdPresentationDocument_createInstance SdDLL::Init(); - const SfxObjectCreateMode eCreateMode = ( _nCreationFlags & SFXMODEL_EMBEDDED_OBJECT ) ? SFX_CREATE_MODE_EMBEDDED : SFX_CREATE_MODE_STANDARD; - const bool bScriptSupport = ( _nCreationFlags & SFXMODEL_DISABLE_EMBEDDED_SCRIPTS ) == 0; - SfxObjectShell* pShell = new ::sd::DrawDocShell( - eCreateMode, FALSE, DOCUMENT_TYPE_IMPRESS, bScriptSupport ); + _nCreationFlags, FALSE, DOCUMENT_TYPE_IMPRESS ); return uno::Reference< uno::XInterface >( pShell->GetModel() ); } |