diff options
author | Caolán McNamara <caolanm@redhat.com> | 2016-10-26 11:34:20 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2016-10-26 12:02:40 +0100 |
commit | 8efdf567de92d05ccfb1305228686287e7bca9e8 (patch) | |
tree | 204f66420b596313d395077b5cb9cb6b8d82a102 /rsc | |
parent | c14b9d036ac8549feb588764b3596c0eb42cf97c (diff) |
drop now unused SfxStyleItem, etc.
Change-Id: I61227079c376299d17250970b19acb0c415034fb
Diffstat (limited to 'rsc')
-rw-r--r-- | rsc/inc/rscclass.hxx | 4 | ||||
-rw-r--r-- | rsc/inc/rscdb.hxx | 8 | ||||
-rw-r--r-- | rsc/inc/rsctop.hxx | 5 | ||||
-rw-r--r-- | rsc/source/parser/rscicpx.cxx | 74 | ||||
-rw-r--r-- | rsc/source/parser/rscinit.cxx | 10 | ||||
-rw-r--r-- | rsc/source/parser/rscyacc.y | 104 | ||||
-rw-r--r-- | rsc/source/res/rscclass.cxx | 10 | ||||
-rw-r--r-- | rsc/source/res/rsctop.cxx | 11 |
8 files changed, 0 insertions, 226 deletions
diff --git a/rsc/inc/rscclass.hxx b/rsc/inc/rscclass.hxx index ef0295bf18c5..c34ac7fdf4b5 100644 --- a/rsc/inc/rscclass.hxx +++ b/rsc/inc/rscclass.hxx @@ -64,10 +64,6 @@ public: void Pre_dtor() override; ERRTYPE SetVariable( Atom nVarName, RscTop * pClass, RSCINST * pDflt, - RSCVAR nVarType, SfxStyleItem nMask, - Atom nDataBaseName = InvalidAtom ) override; - ERRTYPE SetVariable( Atom nVarName, RscTop * pClass, - RSCINST * pDflt, RSCVAR nVarType, SfxSlotInfo nMask, Atom nDataBaseName = InvalidAtom ) override; ERRTYPE SetVariable( Atom nVarName, RscTop * pClass, diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx index 93686343d907..cc5ad46c62f7 100644 --- a/rsc/inc/rscdb.hxx +++ b/rsc/inc/rscdb.hxx @@ -38,7 +38,6 @@ class RscCont; class RscCmdLine; enum class KeyFuncType : sal_Int32; enum class MenuItemBits : sal_Int16; -enum class SfxStyleFamily; enum class MapUnit; struct WriteRcContext @@ -84,7 +83,6 @@ class RscTypCont void SETCONST( RscConst *, Atom, sal_uInt32 ); inline void SETCONST( RscConst *p1, const char * p2, KeyFuncType p3 ) { SETCONST(p1, p2, static_cast<sal_uInt32>(p3)); } inline void SETCONST( RscConst *p1, Atom p2, MenuItemBits p3 ) { SETCONST(p1, p2, static_cast<sal_uInt32>(p3)); } - inline void SETCONST( RscConst *p1, const char * p2, SfxStyleFamily p3 ) { SETCONST(p1, p2, static_cast<sal_uInt16>(p3)); } inline void SETCONST( RscConst *p1, const char * p2, MapUnit p3 ) { SETCONST(p1, p2, static_cast<sal_uInt16>(p3)); } RscEnum * InitFieldUnitsType(); RscEnum * InitColor(); @@ -111,12 +109,6 @@ class RscTypCont RscTop * InitClassMenuItem( RscTop * pSuper ); RscTop * InitClassMenu( RscTop * pSuper, RscTop * pMenuItem ); - RscTop * InitClassSfxStyleFamilyItem( RscTop * pSuper, - RscTop * pClassBitmap, - RscTop * pClassImage, - RscArray * pStrLst ); - RscTop * InitClassSfxTemplateDialog( RscTop * pSuper, - RscTop * pStyleFamily ); RscTop * InitClassSfxSlotInfo( RscTop * pSuper ); public: diff --git a/rsc/inc/rsctop.hxx b/rsc/inc/rsctop.hxx index f4da6ee3b601..7fc035ba8d46 100644 --- a/rsc/inc/rsctop.hxx +++ b/rsc/inc/rsctop.hxx @@ -83,11 +83,6 @@ public: // sets the variable virtual ERRTYPE SetVariable( Atom nVarName, RscTop * pClass, RSCINST * pDflt, - RSCVAR nVarType, SfxStyleItem nMask, - Atom nDataBaseName = InvalidAtom ); - - virtual ERRTYPE SetVariable( Atom nVarName, RscTop * pClass, - RSCINST * pDflt, RSCVAR nVarType, SfxSlotInfo nMask, Atom nDataBaseName = InvalidAtom ); diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx index f78d99b88426..9cf0bea4dedd 100644 --- a/rsc/source/parser/rscicpx.cxx +++ b/rsc/source/parser/rscicpx.cxx @@ -364,80 +364,6 @@ RscTop * RscTypCont::InitClassMenu( RscTop * pSuper, return pClassMenu; } -RscTop * RscTypCont::InitClassSfxStyleFamilyItem( RscTop * pSuper, - RscTop * pClassBitmap, - RscTop * pClassImage, - RscArray * pStrLst ) -{ - Atom nId; - RscTop * pClassSfxFamilyStyleItem; - - // initialize class - nId = pHS->getID( "SfxStyleFamilyItem" ); - pClassSfxFamilyStyleItem = new RscClass( nId, RSC_SFX_STYLE_FAMILY_ITEM, pSuper ); - aNmTb.Put( nId, CLASSNAME, pClassSfxFamilyStyleItem ); - - nId = aNmTb.Put( "FilterList", VARNAME ); - pClassSfxFamilyStyleItem->SetVariable( nId, pStrLst, nullptr, 0, - SfxStyleItem::List ); - nId = aNmTb.Put( "StyleBitmap", VARNAME ); - pClassSfxFamilyStyleItem->SetVariable( nId, pClassBitmap, nullptr, 0, - SfxStyleItem::Bitmap ); - nId = aNmTb.Put( "Text", VARNAME ); - pClassSfxFamilyStyleItem->SetVariable( nId, &aLangString, nullptr, 0, - SfxStyleItem::Text ); - nId = aNmTb.Put( "HelpText", VARNAME ); - pClassSfxFamilyStyleItem->SetVariable( nId, &aLangString, nullptr, 0, - SfxStyleItem::HelpText ); - { - RscEnum * pSfxStyleFamily; - pSfxStyleFamily = new RscEnum( pHS->getID( "StyleFamily" ), - RSC_NOTYPE ); - - SETCONST( pSfxStyleFamily, "SfxStyleFamily::Para", SfxStyleFamily::Para ); - SETCONST( pSfxStyleFamily, "SfxStyleFamily::Char", SfxStyleFamily::Char ); - SETCONST( pSfxStyleFamily, "SfxStyleFamily::Frame",SfxStyleFamily::Frame); - SETCONST( pSfxStyleFamily, "SfxStyleFamily::Page", SfxStyleFamily::Page ); - SETCONST( pSfxStyleFamily, "SfxStyleFamily::Pseudo", SfxStyleFamily::Pseudo ); - SETCONST( pSfxStyleFamily, "SfxStyleFamily::Table", SfxStyleFamily::Table ); - aBaseLst.push_back( pSfxStyleFamily ); - - nId = aNmTb.Put( "StyleFamily", VARNAME ); - pClassSfxFamilyStyleItem->SetVariable( nId, pSfxStyleFamily, nullptr, 0, - SfxStyleItem::StyleFamily ); - } - nId = aNmTb.Put( "StyleImage", VARNAME ); - pClassSfxFamilyStyleItem->SetVariable( nId, pClassImage, nullptr, 0, - SfxStyleItem::Image ); - return pClassSfxFamilyStyleItem; -} - -RscTop * RscTypCont::InitClassSfxTemplateDialog( RscTop * pSuper, - RscTop * pClassFamilyStyleItem ) -{ - Atom nId; - RscTop * pClassSfxTemplateDialog; - - // initialize class - nId = pHS->getID( "SfxStyleFamilies" ); - pClassSfxTemplateDialog = new RscClass( nId, RSC_SFX_STYLE_FAMILIES, pSuper ); - aNmTb.Put( nId, CLASSNAME, pClassSfxTemplateDialog ); - - // initialize variables - { - RscCont * pCont; - - aBaseLst.push_back( - pCont = new RscCont( pHS->getID( "ContFamilyStyleItem" ), RSC_NOTYPE ) - ); - pCont->SetTypeClass( pClassFamilyStyleItem ); - nId = aNmTb.Put( "StyleFamilyList", VARNAME ); - pClassSfxTemplateDialog->SetVariable( nId, pCont ); - } - - return pClassSfxTemplateDialog; -} - RscTop * RscTypCont::InitClassSfxSlotInfo( RscTop * pSuper ) { Atom nId; diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx index fc13e175f609..699cd5e08225 100644 --- a/rsc/source/parser/rscinit.cxx +++ b/rsc/source/parser/rscinit.cxx @@ -168,16 +168,6 @@ void RscTypCont::Init() (sal_uInt32)RscMenuItem::Menu ); } { - RscTop* pClassSfxStyleFamilyItem = InitClassSfxStyleFamilyItem( pClassMgr, - pClassBitmap, - pClassImage, - pLangStringLongTupelList ); - pRoot->Insert( pClassSfxStyleFamilyItem ); - - RscTop* pClassSfxTemplateDialog = InitClassSfxTemplateDialog( pClassMgr, - pClassSfxStyleFamilyItem ); - pRoot->Insert( pClassSfxTemplateDialog ); - RscTop* pClassSfxSlotInfo = InitClassSfxSlotInfo( pClassMgr ); pRoot->Insert( pClassSfxSlotInfo ); } diff --git a/rsc/source/parser/rscyacc.y b/rsc/source/parser/rscyacc.y index 293a38bbc6c0..c0fd67d054dd 100644 --- a/rsc/source/parser/rscyacc.y +++ b/rsc/source/parser/rscyacc.y @@ -40,7 +40,6 @@ ObjectStack S; RscTop * pCurClass; -SfxStyleItem nCurMask; char szErrBuf[ 100 ]; RSCINST GetVarInst( const RSCINST & rInst, const char * pVarName ) @@ -286,13 +285,10 @@ RSCINST GetFirstTupelEle( const RSCINST & rTop ) %type <macrostruct> id_expression %type <string> string_multiline -%type <pClass> type -%type <pClass> type_base %type <header> class_header_body %type <header> class_header %type <header> var_header_class %type <copyref> copy_ref -%type <ushort> type_flags %left '|' @@ -394,106 +390,6 @@ resource_definition rtl_freeMemory( pMem ); #endif } - | new_class_definition_header '{' new_class_definition_body '}' ';' - | new_class_definition_header ';' - ; - -new_class_definition_header - : CLASS SYMBOL id_expression ':' CLASSNAME - { - sal_Int32 lType; - - $3.Evaluate( &lType ); - - // Klasse anlegen - Atom nId = pHS->getID( $2 ); - pCurClass = new RscClass( nId, lType, $5 ); - nCurMask = SfxStyleItem::List; - pTC->aNmTb.Put( nId, CLASSNAME, pCurClass ); - pTC->GetRoot()->Insert( pCurClass ); - } - | CLASS CLASSNAME id_expression ':' CLASSNAME - { - pCurClass = $2; - nCurMask = SfxStyleItem::List; - } -; - -new_class_definition_body - : - | property_definition ';' new_class_definition_body - ; - -property_definition - : type_flags type SYMBOL - { - // Variable anlegen - Atom nId = pTC->aNmTb.Put( $3, VARNAME ); - pCurClass->SetVariable( nId, $2, nullptr, $1, nCurMask ); - nCurMask = SfxStyleItem(((int)nCurMask) << 1); - } - | type_flags type VARNAME - { - pCurClass->SetVariable( $3, $2, nullptr, $1, nCurMask ); - nCurMask = SfxStyleItem(((int)nCurMask) << 1); - } - ; - -type_flags - : type_flags EXTENDABLE - { - $$ = $1 | VAR_EXTENDABLE; - } - | type_flags WRITEIFSET - { - $$ = $1 | VAR_SVDYNAMIC; - } - | - { - $$ = 0; - } - ; - -type - : type_base - { - $$ = $1; - } - | type_base '[' ']' - { - if( $1 ) - { - rtl::OString aTypeName = rtl::OStringBuffer(pHS->getString($1->GetId())). - append("[]").makeStringAndClear(); - $$ = pTC->SearchType( pHS->getID( aTypeName.getStr(), true ) ); - if( !$$ ) - { - RscCont * pCont; - pCont = new RscCont( pHS->getID( aTypeName.getStr() ), RSC_NOTYPE ); - pCont->SetTypeClass( $1 ); - pTC->InsertType( pCont ); - $$ = pCont; - } - } - else - { - $$ = nullptr; - } - } - ; - -type_base - : CLASSNAME - { - $$ = $1; - } - | SYMBOL - { - RscTop * pType = pTC->SearchType( pHS->getID( $1, true ) ); - if( !pType ) - pTC->pEH->Error( ERR_NOTYPE, pCurClass, RscId() ); - $$ = pType; - } ; class_definition diff --git a/rsc/source/res/rscclass.cxx b/rsc/source/res/rscclass.cxx index 40bcdf77ecc9..e1faf7ec4f14 100644 --- a/rsc/source/res/rscclass.cxx +++ b/rsc/source/res/rscclass.cxx @@ -281,16 +281,6 @@ ERRTYPE RscClass::SetVariable( Atom nVarName, RscTop * pClass, RSCINST * pDflt, RSCVAR nVarType, - SfxStyleItem nMask, - Atom nDataBaseName) -{ - return SetVariable(nVarName, pClass, pDflt, nVarType, (sal_uInt32)nMask, nDataBaseName); -} - -ERRTYPE RscClass::SetVariable( Atom nVarName, - RscTop * pClass, - RSCINST * pDflt, - RSCVAR nVarType, SfxSlotInfo nMask, Atom nDataBaseName) { diff --git a/rsc/source/res/rsctop.cxx b/rsc/source/res/rsctop.cxx index bf172951dab4..763e6ffcc085 100644 --- a/rsc/source/res/rsctop.cxx +++ b/rsc/source/res/rsctop.cxx @@ -103,17 +103,6 @@ ERRTYPE RscTop::SetVariable( Atom nVarName, RscTop * pClass, } ERRTYPE RscTop::SetVariable( Atom nVarName, RscTop * pClass, - RSCINST * pDflt, RSCVAR nVarType, SfxStyleItem nMask, - Atom nDataBaseName ) -{ - if( pSuperClass ) - return pSuperClass->SetVariable( nVarName, pClass, pDflt, - nVarType, nMask, nDataBaseName ); - else - return ERR_UNKNOWN_METHOD; -} - -ERRTYPE RscTop::SetVariable( Atom nVarName, RscTop * pClass, RSCINST * pDflt, RSCVAR nVarType, SfxSlotInfo nMask, Atom nDataBaseName ) { |