diff options
author | Kurt Zenker <kz@openoffice.org> | 2008-03-06 18:03:30 +0000 |
---|---|---|
committer | Kurt Zenker <kz@openoffice.org> | 2008-03-06 18:03:30 +0000 |
commit | a9e553b2692b47b5879037f36c57f54b009550e5 (patch) | |
tree | bb3b6e22c62a563e91dcc06bb7e779d6a57f6a91 /sw/source/ui/app/docshini.cxx | |
parent | 6679eaeee046647efd2c3efdda0b931a9e846a1b (diff) |
INTEGRATION: CWS odbmacros2 (1.61.122); FILE MERGED
2008/03/04 12:06:00 fs 1.61.122.2: RESYNC: (1.61-1.62); FILE MERGED
2007/12/12 11:10:34 fs 1.61.122.1: #i49133# non-copy-ctor now takes (defaulted) argument which allows to switch off scripting support (by calling SfxObjectShell::SetHasNoBasic)
Diffstat (limited to 'sw/source/ui/app/docshini.cxx')
-rw-r--r-- | sw/source/ui/app/docshini.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sw/source/ui/app/docshini.cxx b/sw/source/ui/app/docshini.cxx index 2b6d7a4ff2f3..7204dd86bcc3 100644 --- a/sw/source/ui/app/docshini.cxx +++ b/sw/source/ui/app/docshini.cxx @@ -2,9 +2,9 @@ * * $RCSfile: docshini.cxx,v $ * - * $Revision: 1.62 $ + * $Revision: 1.63 $ * - * last change: $Author: obo $ $Date: 2008-02-26 14:23:22 $ + * last change: $Author: kz $ $Date: 2008-03-06 19:03:30 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -498,7 +498,7 @@ sal_Bool SwDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor ) --------------------------------------------------------------------*/ -SwDocShell::SwDocShell(SfxObjectCreateMode eMode) : +SwDocShell::SwDocShell( SfxObjectCreateMode eMode, sal_Bool _bScriptingSupport ) : SfxObjectShell ( eMode ), pDoc(0), pBasePool(0), @@ -510,6 +510,8 @@ SwDocShell::SwDocShell(SfxObjectCreateMode eMode) : bInUpdateFontList(false) { RTL_LOGFILE_CONTEXT_AUTHOR( aLog, "SW", "JP93722", "SwDocShell::SwDocShell" ); + if ( !_bScriptingSupport ) + SetHasNoBasic(); Init_Impl(); } |