From 61ad99a50c1e327d81bc61f7b681cf144facf2c9 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Tue, 12 Jul 2011 21:08:21 +0100 Subject: callcatcher: strip rsc down by more unused methods --- rsc/inc/rscdb.hxx | 1 - rsc/inc/rscdef.hxx | 6 ---- rsc/source/parser/rscdb.cxx | 9 ------ rsc/source/tools/rscdef.cxx | 77 --------------------------------------------- 4 files changed, 93 deletions(-) (limited to 'rsc') diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx index 830c25fb72b6..012c340bc42e 100644 --- a/rsc/inc/rscdb.hxx +++ b/rsc/inc/rscdb.hxx @@ -336,7 +336,6 @@ public: aBaseLst.push_back( pType ); } RscTop * SearchType( Atom nTypId ); - RscTop * Search( Atom typ ); // loescht alle Resourceobjekte diese Datei void Delete( sal_uLong lFileKey ); RscTop * GetRoot() { return( pRoot ); }; diff --git a/rsc/inc/rscdef.hxx b/rsc/inc/rscdef.hxx index 8a884c0e5dfd..6d335d5544b0 100644 --- a/rsc/inc/rscdef.hxx +++ b/rsc/inc/rscdef.hxx @@ -140,8 +140,6 @@ protected: void DecRef(); void DefineToNumber(); void SetName( const ByteString & rNewName ){ aName = rNewName; } - void ChangeMacro( RscExpression * pExpression ); - void ChangeMacro( sal_Int32 lIdentifier ); using StringNode::Search; public: @@ -164,7 +162,6 @@ private: sal_Int32 lDefId, size_t lPos ); RscDefine * New( sal_uLong lFileKey, const ByteString & rDefName, RscExpression * pExpression, size_t lPos ); - sal_Bool Remove( RscDefine * pDef ); sal_Bool Remove(); size_t GetPos( RscDefine* item ) { for ( size_t i = 0, n = maList.size(); i < n; ++i ) @@ -217,7 +214,6 @@ public: RscFile(); ~RscFile(); sal_Bool InsertDependFile( sal_uLong lDepFile, size_t lPos ); - void RemoveDependFile( sal_uLong lDepFile ); sal_Bool Depend( sal_uLong lDepend, sal_uLong lFree ); void SetIncFlag(){ bIncFile = sal_True; }; sal_Bool IsIncFile(){ return bIncFile; }; @@ -233,7 +229,6 @@ public: RscDefTree(){ pDefRoot = NULL; } ~RscDefTree(); void Remove(); - sal_Bool Evaluate(); RscDefine * Search( const char * pName ); void Insert( RscDefine * pDef ); void Remove( RscDefine * pDef ); @@ -248,7 +243,6 @@ public: RscDefine * FindDef( const char * ); RscDefine * FindDef( const ByteString& rStr ) { return FindDef( rStr.GetBuffer() ); } - RscDefine * FindDef( sal_uLong lKey, const ByteString & ); sal_Bool Depend( sal_uLong lDepend, sal_uLong lFree ); sal_Bool TestDef( sal_uLong lFileKey, size_t lPos, diff --git a/rsc/source/parser/rscdb.cxx b/rsc/source/parser/rscdb.cxx index 5bfa6ea6e49d..1c7e544e18eb 100644 --- a/rsc/source/parser/rscdb.cxx +++ b/rsc/source/parser/rscdb.cxx @@ -313,15 +313,6 @@ RscTop * RscTypCont::SearchType( Atom nId ) return NULL; } -/************************************************************************* -|* -|* RscTypCont :: Search -|* -*************************************************************************/ -RscTop * RscTypCont :: Search( Atom nRT ){ - return( (RscTop *)pRoot->Search( nRT ) ); -} - /************************************************************************* |* |* RscTypCont :: PutSysName() diff --git a/rsc/source/tools/rscdef.cxx b/rsc/source/tools/rscdef.cxx index eab8bbb63ae7..8f8754d1b205 100644 --- a/rsc/source/tools/rscdef.cxx +++ b/rsc/source/tools/rscdef.cxx @@ -244,26 +244,6 @@ void RscDefine::DefineToNumber() SetName(rtl::OString::valueOf(lId)); } -/************************************************************************* -|* -|* RscDefine::ChangeMacro() -|* -*************************************************************************/ -void RscDefine::ChangeMacro( RscExpression * pExpression ){ - if( pExp ) - delete pExp; - pExp = pExpression; - pExp->Evaluate( &lId ); -} - -void RscDefine::ChangeMacro( sal_Int32 lIdentifier ){ - if( pExp ){ - delete pExp; - pExp = NULL; - } - lId = lIdentifier; -} - /************************************************************************* |* |* RscDefine::Evaluate() @@ -341,23 +321,6 @@ RscDefine * RscDefineList::New( sal_uLong lFileKey, const ByteString & rDefName, return pDef; } -/************************************************************************* -|* -|* RscDefineList::Remove() -|* -*************************************************************************/ -sal_Bool RscDefineList::Remove( RscDefine * pDef ) { - for ( RscSubDefList::iterator it = maList.begin(); it < maList.end(); ++it ) { - if ( *it == pDef ) { - (*it)->DefineToNumber(); - (*it)->DecRef(); - maList.erase( it ); - return sal_True; - } - } - return sal_False; -} - sal_Bool RscDefineList::Remove() { if ( maList.empty() ) return sal_False; @@ -610,25 +573,6 @@ sal_Bool RscFile :: InsertDependFile( sal_uLong lIncFile, size_t lPos ) return sal_True; } -/************************************************************************* -|* -|* RscFile::RemoveDependFile() -|* -*************************************************************************/ -void RscFile :: RemoveDependFile( sal_uLong lDepFile ) -{ - for ( size_t i = aDepLst.size(); i > 0; ) - { - RscDepend* pDep = aDepLst[ --i ]; - if( pDep->GetFileKey() == lDepFile ) { - RscDependList::iterator it = aDepLst.begin(); - ::std::advance( it, i ); - delete *it; - aDepLst.erase( it ); - } - } -} - /****************** R s c D e f T r e e **********************************/ /************************************************************************* |* @@ -705,10 +649,6 @@ sal_Bool RscDefTree::Evaluate( RscDefine * pDef ){ return sal_True; } -sal_Bool RscDefTree::Evaluate(){ - return Evaluate( pDefRoot ); -} - /****************** R s c F i l e T a b **********************************/ /************************************************************************* |* @@ -764,23 +704,6 @@ RscDefine * RscFileTab::FindDef( const char * pName ){ return aDefTree.Search( pName ); } -/************************************************************************* -|* -|* RscFileTab::FindDef() -|* -*************************************************************************/ -RscDefine * RscFileTab::FindDef( sal_uLong lFileKey, const ByteString & rName ) -{ - RscDefine * pDef = FindDef( rName ); - - if( pDef ) - //befindet sich das DEFINE in einer Include-Datei in der - //Datei lFileKey - if( Depend( lFileKey, pDef->GetFileKey() ) ) - return pDef; - return NULL; -} - /************************************************************************* |* |* RscFileTab::Depend() -- cgit