From b2abb97a6545096d6952430f7ff37cadb1a23707 Mon Sep 17 00:00:00 2001 From: krishna keshav Date: Thu, 2 Jun 2016 21:55:44 +0530 Subject: [PATCH] tdf#96099 Reduce number of typedefs used for trivial container types Change-Id: Iecf8052d3f7ec5593205184622d53550e6a52161 Reviewed-on: https://gerrit.libreoffice.org/25836 Tested-by: Jenkins Reviewed-by: Akshay Deep --- filter/source/msfilter/msvbahelper.cxx | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/filter/source/msfilter/msvbahelper.cxx b/filter/source/msfilter/msvbahelper.cxx index d831ed0f11e1..a06eb5ceb1fc 100644 --- a/filter/source/msfilter/msvbahelper.cxx +++ b/filter/source/msfilter/msvbahelper.cxx @@ -624,8 +624,6 @@ bool getModifier( char c, sal_uInt16& mod ) return false; } -typedef std::map< OUString, sal_uInt16 > MSKeyCodeMap; - sal_uInt16 parseChar( char c ) throw ( uno::RuntimeException ) { sal_uInt16 nVclKey = 0; @@ -692,7 +690,7 @@ KeyCodeEntry aMSKeyCodesData[] = { awt::KeyEvent parseKeyEvent( const OUString& Key ) throw ( uno::RuntimeException ) { - static MSKeyCodeMap s_KeyCodes; + static std::map< OUString, sal_uInt16 > s_KeyCodes; if ( s_KeyCodes.empty() ) { for (KeyCodeEntry & i : aMSKeyCodesData) @@ -731,7 +729,7 @@ awt::KeyEvent parseKeyEvent( const OUString& Key ) throw ( uno::RuntimeException nVclKey |= parseChar( (char)( sKeyCode[ 0 ] ) ); else { - MSKeyCodeMap::iterator it = s_KeyCodes.find( sKeyCode ); + auto it = s_KeyCodes.find( sKeyCode ); if ( it == s_KeyCodes.end() ) // unknown or unsupported throw uno::RuntimeException(); nVclKey |= it->second;