summaryrefslogtreecommitdiff
path: root/vcl/unx
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2003-08-25 12:55:20 +0000
committerKurt Zenker <kz@openoffice.org>2003-08-25 12:55:20 +0000
commit93bff1fd4724222e96f5d0483990af337bbeaf28 (patch)
tree99120c371069141516f0bce1af2dc1341387d4bb /vcl/unx
parentd8a0d3560687cd6a340c9d0627f949777af1aeba (diff)
INTEGRATION: CWS vcl15 (1.7.78); FILE MERGED
2003/07/24 15:19:43 pl 1.7.78.1: #i6044# merge from vcl7pp1r1
Diffstat (limited to 'vcl/unx')
-rw-r--r--vcl/unx/source/app/keysymnames.cxx6
1 files changed, 4 insertions, 2 deletions
diff --git a/vcl/unx/source/app/keysymnames.cxx b/vcl/unx/source/app/keysymnames.cxx
index 9131a54ee58e..157a8f447c44 100644
--- a/vcl/unx/source/app/keysymnames.cxx
+++ b/vcl/unx/source/app/keysymnames.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: keysymnames.cxx,v $
*
- * $Revision: 1.8 $
+ * $Revision: 1.9 $
*
- * last change: $Author: hjs $ $Date: 2003-08-18 15:15:31 $
+ * last change: $Author: kz $ $Date: 2003-08-25 13:55:20 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -652,6 +652,8 @@ const char* SalDisplay::GetKeyboardName( BOOL bRefresh )
XkbFreeKeyboard( pXkbDesc, 0, True );
}
}
+ if( ! m_aKeyboardName.Len() )
+ m_aKeyboardName = "<unknown keyboard>";
#endif
}
return m_aKeyboardName.GetBuffer();