diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2012-01-28 11:11:17 +0100 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2012-01-28 11:12:28 +0100 |
| commit | 7205e0c3ee52a2e5259c8f4e53bba85ee6db6bb6 (patch) | |
| tree | cd947bf07c7d7fc7d1dfd2c925234aa4e87acae0 | |
| parent | aedea4de6cc93d1dc36e06e08b0bdf18b6700e1b (diff) | |
ios: fix mis-merge
| -rw-r--r-- | vcl/inc/ios/salframe.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/inc/ios/salframe.h b/vcl/inc/ios/salframe.h index 68c4cbffa89b..b76ddfd915c9 100644 --- a/vcl/inc/ios/salframe.h +++ b/vcl/inc/ios/salframe.h @@ -139,7 +139,7 @@ public: virtual void Sync(); virtual void SetInputContext( SalInputContext* pContext ); virtual void EndExtTextInput( sal_uInt16 nFlags ); - virtual String GetKeyName( sal_uInt16 nKeyCode ); + virtual rtl::OUString GetKeyName( sal_uInt16 nKeyCode ); virtual sal_Bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode ); virtual LanguageType GetInputLanguage(); virtual SalBitmap* SnapShot(); |