diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-10-05 21:24:21 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-10-06 09:06:20 +0100 |
| commit | 3870de04eaed80d9eca22dc9cce2973b7ea4c649 (patch) | |
| tree | 19bde25eeee8d5f6bf824f48e9ace4be2ec85ea8 /rsc/source | |
| parent | 924eff5cf02844ae35d0345fe361be4323371b50 (diff) | |
drop now unused BitmapItem rsc fields
Change-Id: I02ed667a3573b3374fce069be0d32dbd91292e49
Diffstat (limited to 'rsc/source')
| -rw-r--r-- | rsc/source/parser/rscicpx.cxx | 12 | ||||
| -rw-r--r-- | rsc/source/parser/rscinit.cxx | 4 |
2 files changed, 4 insertions, 12 deletions
diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx index 584b6815dfba..39db9c852da3 100644 --- a/rsc/source/parser/rscicpx.cxx +++ b/rsc/source/parser/rscicpx.cxx @@ -641,8 +641,7 @@ RscTop * RscTypCont::InitClassKeyCode( RscTop * pSuper, RscEnum * pKey ) return pClassKeyCode; } -RscTop * RscTypCont::InitClassMenuItem( RscTop * pSuper, - RscTop * pClassBitmap ) +RscTop * RscTypCont::InitClassMenuItem( RscTop * pSuper ) { Atom nId; RscTop * pClassMenuItem; @@ -725,9 +724,6 @@ RscTop * RscTypCont::InitClassMenuItem( RscTop * pSuper, nId = aNmTb.Put( "Text", VARNAME ); pClassMenuItem->SetVariable( nId, &aLangString, nullptr, 0, (sal_uInt32)RscMenuItem::Text ); - nId = aNmTb.Put( "ItemBitmap", VARNAME ); - pClassMenuItem->SetVariable( nId, pClassBitmap, nullptr, 0, - (sal_uInt32)RscMenuItem::Bitmap ); nId = aNmTb.Put( "HelpText", VARNAME ); pClassMenuItem->SetVariable( nId, &aLangString, nullptr, 0, (sal_uInt32)RscMenuItem::HelpText ); @@ -932,8 +928,7 @@ RscTop * RscTypCont::InitClassDockingWindow( RscTop * pSuper, return pClassDockWindow; } -RscTop * RscTypCont::InitClassToolBoxItem( RscTop * pSuper, - RscTop * pClassBitmap ) +RscTop * RscTypCont::InitClassToolBoxItem(RscTop * pSuper) { Atom nId; RscTop * pClassToolBoxItem; @@ -1031,9 +1026,6 @@ RscTop * RscTypCont::InitClassToolBoxItem( RscTop * pSuper, nId = aNmTb.Put( "Text", VARNAME ); pClassToolBoxItem->SetVariable( nId, &aLangString, nullptr, 0, (sal_uInt32)RscToolboxItemFlags::Text ); - nId = aNmTb.Put( "ItemBitmap", VARNAME ); - pClassToolBoxItem->SetVariable( nId, pClassBitmap, nullptr, 0, - (sal_uInt32)RscToolboxItemFlags::Bitmap ); nId = aNmTb.Put( "Disable", VARNAME ); pClassToolBoxItem->SetVariable( nId, &aBool, nullptr, 0, (sal_uInt32)RscToolboxItemFlags::Disable ); diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx index bb5d249ea64a..7a363813c8d1 100644 --- a/rsc/source/parser/rscinit.cxx +++ b/rsc/source/parser/rscinit.cxx @@ -353,7 +353,7 @@ void RscTypCont::Init() } { - RscTop* pClassMenuItem = InitClassMenuItem( pClassMgr, pClassBitmap); + RscTop* pClassMenuItem = InitClassMenuItem(pClassMgr); pRoot->Insert( pClassMenuItem ); RscTop* pClassMenu = InitClassMenu( pClassMgr, pClassMenuItem ); @@ -410,7 +410,7 @@ void RscTypCont::Init() RscTop* pClassDockingWindow = InitClassDockingWindow( pClassWindow, pMapUnit ); pRoot->Insert( pClassDockingWindow ); - RscTop* pClassToolBoxItem = InitClassToolBoxItem( pClassMgr, pClassBitmap ); + RscTop* pClassToolBoxItem = InitClassToolBoxItem(pClassMgr); pRoot->Insert( pClassToolBoxItem ); RscTop* pClassToolBox = InitClassToolBox( pClassDockingWindow, pClassToolBoxItem ); |