diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2003-05-15 09:54:37 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2003-05-15 09:54:37 +0000 |
| commit | 72ebade2e13469bae103ef8ba0ec6a3c98141ed6 (patch) | |
| tree | e9f9c9c57d755aaa709114022d6d0f5edb5c31ce | |
| parent | e077ddc74d207c67d68e491740df8f670262daf8 (diff) | |
INTEGRATION: CWS fwk02 (1.41.8); FILE MERGED
2003/05/07 10:18:08 mba 1.41.8.1: #i14041#: don't allow to close a view when a macro is running
| -rw-r--r-- | sfx2/source/view/sfxbasecontroller.cxx | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx index d5cd6a77459d..40f434944380 100644 --- a/sfx2/source/view/sfxbasecontroller.cxx +++ b/sfx2/source/view/sfxbasecontroller.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sfxbasecontroller.cxx,v $ * - * $Revision: 1.41 $ + * $Revision: 1.42 $ * - * last change: $Author: vg $ $Date: 2003-04-24 17:24:41 $ + * last change: $Author: vg $ $Date: 2003-05-15 10:54:37 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -136,6 +136,10 @@ #include <cppuhelper/implbase1.hxx> #endif +#ifndef _SB_SBSTAR_HXX //autogen +#include <basic/sbstar.hxx> +#endif + #ifndef _UNO_MAPPING_HXX_ #include <uno/mapping.hxx> #endif @@ -711,6 +715,10 @@ sal_Bool SAL_CALL SfxBaseController::suspend( sal_Bool bSuspend ) throw( ::com:: if ( m_pData->m_pViewShell->PrepareClose() ) { + if ( StarBASIC::IsRunning() ) + // don't allow closing the document via UI while a macro is running + return FALSE; + if ( getFrame().is() ) getFrame()->removeFrameActionListener( m_pData->m_xListener ) ; SfxViewFrame* pActFrame = m_pData->m_pViewShell->GetFrame() ; |