vcl/inc/ios/salframe.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
New commits: commit 7205e0c3ee52a2e5259c8f4e53bba85ee6db6bb6 Author: Thomas Arnhold <tho...@arnhold.org> Date: Sat Jan 28 11:11:17 2012 +0100 ios: fix mis-merge diff --git a/vcl/inc/ios/salframe.h b/vcl/inc/ios/salframe.h index 68c4cbf..b76ddfd 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(); _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits