diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-10-24 12:37:42 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-10-24 12:37:42 +0000 |
| commit | fc856f9503a923c04f9b441337c892c1d5a30fc7 (patch) | |
| tree | d3be6b306c634800eb8163a9e2640d880b825e6c | |
| parent | d76672509b3fabf7dd5bef53c310a24d0952266c (diff) | |
INTEGRATION: CWS impress108 (1.20.12); FILE MERGED
2006/10/05 14:29:00 af 1.20.12.1: #141146# Added bForce argument to ToolBarManagerLock::Release().
| -rw-r--r-- | sd/source/ui/view/ViewShellImplementation.cxx | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx index ab0c6677b93b..cdafe8cd7695 100644 --- a/sd/source/ui/view/ViewShellImplementation.cxx +++ b/sd/source/ui/view/ViewShellImplementation.cxx @@ -4,9 +4,9 @@ * * $RCSfile: ViewShellImplementation.cxx,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: obo $ $Date: 2006-09-16 19:33:48 $ + * last change: $Author: hr $ $Date: 2006-10-24 13:37:42 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -131,7 +131,11 @@ ViewShell::Implementation::~Implementation (void) { ::boost::shared_ptr<ToolBarManagerLock> pLock(mpUpdateLockForMouse); if (pLock.get() != NULL) - pLock->Release(); + { + // Force the ToolBarManagerLock to be released even when the + // IsUICaptured() returns <TRUE/>. + pLock->Release(true); + } } } @@ -428,11 +432,11 @@ IMPL_LINK(ViewShell::Implementation::ToolBarManagerLock,TimeoutCallback,Timer*,p -void ViewShell::Implementation::ToolBarManagerLock::Release (void) +void ViewShell::Implementation::ToolBarManagerLock::Release (bool bForce) { // If possible then release the lock now. Otherwise try again when the // timer expires. - if ( ! Application::IsUICaptured()) + if (bForce || ! Application::IsUICaptured()) mpSelf.reset(); } |