diff options
| author | Kurt Zenker <kz@openoffice.org> | 2007-10-09 14:21:22 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2007-10-09 14:21:22 +0000 |
| commit | fe29477dfae61d8e70ceaec563b6020301b41678 (patch) | |
| tree | 1d38948db72d88c2534c16c983301002303a3ab1 /basctl/source/basicide/baside2.cxx | |
| parent | c632299c91308e05329de793254b7fa3911eaf2c (diff) | |
INTEGRATION: CWS basmgr03 (1.41.12); FILE MERGED
2007/08/24 19:48:52 fs 1.41.12.3: RESYNC: (1.41-1.42); FILE MERGED
2007/07/27 20:45:50 fs 1.41.12.2: #i73331# disallowMacros -> allowMacros
2007/07/26 08:56:47 fs 1.41.12.1: #i73331# first steps: replace some SfxObjectShell API calls with existing UNO API equivalents
Diffstat (limited to 'basctl/source/basicide/baside2.cxx')
| -rw-r--r-- | basctl/source/basicide/baside2.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx index fec0d9a4dcaf..78756da39636 100644 --- a/basctl/source/basicide/baside2.cxx +++ b/basctl/source/basicide/baside2.cxx @@ -4,9 +4,9 @@ * * $RCSfile: baside2.cxx,v $ * - * $Revision: 1.42 $ + * $Revision: 1.43 $ * - * last change: $Author: hr $ $Date: 2007-08-03 09:57:30 $ + * last change: $Author: kz $ $Date: 2007-10-09 15:21:22 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -345,8 +345,7 @@ BOOL ModulWindow::BasicExecute() ScriptDocument aDocument( GetDocument() ); if ( aDocument.isDocument() ) { - aDocument.adjustMacroMode( ::rtl::OUString() ); - if ( aDocument.getMacroMode() == ::com::sun::star::document::MacroExecMode::NEVER_EXECUTE ) + if ( !aDocument.allowMacros() ) { WarningBox( this, WB_OK, String( IDEResId( RID_STR_CANNOTRUNMACRO ) ) ).Execute(); return FALSE; |