diff options
author | Caolán McNamara <caolanm@redhat.com> | 2016-10-12 10:19:11 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2016-10-12 11:38:00 +0100 |
commit | 4cc4df51d962a9631da282d18e59aada35788a72 (patch) | |
tree | 74beec2853ce383da0afa8c89c22cd5292d97f14 /rsc | |
parent | 2811e4215abb998ebea65512d8dcd86697e3301e (diff) |
no toolboxes are loaded from .src anymore
Change-Id: Ia2eabf157845b9b6b00b745332a558ffdd1e0ec7
Diffstat (limited to 'rsc')
-rw-r--r-- | rsc/inc/rscdb.hxx | 2 | ||||
-rw-r--r-- | rsc/source/parser/rscicpx.cxx | 180 | ||||
-rw-r--r-- | rsc/source/parser/rscinit.cxx | 6 |
3 files changed, 0 insertions, 188 deletions
diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx index 30117dca03fb..2500f2db5004 100644 --- a/rsc/inc/rscdb.hxx +++ b/rsc/inc/rscdb.hxx @@ -193,8 +193,6 @@ class RscTypCont RscTop * InitClassDockingWindow( RscTop * pSuper, RscEnum * pMapUnit ); - RscTop * InitClassToolBoxItem(RscTop * pSuper); - RscTop * InitClassToolBox( RscTop * pSuper, RscTop * pClassToolBoxItem ); RscTop * InitClassSfxStyleFamilyItem( RscTop * pSuper, RscTop * pClassBitmap, RscTop * pClassImage, diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx index beba5ad2daef..1908e0d9698f 100644 --- a/rsc/source/parser/rscicpx.cxx +++ b/rsc/source/parser/rscicpx.cxx @@ -701,186 +701,6 @@ RscTop * RscTypCont::InitClassDockingWindow( RscTop * pSuper, return pClassDockWindow; } -RscTop * RscTypCont::InitClassToolBoxItem(RscTop * pSuper) -{ - Atom nId; - RscTop * pClassToolBoxItem; - - // initialize class - nId = pHS->getID( "ToolBoxItem" ); - pClassToolBoxItem = new RscClass( nId, RSC_TOOLBOXITEM, pSuper ); - aNmTb.Put( nId, CLASSNAME, pClassToolBoxItem ); - - // initialize variables - nId = aNmTb.Put( "Identifier", VARNAME ); - pClassToolBoxItem->SetVariable( nId, &aIdNoZeroUShort, nullptr, 0, - (sal_uInt32)RscToolboxItemFlags::Id ); - { - RscEnum * pEnum; - - aBaseLst.push_back( pEnum = new RscEnum( pHS->getID( "EnumToolBoxItemType" ), RSC_NOTYPE ) ); - SETCONST( pEnum, "TOOLBOXITEM_BUTTON", ToolBoxItemType::BUTTON ); - SETCONST( pEnum, "TOOLBOXITEM_SPACE", ToolBoxItemType::SPACE ); - SETCONST( pEnum, "TOOLBOXITEM_SEPARATOR", ToolBoxItemType::SEPARATOR ); - SETCONST( pEnum, "TOOLBOXITEM_BREAK", ToolBoxItemType::BREAK ); - - // add variable - nId = aNmTb.Put( "Type", VARNAME ); - pClassToolBoxItem->SetVariable( nId, pEnum, nullptr, 0, - (sal_uInt32)RscToolboxItemFlags::Type ); - } - { - RscFlag * pFlag; - RscClient * pClient; - Atom l_nVarId, l_nAutoCheckId, l_nRadioCheckId, l_nCheckableId, l_nLeftId, l_nAutoSizeId, l_nDropDownId; - - aBaseLst.push_back( pFlag = new RscFlag( pHS->getID( "FlagToolBoxState" ), RSC_NOTYPE ) ); - - // set constants in table - l_nCheckableId = pHS->getID( "ToolBoxItemBits::CHECKABLE" ); - SETCONST( pFlag, l_nCheckableId, ToolBoxItemBits::CHECKABLE ); - l_nAutoCheckId = pHS->getID( "ToolBoxItemBits::AUTOCHECK" ); - SETCONST( pFlag, l_nAutoCheckId, ToolBoxItemBits::AUTOCHECK ); - l_nRadioCheckId = pHS->getID( "ToolBoxItemBits::RADIOCHECK" ); - SETCONST( pFlag, l_nRadioCheckId, ToolBoxItemBits::RADIOCHECK ); - l_nLeftId = pHS->getID( "ToolBoxItemBits::LEFT" ); - SETCONST( pFlag, l_nLeftId, ToolBoxItemBits::LEFT ); - l_nAutoSizeId = pHS->getID( "ToolBoxItemBits::AUTOSIZE" ); - SETCONST( pFlag, l_nAutoSizeId, ToolBoxItemBits::AUTOSIZE ); - l_nDropDownId = pHS->getID( "ToolBoxItemBits::DROPDOWN" ); - SETCONST( pFlag, l_nDropDownId, ToolBoxItemBits::DROPDOWN ); - - // add variable - l_nVarId = aNmTb.Put( "_ToolBoxItemFlags", VARNAME ); - pClassToolBoxItem->SetVariable( l_nVarId, pFlag, nullptr, - VAR_HIDDEN | VAR_NOENUM, - (sal_uInt32)RscToolboxItemFlags::Status ); - - // add client variables - aBaseLst.push_back( - pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, pFlag, l_nCheckableId ) - ); - nId = aNmTb.Put( "Checkable", VARNAME ); - pClassToolBoxItem->SetVariable( nId, pClient, nullptr, VAR_NODATAINST, 0, l_nVarId ); - - aBaseLst.push_back( - pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, pFlag, l_nAutoCheckId ) - ); - nId = aNmTb.Put( "AutoCheck", VARNAME ); - pClassToolBoxItem->SetVariable( nId, pClient, nullptr, VAR_NODATAINST, 0, l_nVarId ); - - aBaseLst.push_back( - pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, pFlag, l_nRadioCheckId ) - ); - nId = aNmTb.Put( "RadioCheck", VARNAME ); - pClassToolBoxItem->SetVariable( nId, pClient, nullptr, VAR_NODATAINST, 0, l_nVarId ); - - aBaseLst.push_back( - pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, pFlag, l_nLeftId ) - ); - nId = aNmTb.Put( "Left", VARNAME ); - pClassToolBoxItem->SetVariable( nId, pClient, nullptr, VAR_NODATAINST, 0, l_nVarId ); - - aBaseLst.push_back( - pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, pFlag, l_nAutoSizeId ) - ); - nId = aNmTb.Put( "AutoSize", VARNAME ); - pClassToolBoxItem->SetVariable( nId, pClient, nullptr, VAR_NODATAINST, 0, l_nVarId ); - - aBaseLst.push_back( - pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, pFlag, l_nDropDownId ) - ); - nId = aNmTb.Put( "DropDown", VARNAME ); - pClassToolBoxItem->SetVariable( nId, pClient, nullptr, VAR_NODATAINST, 0, l_nVarId ); - } - nId = aNmTb.Put( "HelpID", VARNAME ); - pClassToolBoxItem->SetVariable( nId, &aStringLiteral, nullptr, 0, - (sal_uInt32)RscToolboxItemFlags::HelpId ); - nId = aNmTb.Put( "Text", VARNAME ); - pClassToolBoxItem->SetVariable( nId, &aLangString, nullptr, 0, - (sal_uInt32)RscToolboxItemFlags::Text ); - nId = aNmTb.Put( "Disable", VARNAME ); - pClassToolBoxItem->SetVariable( nId, &aBool, nullptr, 0, - (sal_uInt32)RscToolboxItemFlags::Disable ); - - nId = aNmTb.Put( "Hide", VARNAME ); - pClassToolBoxItem->SetVariable( nId, &aBool, nullptr, 0, - (sal_uInt32)RscToolboxItemFlags::Hide ); - nId = aNmTb.Put( "Command", VARNAME ); - pClassToolBoxItem->SetVariable( nId, &aString, nullptr, 0, - (sal_uInt32)RscToolboxItemFlags::Command ); - - return pClassToolBoxItem; -} - -RscTop * RscTypCont::InitClassToolBox( RscTop * pSuper, - RscTop * pClassToolBoxItem ) -{ - Atom nId; - RscTop * pClassToolBox; - - // initialize class - nId = pHS->getID( "ToolBox" ); - pClassToolBox = new RscClass( nId, RSC_TOOLBOX, pSuper ); - pClassToolBox->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType ); - aNmTb.Put( nId, CLASSNAME, pClassToolBox ); - - // initialize variables - { - RscEnum * pEnum; - - aBaseLst.push_back( pEnum = new RscEnum( pHS->getID( "EnumButtonType" ), RSC_NOTYPE ) ); - SETCONST( pEnum, "BUTTON_SYMBOL", ButtonType::SYMBOLONLY ); - SETCONST( pEnum, "BUTTON_TEXT", ButtonType::TEXT ); - SETCONST( pEnum, "BUTTON_SYMBOLTEXT", ButtonType::SYMBOLTEXT ); - - // add variable - nId = aNmTb.Put( "ButtonType", VARNAME ); - pClassToolBox->SetVariable( nId, pEnum, nullptr, 0, - (sal_uInt32)RscToolboxFlags::ButtonType ); - } - { - RscEnum * pEnum; - - aBaseLst.push_back( pEnum = new RscEnum( pHS->getID( "EnumToolBoxAlign" ), RSC_NOTYPE ) ); - SETCONST( pEnum, "BOXALIGN_TOP", WindowAlign::Top ); - SETCONST( pEnum, "BOXALIGN_LEFT", WindowAlign::Left ); - SETCONST( pEnum, "BOXALIGN_RIGHT", WindowAlign::Right ); - SETCONST( pEnum, "BOXALIGN_BOTTOM", WindowAlign::Bottom ); - - // add variable - nId = aNmTb.Put( "Align", VARNAME ); - pClassToolBox->SetVariable( nId, pEnum, nullptr, 0, - (sal_uInt32)RscToolboxFlags::Align ); - } - nId = aNmTb.Put( "LineCount", VARNAME ); - pClassToolBox->SetVariable( nId, &aIdNoZeroUShort, nullptr, 0, - (sal_uInt32)RscToolboxFlags::LineCount ); - { - RscLangArray* pLA; - RscCont * pCont; - - aBaseLst.push_back( pCont = new RscCont( pHS->getID( "ContToolBoxItem" ), RSC_NOTYPE ) ); - pCont->SetTypeClass( pClassToolBoxItem ); - aBaseLst.push_back( - pLA = new RscLangArray( pHS->getID( "LangContToolBoxItem" ) - , RSC_NOTYPE - , pCont - , &aLangType - ) - ); - nId = aNmTb.Put( "ItemList", VARNAME ); - pClassToolBox->SetVariable( nId, pLA, nullptr, 0, - (sal_uInt32)RscToolboxFlags::ItemList ); - } - INS_WINBIT(pClassToolBox,Scroll) - INS_WINBIT(pClassToolBox,LineSpacing) - INS_WINBIT(pClassToolBox,RectStyle) - INS_WINBIT(pClassToolBox,Tabstop) - - return pClassToolBox; -} - RscTop * RscTypCont::InitClassSfxStyleFamilyItem( RscTop * pSuper, RscTop * pClassBitmap, RscTop * pClassImage, diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx index 5761dd5a27d4..14730fdd00f8 100644 --- a/rsc/source/parser/rscinit.cxx +++ b/rsc/source/parser/rscinit.cxx @@ -348,12 +348,6 @@ void RscTypCont::Init() RscTop* pClassDockingWindow = InitClassDockingWindow( pClassWindow, pMapUnit ); pRoot->Insert( pClassDockingWindow ); - RscTop* pClassToolBoxItem = InitClassToolBoxItem(pClassMgr); - pRoot->Insert( pClassToolBoxItem ); - - RscTop* pClassToolBox = InitClassToolBox( pClassDockingWindow, pClassToolBoxItem ); - pRoot->Insert( pClassToolBox ); - RscTop* pClassSfxStyleFamilyItem = InitClassSfxStyleFamilyItem( pClassMgr, pClassBitmap, pClassImage, |