diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-03-09 09:08:49 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-03-09 09:08:49 +0000 |
| commit | 377781c09533aa4f4583e60771efc7602411016e (patch) | |
| tree | 5a5d8b310d08dc26e3526d7944f3d2ca7c17c693 /sfx2 | |
| parent | 923c67a34f4f258ed02f0601288530327f2f3fc5 (diff) | |
INTEGRATION: CWS fwkmerge1 (1.44.156); FILE MERGED
2004/02/16 15:34:35 lo 1.44.156.2: RESYNC: (1.44-1.46); FILE MERGED
2004/02/05 09:13:13 cd 1.44.156.1: #115235# Merge fix for #i17870# into SRC680
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/view/sfxbasecontroller.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx index a973efc80b88..b8b25db14bb9 100644 --- a/sfx2/source/view/sfxbasecontroller.cxx +++ b/sfx2/source/view/sfxbasecontroller.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sfxbasecontroller.cxx,v $ * - * $Revision: 1.47 $ + * $Revision: 1.48 $ * - * last change: $Author: kz $ $Date: 2004-02-25 15:48:36 $ + * last change: $Author: hr $ $Date: 2004-03-09 10:08:49 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -974,7 +974,9 @@ void SAL_CALL SfxBaseController::dispose() throw( ::com::sun::star::uno::Runtime m_pData->m_pViewShell = NULL; if ( pFrame->GetViewShell() == pShell ) { - pFrame->GetBindings().ENTERREGISTRATIONS(); + // Enter registrations only allowed if we are the owner! + if ( pFrame->GetFrame()->OwnsBindings_Impl() ) + pFrame->GetBindings().ENTERREGISTRATIONS(); pFrame->GetFrame()->SetFrameInterface_Impl( aXFrame ); pFrame->GetFrame()->DoClose_Impl(); } |