diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-12-12 15:04:01 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-12-12 15:04:01 +0000 |
| commit | 18911977821901cea2d686b12df7eb41ac0c949e (patch) | |
| tree | ebb466953d91e333d9f8e67be121e019af015ebb /svx/source/tbxctrls/lboxctrl.cxx | |
| parent | 08418549326b13bb30549328f6408b3cb6e0ca14 (diff) | |
INTEGRATION: CWS impress114 (1.25.122); FILE MERGED
2006/12/04 17:27:27 cl 1.25.122.1: #134499# check SfxViewShell::Current() for zero
Diffstat (limited to 'svx/source/tbxctrls/lboxctrl.cxx')
| -rw-r--r-- | svx/source/tbxctrls/lboxctrl.cxx | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/svx/source/tbxctrls/lboxctrl.cxx b/svx/source/tbxctrls/lboxctrl.cxx index ff564d89cc5a..862ca94b4870 100644 --- a/svx/source/tbxctrls/lboxctrl.cxx +++ b/svx/source/tbxctrls/lboxctrl.cxx @@ -4,9 +4,9 @@ * * $RCSfile: lboxctrl.cxx,v $ * - * $Revision: 1.25 $ + * $Revision: 1.26 $ * - * last change: $Author: obo $ $Date: 2006-10-12 13:21:47 $ + * last change: $Author: kz $ $Date: 2006-12-12 16:04:01 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -180,9 +180,12 @@ void SvxPopupWindowListBox::PopupModeEnd() SfxPopupWindow::PopupModeEnd(); //FloatingWindow::PopupModeEnd(); - Window* pShellWnd = SfxViewShell::Current()->GetWindow(); - if (pShellWnd) - pShellWnd->GrabFocus(); + if( SfxViewShell::Current() ) + { + Window* pShellWnd = SfxViewShell::Current()->GetWindow(); + if (pShellWnd) + pShellWnd->GrabFocus(); + } } |