diff options
| -rw-r--r-- | vcl/inc/vcl/keycod.hxx | 3 | ||||
| -rw-r--r-- | vcl/source/window/accel.cxx | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/vcl/inc/vcl/keycod.hxx b/vcl/inc/vcl/keycod.hxx index 266e10d31959..70df7583bcca 100644 --- a/vcl/inc/vcl/keycod.hxx +++ b/vcl/inc/vcl/keycod.hxx @@ -49,7 +49,6 @@ public: KeyCode( KeyFuncType eFunction ); sal_uInt16 GetFullCode() const { return nCode; } - sal_uInt16 GetFullKeyCode() const { return (nCode) ; } KeyFuncType GetFullFunction() const { return eFunc; } sal_Bool IsDefinedKeyCodeEqual( const KeyCode& rKeyCode ) const; @@ -116,7 +115,7 @@ inline sal_Bool KeyCode::operator !=( const KeyCode& rKeyCode ) const inline sal_Bool KeyCode::IsDefinedKeyCodeEqual( const KeyCode& rKeyCode ) const { if ( (eFunc == KEYFUNC_DONTKNOW) && (rKeyCode.eFunc == KEYFUNC_DONTKNOW) ) - return (GetFullKeyCode() == rKeyCode.GetFullKeyCode()); + return (GetFullCode() == rKeyCode.GetFullCode()); return (GetFunction() == rKeyCode.GetFunction()); } diff --git a/vcl/source/window/accel.cxx b/vcl/source/window/accel.cxx index 9b26845ef06e..261c4d01c4b4 100644 --- a/vcl/source/window/accel.cxx +++ b/vcl/source/window/accel.cxx @@ -170,7 +170,7 @@ void Accelerator::ImplInit() ImplAccelEntry* Accelerator::ImplGetAccelData( const KeyCode& rKeyCode ) const { - ImplAccelMap::iterator it = mpData->maKeyMap.find( rKeyCode.GetFullKeyCode() ); + ImplAccelMap::iterator it = mpData->maKeyMap.find( rKeyCode.GetFullCode() ); if( it != mpData->maKeyMap.end() ) return it->second; else @@ -195,7 +195,7 @@ void Accelerator::ImplCopyData( ImplAccelData& rAccelData ) else pEntry->mpAutoAccel = NULL; - mpData->maKeyMap.insert( std::make_pair( pEntry->maKeyCode.GetFullKeyCode(), pEntry ) ); + mpData->maKeyMap.insert( std::make_pair( pEntry->maKeyCode.GetFullCode(), pEntry ) ); mpData->maIdList.push_back( pEntry ); } } @@ -256,7 +256,7 @@ void Accelerator::ImplInsertAccel( sal_uInt16 nItemId, const KeyCode& rKeyCode, pEntry->mbEnabled = bEnable; // now into the tables - sal_uLong nCode = rKeyCode.GetFullKeyCode(); + sal_uLong nCode = rKeyCode.GetFullCode(); if ( !nCode ) { OSL_FAIL( "Accelerator::InsertItem(): KeyCode with KeyCode 0 not allowed" ); |