ios: fix mis-merge

7205e0c3 · Thomas Arnhold · aedea4de · 7205e0c3
Kaydet (Commit) 7205e0c3 authored Ock 28, 2012 tarafından Thomas Arnhold
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

salframe.h vcl/inc/ios/salframe.h +1 -1

No files found.
--- 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();