diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2006-08-04 08:53:33 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2006-08-04 08:53:33 +0000 |
| commit | 51e0dee1baacdae1d0111ba02ec4885d1af59821 (patch) | |
| tree | 8e31b36a08d6fcc13a7f135497076fbfd96362ec /vcl/source/window/window.cxx | |
| parent | 86ef4422bc62f912f72c0bedda47ce0e6e2722e4 (diff) | |
INTEGRATION: CWS onlineupdate3 (1.238.24); FILE MERGED
2006/07/26 06:31:45 dv 1.238.24.1: Added null pointer check in GetSystemWindow()
Diffstat (limited to 'vcl/source/window/window.cxx')
| -rw-r--r-- | vcl/source/window/window.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 39e291b261c2..e8594e32d273 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -4,9 +4,9 @@ * * $RCSfile: window.cxx,v $ * - * $Revision: 1.240 $ + * $Revision: 1.241 $ * - * last change: $Author: ihi $ $Date: 2006-08-01 09:29:55 $ + * last change: $Author: ihi $ $Date: 2006-08-04 09:53:33 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -5586,7 +5586,7 @@ SystemWindow* Window::GetSystemWindow() const DBG_CHKTHIS( Window, ImplDbgCheckWindow ); const Window* pWin = this; - while ( !pWin->IsSystemWindow() ) + while ( pWin && !pWin->IsSystemWindow() ) pWin = pWin->GetParent(); return (SystemWindow*)pWin; } |