diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-09-29 11:43:39 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-09-29 11:43:39 +0000 |
commit | 6d1129ab7c540ff2597466143042f1d0a8d5f487 (patch) | |
tree | 8d2ece8305971e6693e5804d5dd2e7023c907a51 /basic/source/classes/sbxmod.cxx | |
parent | 7f79ee6e9961a9ec1e194ecb22944709780c066a (diff) |
INTEGRATION: CWS ab17fixes (1.22.8); FILE MERGED
2005/08/23 11:35:01 ab 1.22.8.2: RESYNC: (1.22-1.23); FILE MERGED
2005/06/01 10:06:54 ab 1.22.8.1: #i48868# Block execution of previous call level
Diffstat (limited to 'basic/source/classes/sbxmod.cxx')
-rw-r--r-- | basic/source/classes/sbxmod.cxx | 72 |
1 files changed, 51 insertions, 21 deletions
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx index ed5d23ffa8..50a676412c 100644 --- a/basic/source/classes/sbxmod.cxx +++ b/basic/source/classes/sbxmod.cxx @@ -1,35 +1,61 @@ /************************************************************************* * - * OpenOffice.org - a multi-platform office productivity suite - * * $RCSfile: sbxmod.cxx,v $ * - * $Revision: 1.24 $ + * $Revision: 1.25 $ + * + * last change: $Author: hr $ $Date: 2005-09-29 12:43:39 $ + * + * The Contents of this file are made available subject to the terms of + * either of the following licenses + * + * - GNU Lesser General Public License Version 2.1 + * - Sun Industry Standards Source License Version 1.1 + * + * Sun Microsystems Inc., October, 2000 + * + * GNU Lesser General Public License Version 2.1 + * ============================================= + * Copyright 2000 by Sun Microsystems, Inc. + * 901 San Antonio Road, Palo Alto, CA 94303, USA + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1, as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + * * - * last change: $Author: rt $ $Date: 2005-09-07 21:27:07 $ + * Sun Industry Standards Source License Version 1.1 + * ================================================= + * The contents of this file are subject to the Sun Industry Standards + * Source License Version 1.1 (the "License"); You may not use this file + * except in compliance with the License. You may obtain a copy of the + * License at http://www.openoffice.org/license.html. * - * The Contents of this file are made available subject to - * the terms of GNU Lesser General Public License Version 2.1. + * Software provided under this License is provided on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, + * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, + * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. + * See the License for the specific provisions governing your rights and + * obligations concerning the Software. * + * The Initial Developer of the Original Code is: Sun Microsystems, Inc. * - * GNU Lesser General Public License Version 2.1 - * ============================================= - * Copyright 2005 by Sun Microsystems, Inc. - * 901 San Antonio Road, Palo Alto, CA 94303, USA + * Copyright: 2000 by Sun Microsystems, Inc. * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1, as published by the Free Software Foundation. + * All Rights Reserved. * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * Contributor(s): _______________________________________ * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA * ************************************************************************/ @@ -747,8 +773,12 @@ USHORT SbModule::Run( SbMethod* pMeth ) pMOD = this; SbiRuntime* pRt = new SbiRuntime( this, pMeth, pMeth->nStart ); pRt->pNext = pINST->pRun; + if( pRt->pNext ) + pRt->pNext->block(); pINST->pRun = pRt; while( pRt->Step() ) {} + if( pRt->pNext ) + pRt->pNext->unblock(); // #63710 Durch ein anderes Thread-Handling bei Events kann es passieren, // dass show-Aufruf an einem Dialog zurueckkehrt (durch schliessen des |