diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2006-05-18 09:09:13 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2006-05-18 09:09:13 +0000 |
| commit | bd217af948d598b7b6d03a885719106934357b29 (patch) | |
| tree | d713a8a5a52ca77cc67d73ef2842c182213797f6 /vcl/source/window/keycod.cxx | |
| parent | 4ead0b686e490d3d74a56659043b82f3f66ff0a2 (diff) | |
INTEGRATION: CWS wot02 (1.6.274); FILE MERGED
2006/05/15 13:13:23 pl 1.6.274.1: #135437# prevent creation of default window while already closing shop
Diffstat (limited to 'vcl/source/window/keycod.cxx')
| -rw-r--r-- | vcl/source/window/keycod.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vcl/source/window/keycod.cxx b/vcl/source/window/keycod.cxx index 59968040691b..93361a100583 100644 --- a/vcl/source/window/keycod.cxx +++ b/vcl/source/window/keycod.cxx @@ -4,9 +4,9 @@ * * $RCSfile: keycod.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: rt $ $Date: 2005-09-09 12:26:35 $ + * last change: $Author: vg $ $Date: 2006-05-18 10:09:13 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -139,7 +139,7 @@ XubString KeyCode::GetName( Window* pWindow ) const { if ( !pWindow ) pWindow = ImplGetDefaultWindow(); - return pWindow->ImplGetFrame()->GetKeyName( GetFullCode() ); + return pWindow ? pWindow->ImplGetFrame()->GetKeyName( GetFullCode() ) : XubString(); } // ----------------------------------------------------------------------- @@ -148,7 +148,7 @@ XubString KeyCode::GetSymbolName( const XubString& rFontName, Window* pWindow ) { if ( !pWindow ) pWindow = ImplGetDefaultWindow(); - return pWindow->ImplGetFrame()->GetSymbolKeyName( rFontName, GetFullCode() ); + return pWindow ? pWindow->ImplGetFrame()->GetSymbolKeyName( rFontName, GetFullCode() ) : XubString(); } // ----------------------------------------------------------------------- |