diff options
| author | Oliver Bolte <obo@openoffice.org> | 2007-01-23 06:14:52 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2007-01-23 06:14:52 +0000 |
| commit | 008cb21d9e5436b249201325d6cb47d43b4045f6 (patch) | |
| tree | 40a645c8c3b37dbbdf0a97be9bc73e84713c55cd | |
| parent | 1a8b3fb4024b61af655d97bae19d3adbf80a6da6 (diff) | |
INTEGRATION: CWS fwk58 (1.69.44); FILE MERGED
2006/12/06 15:36:14 mba 1.69.44.1: #i71484#: don't deactivate inplace active objects if the focus is one of its tool windows docked to the container window
| -rw-r--r-- | sfx2/source/view/sfxbasecontroller.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx index 7740b8c5a4eb..0059c16d9522 100644 --- a/sfx2/source/view/sfxbasecontroller.cxx +++ b/sfx2/source/view/sfxbasecontroller.cxx @@ -4,9 +4,9 @@ * * $RCSfile: sfxbasecontroller.cxx,v $ * - * $Revision: 1.69 $ + * $Revision: 1.70 $ * - * last change: $Author: vg $ $Date: 2006-11-01 18:29:14 $ + * last change: $Author: obo $ $Date: 2007-01-23 07:14:52 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -579,7 +579,8 @@ void SAL_CALL IMPL_SfxBaseController_ListenerHelper::frameAction( const FRAMEACT { if ( aEvent.Action == ::com::sun::star::frame::FrameAction_FRAME_UI_ACTIVATED ) { - m_pController->GetViewShell_Impl()->GetViewFrame()->MakeActive_Impl( FALSE ); + if ( !m_pController->GetViewShell_Impl()->GetUIActiveIPClient_Impl() ) + m_pController->GetViewShell_Impl()->GetViewFrame()->MakeActive_Impl( FALSE ); } else if ( aEvent.Action == ::com::sun::star::frame::FrameAction_CONTEXT_CHANGED ) { |