Kaydet (Commit) 839675e7 authored tarafından Tor Lillqvist's avatar Tor Lillqvist

GetFullKeyCode() was identical to GetFullCode()

Change-Id: Ib1b51d7eef8d7076271f612b2d674c2356037bc8
üst c40cb830
......@@ -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());
}
......
......@@ -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" );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment