summaryrefslogtreecommitdiff
path: root/rsc
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-10-05 21:24:21 +0100
committerCaolán McNamara <caolanm@redhat.com>2016-10-06 09:06:20 +0100
commit3870de04eaed80d9eca22dc9cce2973b7ea4c649 (patch)
tree19bde25eeee8d5f6bf824f48e9ace4be2ec85ea8 /rsc
parent924eff5cf02844ae35d0345fe361be4323371b50 (diff)
drop now unused BitmapItem rsc fields
Change-Id: I02ed667a3573b3374fce069be0d32dbd91292e49
Diffstat (limited to 'rsc')
-rw-r--r--rsc/inc/rscdb.hxx4
-rw-r--r--rsc/source/parser/rscicpx.cxx12
-rw-r--r--rsc/source/parser/rscinit.cxx4
3 files changed, 6 insertions, 14 deletions
diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx
index 4edcf4adf6f9..6e3f6d955b49 100644
--- a/rsc/inc/rscdb.hxx
+++ b/rsc/inc/rscdb.hxx
@@ -195,7 +195,7 @@ class RscTypCont
RscTop * InitClassFixedImage( RscTop * pSuper, RscTop * pClassImage );
RscTop * InitClassRadioButton( RscTop * pSuper );
RscTop * InitClassKeyCode( RscTop * pSuper, RscEnum * pKey );
- RscTop * InitClassMenuItem( RscTop * pSuper, RscTop * pClassBitmap );
+ RscTop * InitClassMenuItem( RscTop * pSuper );
RscTop * InitClassMenu( RscTop * pSuper, RscTop * pMenuItem );
RscTop * InitClassNumericFormatter( RscTop * pSuper );
@@ -208,7 +208,7 @@ class RscTypCont
RscTop * InitClassDockingWindow( RscTop * pSuper,
RscEnum * pMapUnit );
- RscTop * InitClassToolBoxItem( RscTop * pSuper, RscTop * pClassBitmap );
+ RscTop * InitClassToolBoxItem(RscTop * pSuper);
RscTop * InitClassToolBox( RscTop * pSuper, RscTop * pClassToolBoxItem );
RscTop * InitClassSfxStyleFamilyItem( RscTop * pSuper,
RscTop * pClassBitmap,
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 );