summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2004-02-02 17:23:36 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2004-02-02 17:23:36 +0000
commit563790c2221d7e22715cdbd15aef5d6973eea140 (patch)
tree19d2c635470f996469723f3fe1b1f88e7629ba3e
parent06055f7e2897dbafb0cfadb018a7cb4e5deea497 (diff)
INTEGRATION: CWS geordi2q14 (1.15.28); FILE MERGED
2004/01/28 16:38:11 hr 1.15.28.1: #111934#: merge CWS vcl7pp1r3
-rw-r--r--vcl/source/window/mnemonic.cxx8
1 files changed, 6 insertions, 2 deletions
diff --git a/vcl/source/window/mnemonic.cxx b/vcl/source/window/mnemonic.cxx
index fb64c982ee77..ebc2ed05f200 100644
--- a/vcl/source/window/mnemonic.cxx
+++ b/vcl/source/window/mnemonic.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: mnemonic.cxx,v $
*
- * $Revision: 1.15 $
+ * $Revision: 1.16 $
*
- * last change: $Author: rt $ $Date: 2004-01-07 16:22:05 $
+ * last change: $Author: hr $ $Date: 2004-02-02 18:23:36 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -174,6 +174,10 @@ BOOL MnemonicGenerator::CreateMnemonic( XubString& rKey )
const ::com::sun::star::lang::Locale& rLocale = Application::GetSettings().GetUILocale();
uno::Reference < i18n::XCharacterClassification > xCharClass = GetCharClass();
+ // Don't crash even when we don't have access to i18n service
+ if ( !xCharClass.is() )
+ return FALSE;
+
XubString aKey = xCharClass->toUpper( rKey, 0, rKey.Len(), rLocale );
BOOL bChanged = FALSE;