mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tdf#96099 Reduce number of typedefs used for trivial container types

Browse Source 
Change-Id: Iecf8052d3f7ec5593205184622d53550e6a52161
Reviewed-on: https://gerrit.libreoffice.org/25836
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Akshay Deep <akshaydeepiitr@gmail.com>
This commit is contained in:
krishna keshav 2016-06-02 21:55:44 +05:30 committed by Akshay Deep
parent 411e7e8803
commit b2abb97a65
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
filter/source/msfilter/msvbahelper.cxx
View File

@ -624,8 +624,6 @@ bool getModifier( char c, sal_uInt16& mod )
return false; return false;
} }
typedef std::map< OUString, sal_uInt16 > MSKeyCodeMap;
sal_uInt16 parseChar( char c ) throw ( uno::RuntimeException ) sal_uInt16 parseChar( char c ) throw ( uno::RuntimeException )
{ {
sal_uInt16 nVclKey = 0; sal_uInt16 nVclKey = 0;
@ -692,7 +690,7 @@ KeyCodeEntry aMSKeyCodesData[] = {
awt::KeyEvent parseKeyEvent( const OUString& Key ) throw ( uno::RuntimeException ) 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() ) if ( s_KeyCodes.empty() )
{ {
for (KeyCodeEntry & i : aMSKeyCodesData) for (KeyCodeEntry & i : aMSKeyCodesData)
@ -731,7 +729,7 @@ awt::KeyEvent parseKeyEvent( const OUString& Key ) throw ( uno::RuntimeException
nVclKey |= parseChar( (char)( sKeyCode[ 0 ] ) ); nVclKey |= parseChar( (char)( sKeyCode[ 0 ] ) );
else else
{ {
MSKeyCodeMap::iterator it = s_KeyCodes.find( sKeyCode ); auto it = s_KeyCodes.find( sKeyCode );
if ( it == s_KeyCodes.end() ) // unknown or unsupported if ( it == s_KeyCodes.end() ) // unknown or unsupported
throw uno::RuntimeException(); throw uno::RuntimeException();
nVclKey |= it->second; nVclKey |= it->second;