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 /rsc | |
| 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 'rsc')
| -rw-r--r-- | rsc/inc/rscdb.hxx | 1 | ||||
| -rw-r--r-- | rsc/source/parser/rscicpx.cxx | 23 | ||||
| -rw-r--r-- | rsc/source/parser/rscinit.cxx | 13 |
3 files changed, 0 insertions, 37 deletions
diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx index d6a24088e1cb..a1dc47a3997c 100644 --- a/rsc/inc/rscdb.hxx +++ b/rsc/inc/rscdb.hxx @@ -194,7 +194,6 @@ class RscTypCont RscTop * InitClassFixedImage( RscTop * pSuper, RscTop * pClassImage ); RscTop * InitClassRadioButton( RscTop * pSuper ); RscTop * InitClassKeyCode( RscTop * pSuper, RscEnum * pKey ); - RscTop * InitClassAccelItem( RscTop * pSuper, RscTop * pKeyCode ); RscTop * InitClassAccel( RscTop * pSuper, RscTop * pClassAccelItem ); RscTop * InitClassMenuItem( RscTop * pSuper, RscTop * pClassBitmap ); RscTop * InitClassMenu( RscTop * pSuper, RscTop * pMenuItem ); diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx index 9bd53b558e1a..1e072918c365 100644 --- a/rsc/source/parser/rscicpx.cxx +++ b/rsc/source/parser/rscicpx.cxx @@ -665,29 +665,6 @@ RscTop * RscTypCont::InitClassKeyCode( RscTop * pSuper, RscEnum * pKey ) return pClassKeyCode; } -RscTop * RscTypCont::InitClassAccelItem( RscTop * pSuper, - RscTop * pClassKeyCode ) -{ - Atom nId; - RscTop * pClassAccelItem; - - // initialize class - nId = pHS->getID( "AcceleratorItem" ); - pClassAccelItem = new RscClass( nId, RSC_ACCELITEM, pSuper ); - aNmTb.Put( nId, CLASSNAME, pClassAccelItem ); - - // initialize variables - nId = aNmTb.Put( "Identifier", VARNAME ); - pClassAccelItem->SetVariable( nId, &aIdNoZeroUShort ); - nId = aNmTb.Put( "Disable", VARNAME ); - pClassAccelItem->SetVariable( nId, &aBool ); - nId = aNmTb.Put( "Key", VARNAME ); - pClassAccelItem->SetVariable( nId, pClassKeyCode, nullptr, 0, - ACCELITEM_KEY ); - - return pClassAccelItem; -} - RscTop * RscTypCont::InitClassAccel( RscTop * pSuper, RscTop * pClassAccelItem ) { Atom nId; diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx index e7a55ac14210..eb02f71f26f3 100644 --- a/rsc/source/parser/rscinit.cxx +++ b/rsc/source/parser/rscinit.cxx @@ -79,9 +79,7 @@ void RscTypCont::Init() RscTop * pClassFixedImage; RscTop * pClassKeyCode; RscTop * pLangClassKeyCode; - RscTop * pClassAccelItem; RscTop * pClassSpinField; - RscTop * pClassAccel; Atom nId; @@ -356,19 +354,8 @@ void RscTypCont::Init() aBaseLst.push_back( pLangClassKeyCode ); } - pClassAccelItem = InitClassAccelItem( pClassMgr, pLangClassKeyCode ); - pRoot->Insert( pClassAccelItem ); } { - pClassAccel = InitClassAccel( pClassMgr, pClassAccelItem ); - pRoot->Insert( pClassAccel ); - nAcceleratorType = pClassAccel->GetId(); - - // pClassAccel is only completely defined here - nId = aNmTb.Put( "SubAccelerator", VARNAME ); - pClassAccelItem->SetVariable( nId, pClassAccel, nullptr, VAR_SVDYNAMIC, - ACCELITEM_ACCEL ); - RscTop* pClassMenuItem = InitClassMenuItem( pClassMgr, pClassBitmap); pRoot->Insert( pClassMenuItem ); |