diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-12-12 15:02:52 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-12-12 15:02:52 +0000 |
| commit | f518e0b9971b836ec5be573286c13dfba8838966 (patch) | |
| tree | 756ba8cb5ef7522240cceae3ae1b01458929d110 /svx/source/tbxctrls/fillctrl.cxx | |
| parent | d866e92fdd95b168a1c4ce63353643c6be1264ff (diff) | |
INTEGRATION: CWS impress114 (1.15.122); FILE MERGED
2006/12/04 17:27:26 cl 1.15.122.1: #134499# check SfxViewShell::Current() for zero
Diffstat (limited to 'svx/source/tbxctrls/fillctrl.cxx')
| -rw-r--r-- | svx/source/tbxctrls/fillctrl.cxx | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx index e488faae1307..1a98b7a56313 100644 --- a/svx/source/tbxctrls/fillctrl.cxx +++ b/svx/source/tbxctrls/fillctrl.cxx @@ -4,9 +4,9 @@ * * $RCSfile: fillctrl.cxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: obo $ $Date: 2006-10-12 13:20:09 $ + * last change: $Author: kz $ $Date: 2006-12-12 16:02:52 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -682,8 +682,12 @@ IMPL_LINK( FillControl, SelectFillTypeHdl, ListBox *, pBox ) pLbFillType->Selected(); // release focus - if ( pBox && pLbFillType->IsRelease() && SfxViewShell::Current()->GetWindow() ) - SfxViewShell::Current()->GetWindow()->GrabFocus(); + if ( pBox && pLbFillType->IsRelease() ) + { + SfxViewShell* pViewShell = SfxViewShell::Current(); + if( pViewShell && pViewShell->GetWindow() ) + pViewShell->GetWindow()->GrabFocus(); + } } } return 0; @@ -812,8 +816,14 @@ IMPL_LINK( FillControl, SelectFillAttrHdl, ListBox *, pBox ) } // release focus - if ( pLbFillAttr->IsRelease() && pBox && SfxViewShell::Current()->GetWindow() ) - SfxViewShell::Current()->GetWindow()->GrabFocus(); + if ( pLbFillAttr->IsRelease() && pBox ) + { + SfxViewShell* pViewShell = SfxViewShell::Current(); + if( pViewShell && pViewShell->GetWindow() ) + { + pViewShell->GetWindow()->GrabFocus(); + } + } } return 0; |