diff options
author | Noel Grandin <noelgrandin@gmail.com> | 2016-05-15 12:35:32 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2016-05-16 09:19:20 +0000 |
commit | d9bdc157b43ce412ad4689ee78b81068b1224d30 (patch) | |
tree | 6ca4917524e9e160345e887b88a6fcfc6d9540d5 /vcl | |
parent | a05281b30edc0cf9efecf90a7b6240b90f9c8267 (diff) |
remove ACCELITEM stuff from rsc
Change-Id: I97dade0324edfb2d67ee33ef07498166b499c13c
Reviewed-on: https://gerrit.libreoffice.org/25003
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/source/window/accel.cxx | 55 |
1 files changed, 0 insertions, 55 deletions
diff --git a/vcl/source/window/accel.cxx b/vcl/source/window/accel.cxx index 9e6250323c8a..01d75c7cd647 100644 --- a/vcl/source/window/accel.cxx +++ b/vcl/source/window/accel.cxx @@ -263,29 +263,6 @@ Accelerator::Accelerator( const Accelerator& rAccel ) : ImplCopyData(*rAccel.mpData); } -Accelerator::Accelerator( const ResId& rResId ) -{ - - ImplInit(); - mpData = new ImplAccelData; - rResId.SetRT( RSC_ACCEL ); - ImplLoadRes( rResId ); -} - -void Accelerator::ImplLoadRes( const ResId& rResId ) -{ - GetRes( rResId ); - - maHelpStr = ReadStringRes(); - sal_uLong nObjFollows = ReadLongRes(); - - for( sal_uLong i = 0; i < nObjFollows; i++ ) - { - InsertItem( ResId( static_cast<RSHEADER_TYPE *>(GetClassRes()), *rResId.GetResMgr() ) ); - IncrementRes( GetObjSizeRes( static_cast<RSHEADER_TYPE *>(GetClassRes()) ) ); - } -} - Accelerator::~Accelerator() { @@ -312,38 +289,6 @@ void Accelerator::InsertItem( sal_uInt16 nItemId, const vcl::KeyCode& rKeyCode ) ImplInsertAccel( nItemId, rKeyCode, true, nullptr ); } -void Accelerator::InsertItem( const ResId& rResId ) -{ - - sal_uLong nObjMask; - sal_uInt16 nAccelKeyId; - sal_uInt16 bDisable; - vcl::KeyCode aKeyCode; - Accelerator* pAutoAccel = nullptr; - - GetRes( rResId.SetRT( RSC_ACCELITEM ) ); - nObjMask = ReadLongRes(); - nAccelKeyId = sal::static_int_cast<sal_uInt16>(ReadLongRes()); - bDisable = ReadShortRes(); - - if ( nObjMask & ACCELITEM_KEY ) - { - // new context was created - RSHEADER_TYPE * pKeyCodeRes = static_cast<RSHEADER_TYPE *>(GetClassRes()); - ResId aResId( pKeyCodeRes, *rResId.GetResMgr()); - aKeyCode = vcl::KeyCode( aResId ); - IncrementRes( GetObjSizeRes( static_cast<RSHEADER_TYPE *>(GetClassRes()) ) ); - } - - if ( nObjMask & ACCELITEM_ACCEL ) - { - pAutoAccel = new Accelerator( ResId( static_cast<RSHEADER_TYPE *>(GetClassRes()), *rResId.GetResMgr() ) ); - IncrementRes( GetObjSizeRes( static_cast<RSHEADER_TYPE *>(GetClassRes()) ) ); - } - - ImplInsertAccel( nAccelKeyId, aKeyCode, !bDisable, pAutoAccel ); -} - sal_uInt16 Accelerator::GetItemCount() const { |