binfilter/bf_sw/source/core/docnode/sw_node.cxx | 89 --------------------- binfilter/bf_sw/source/core/unocore/sw_unodraw.cxx | 18 ---- binfilter/bf_sw/source/core/unocore/sw_unoobj.cxx | 17 ---- binfilter/bf_sw/source/core/unocore/sw_unoobj2.cxx | 27 ------ binfilter/inc/bf_sw/node.hxx | 1 binfilter/inc/bf_sw/unodraw.hxx | 1 binfilter/inc/bf_sw/unoobj.hxx | 3 7 files changed, 156 deletions(-)
New commits: commit 202a9283867098048cbe5fe584438299bc47305a Author: Caolán McNamara <caol...@redhat.com> Date: Wed Sep 28 14:46:52 2011 +0100 callcatcher: newly unused methods diff --git a/binfilter/bf_sw/source/core/docnode/sw_node.cxx b/binfilter/bf_sw/source/core/docnode/sw_node.cxx index f9a75be..0c26f92 100644 --- a/binfilter/bf_sw/source/core/docnode/sw_node.cxx +++ b/binfilter/bf_sw/source/core/docnode/sw_node.cxx @@ -1153,95 +1153,6 @@ using namespace ::com::sun::star::i18n; /*N*/ } /*N*/ } - -/*N*/ BOOL SwCntntNode::IsAnyCondition( SwCollCondition& rTmp ) const -/*N*/ { -/*N*/ const SwNodes& rNds = GetNodes(); -/*N*/ { -/*N*/ int nCond = 0; -/*N*/ const SwStartNode* pSttNd = FindStartNode(); -/*N*/ while( pSttNd ) -/*N*/ { -/*N*/ switch( pSttNd->GetNodeType() ) -/*N*/ { -/*?*/ case ND_TABLENODE: nCond = PARA_IN_TABLEBODY; break; -/*N*/ case ND_SECTIONNODE: nCond = PARA_IN_SECTION; break; -/*N*/ -/*N*/ default: -/*N*/ switch( pSttNd->GetStartNodeType() ) -/*N*/ { -/*N*/ case SwTableBoxStartNode: -/*N*/ { -/*N*/ nCond = PARA_IN_TABLEBODY; -/*N*/ const SwTableNode* pTblNd = pSttNd->FindTableNode(); -/*N*/ const SwTableBox* pBox; -/*N*/ if( pTblNd && 0 != ( pBox = pTblNd->GetTable(). -/*N*/ GetTblBox( pSttNd->GetIndex() ) ) && -/*N*/ pBox->IsInHeadline( &pTblNd->GetTable() ) ) -/*N*/ nCond = PARA_IN_TABLEHEAD; -/*N*/ } -/*N*/ break; -/*N*/ case SwFlyStartNode: nCond = PARA_IN_FRAME; break; -/*N*/ case SwFootnoteStartNode: -/*?*/ { -/*?*/ nCond = PARA_IN_FOOTENOTE; -/*?*/ const SwFtnIdxs& rFtnArr = rNds.GetDoc()->GetFtnIdxs(); -/*?*/ const SwTxtFtn* pTxtFtn; -/*?*/ const SwNode* pSrchNd = pSttNd; -/*?*/ -/*?*/ for( USHORT n = 0; n < rFtnArr.Count(); ++n ) -/*?*/ if( 0 != ( pTxtFtn = rFtnArr[ n ])->GetStartNode() && -/*?*/ pSrchNd == &pTxtFtn->GetStartNode()->GetNode() ) -/*?*/ { -/*?*/ if( pTxtFtn->GetFtn().IsEndNote() ) -/*?*/ nCond = PARA_IN_ENDNOTE; -/*?*/ break; -/*?*/ } -/*?*/ } -/*?*/ break; -/*?*/ case SwHeaderStartNode: nCond = PARA_IN_HEADER; break; -/*?*/ case SwFooterStartNode: nCond = PARA_IN_FOOTER; break; - case SwNormalStartNode: break; -/*N*/ } -/*N*/ } -/*N*/ -/*N*/ if( nCond ) -/*N*/ { -/*N*/ rTmp.SetCondition( (Master_CollConditions)nCond, 0 ); -/*N*/ return TRUE; -/*N*/ } -/*N*/ pSttNd = pSttNd->GetIndex() -/*N*/ ? pSttNd->FindStartNode() -/*N*/ : 0; -/*N*/ } -/*N*/ } -/*N*/ -/*N*/ { -/*N*/ USHORT nPos; -/*N*/ const SwOutlineNodes& rOutlNds = rNds.GetOutLineNds(); -/*N*/ if( rOutlNds.Count() ) -/*N*/ { -/*N*/ if( !rOutlNds.Seek_Entry( (SwCntntNode*)this, &nPos ) && nPos ) -/*N*/ --nPos; -/*N*/ if( nPos < rOutlNds.Count() && -/*N*/ rOutlNds[ nPos ]->GetIndex() < GetIndex() ) -/*N*/ { -/*N*/ SwTxtNode* pOutlNd = rOutlNds[ nPos ]->GetTxtNode(); -/*N*/ -/*N*/ if( pOutlNd->GetOutlineNum() && !pOutlNd->GetNumRule() ) -/*N*/ { -/*N*/ rTmp.SetCondition( PARA_IN_OUTLINE, -/*N*/ pOutlNd->GetOutlineNum()->GetLevel() ); -/*N*/ return TRUE; -/*N*/ } -/*N*/ } -/*N*/ } -/*N*/ } -/*N*/ -/*N*/ return FALSE; -/*N*/ } - - /*N*/ void SwCntntNode::ChkCondColl() /*N*/ { /*N*/ // zur Sicherheit abfragen diff --git a/binfilter/bf_sw/source/core/unocore/sw_unodraw.cxx b/binfilter/bf_sw/source/core/unocore/sw_unodraw.cxx index 7750720..5cecfa1 100644 --- a/binfilter/bf_sw/source/core/unocore/sw_unodraw.cxx +++ b/binfilter/bf_sw/source/core/unocore/sw_unodraw.cxx @@ -218,24 +218,6 @@ void SwFmDrawPage::RemovePageView() pPageView = 0; } -uno::Reference< uno::XInterface > SwFmDrawPage::GetInterface( SdrObject* pObj ) -{ - uno::Reference< XInterface > xShape; - if( pObj ) - { - SwFrmFmt* pFmt = ::binfilter::FindFrmFmt( pObj ); - SwXShape* pxShape = (SwXShape*)SwClientIter( *pFmt ). - First( TYPE( SwXShape )); - if(pxShape) - { - xShape = *(cppu::OWeakObject*)pxShape; - } - else - xShape = pObj->getUnoShape(); - } - return xShape; -} - SdrObject* SwFmDrawPage::_CreateSdrObject( const uno::Reference< drawing::XShape > & xShape ) throw () { //TODO: stimmt das so - kann die Methode weg? diff --git a/binfilter/bf_sw/source/core/unocore/sw_unoobj.cxx b/binfilter/bf_sw/source/core/unocore/sw_unoobj.cxx index 88b2e23..28e99eb 100644 --- a/binfilter/bf_sw/source/core/unocore/sw_unoobj.cxx +++ b/binfilter/bf_sw/source/core/unocore/sw_unoobj.cxx @@ -738,23 +738,6 @@ SwXTextCursor::SwXTextCursor(uno::Reference< XText > xParent, const SwPosition& pUnoCrsr->Add(this); } -SwXTextCursor::SwXTextCursor(uno::Reference< XText > xParent, - SwUnoCrsr* pSourceCrsr, CursorType eSet) : - aLstnrCntnr( (util::XSortable*)this), - aPropSet(aSwMapProvider.GetPropertyMap(PROPERTY_MAP_TEXT_CURSOR)), - xParentText(xParent), - pLastSortOptions(0), - eType(eSet) -{ - SwUnoCrsr* pUnoCrsr = pSourceCrsr->GetDoc()->CreateUnoCrsr(*pSourceCrsr->GetPoint(), sal_False); - if(pSourceCrsr->HasMark()) - { - pUnoCrsr->SetMark(); - *pUnoCrsr->GetMark() = *pSourceCrsr->GetMark(); - } - pUnoCrsr->Add(this); -} - SwXTextCursor::~SwXTextCursor() { SwUnoCrsr* pUnoCrsr = GetCrsr(); diff --git a/binfilter/bf_sw/source/core/unocore/sw_unoobj2.cxx b/binfilter/bf_sw/source/core/unocore/sw_unoobj2.cxx index 6707e89..aa2423a 100644 --- a/binfilter/bf_sw/source/core/unocore/sw_unoobj2.cxx +++ b/binfilter/bf_sw/source/core/unocore/sw_unoobj2.cxx @@ -1766,33 +1766,6 @@ SwXTextRanges::SwXTextRanges() : } -SwXTextRanges::SwXTextRanges(SwPaM* pCrsr) : - pRangeArr(0) -{ - SwUnoCrsr* pUnoCrsr = pCrsr->GetDoc()->CreateUnoCrsr(*pCrsr->GetPoint()); - if(pCrsr->HasMark()) - { - pUnoCrsr->SetMark(); - *pUnoCrsr->GetMark() = *pCrsr->GetMark(); - } - if(pCrsr->GetNext() != pCrsr) - { - SwPaM *_pStartCrsr = (SwPaM *)pCrsr->GetNext(); - do - { - //neuen PaM erzeugen - SwPaM* pPaM = _pStartCrsr->HasMark() ? - new SwPaM(*_pStartCrsr->GetMark(), *_pStartCrsr->GetPoint()) : - new SwPaM(*_pStartCrsr->GetPoint()); - //und in den Ring einfuegen - pPaM->MoveTo(pUnoCrsr); - - } while( (_pStartCrsr=(SwPaM *)_pStartCrsr->GetNext()) != pCrsr ); - } - - pUnoCrsr->Add(this); -} - SwXTextRanges::~SwXTextRanges() { SwUnoCrsr* pCrsr = GetCrsr(); diff --git a/binfilter/inc/bf_sw/node.hxx b/binfilter/inc/bf_sw/node.hxx index 5ed6e28..db95ebe 100644 --- a/binfilter/inc/bf_sw/node.hxx +++ b/binfilter/inc/bf_sw/node.hxx @@ -385,7 +385,6 @@ public: void SetCondFmtColl( SwFmtColl* ); inline SwFmtColl* GetCondFmtColl() const; - BOOL IsAnyCondition( SwCollCondition& rTmp ) const; void ChkCondColl(); //FEATURE::CONDCOLL diff --git a/binfilter/inc/bf_sw/unodraw.hxx b/binfilter/inc/bf_sw/unodraw.hxx index 12816ca..3f89381 100644 --- a/binfilter/inc/bf_sw/unodraw.hxx +++ b/binfilter/inc/bf_sw/unodraw.hxx @@ -70,7 +70,6 @@ public: SdrView* GetDrawView() {return pView;} SdrPageView* GetPageView(); void RemovePageView(); - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > GetInterface( SdrObject* pObj ); // Die folgende Methode wird gerufen, wenn ein SvxShape-Objekt angelegt // werden soll. abgeleitete Klassen koennen hier eine Ableitung oder diff --git a/binfilter/inc/bf_sw/unoobj.hxx b/binfilter/inc/bf_sw/unoobj.hxx index 9074b95..5f8b1fa 100644 --- a/binfilter/inc/bf_sw/unoobj.hxx +++ b/binfilter/inc/bf_sw/unoobj.hxx @@ -317,7 +317,6 @@ protected: public: SwXTextCursor(::com::sun::star::uno::Reference< ::com::sun::star::text::XText > xParent, const SwPosition& rPos, CursorType eSet, SwDoc* pDoc, const SwPosition* pMark = 0); - SwXTextCursor(::com::sun::star::uno::Reference< ::com::sun::star::text::XText > xParent, SwUnoCrsr* pSourceCrsr, CursorType eSet = CURSOR_ALL); static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId(); @@ -690,8 +689,6 @@ protected: virtual ~SwXTextRanges(); public: SwXTextRanges(); - SwXTextRanges(SwPaM* pCrsr); - static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId();
_______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits