From 7292948992e088862d86e96ccbf28f9757fded24 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 10 Aug 2011 23:00:28 +0100 Subject: callcatcher: yet more unused code --- lotuswordpro/source/filter/bencont.cxx | 7 -- lotuswordpro/source/filter/bento.hxx | 2 - lotuswordpro/source/filter/lwpchangemgr.cxx | 147 ---------------------------- lotuswordpro/source/filter/lwpchangemgr.hxx | 1 - lotuswordpro/source/filter/lwpmarker.cxx | 26 ----- lotuswordpro/source/filter/lwpmarker.hxx | 1 - 6 files changed, 184 deletions(-) (limited to 'lotuswordpro') diff --git a/lotuswordpro/source/filter/bencont.cxx b/lotuswordpro/source/filter/bencont.cxx index d2a0e0fa220d..320444de819b 100644 --- a/lotuswordpro/source/filter/bencont.cxx +++ b/lotuswordpro/source/filter/bencont.cxx @@ -455,13 +455,6 @@ BenError LtcBenContainer::CreateGraphicStream(SvStream * &pStream, const char *p #include -void LtcBenContainer::ReadAswEntry(SvStream * pStream, AswEntry & rEntry) -{ - char* pBuf = new char[ASWENTRY_SIZE]; - pStream->Read(pBuf, ASWENTRY_SIZE); - rEntry.Load(pBuf); - delete[] pBuf; -} //////////////////////////////////////////////////////////////////// //classs AswEntry AswEntry::AswEntry() diff --git a/lotuswordpro/source/filter/bento.hxx b/lotuswordpro/source/filter/bento.hxx index 0da355bd0bce..fb2f5be8cb64 100644 --- a/lotuswordpro/source/filter/bento.hxx +++ b/lotuswordpro/source/filter/bento.hxx @@ -298,8 +298,6 @@ public: // Internal methods LtcUtBenValueStream * FindObjectValueStreamWithObjectIDAndProperty(BenObjectID ObjectID, const char * sPropertyName); BenError CreateGraphicStream(SvStream * &pStream, const char *pObjectName); - void ReadAswEntry(SvStream * pStream, AswEntry& rEntry); - BenError GetSize(sal_uLong * pLength); LwpSvStream * GetStream() { diff --git a/lotuswordpro/source/filter/lwpchangemgr.cxx b/lotuswordpro/source/filter/lwpchangemgr.cxx index a9a11dfa6b51..d9916f040559 100644 --- a/lotuswordpro/source/filter/lwpchangemgr.cxx +++ b/lotuswordpro/source/filter/lwpchangemgr.cxx @@ -192,153 +192,6 @@ void LwpChangeMgr::SetHeadFootChange(XFContentContainer* pCont) } pCont->Add(pChangeList); - -// m_HeadFootFribMap.clear(); -} - -void LwpChangeMgr::ConvertFribContent(XFContentContainer* pCont, LwpFrib* pFrib) -{ - XFParagraph* pXFPara = new XFParagraph; - LwpPara* pPara = pFrib->GetMyPara(); - if (pPara) - pXFPara->SetStyleName(pPara->GetStyleName()); - - switch(pFrib->GetType())//copy code from class lwpfribptr - { - case FRIB_TAG_TEXT: - { - LwpFribText* textFrib= static_cast(pFrib); - textFrib->XFConvert(pXFPara,pPara->GetStory()); - } - break; - case FRIB_TAG_TAB: - { - LwpFribTab* tabFrib = static_cast(pFrib); - if (pFrib->m_ModFlag) - { - XFTextSpan *pSpan = new XFTextSpan(); - pSpan->SetStyleName(tabFrib->GetStyleName()); - XFTabStop *pTab = new XFTabStop(); - pSpan->Add(pTab); - pXFPara->Add(pSpan); - } - else - { - XFTabStop *pTab = new XFTabStop(); - pXFPara->Add(pTab); - } - } - break; - case FRIB_TAG_LINEBREAK: - { - XFLineBreak *pLineBreak = new XFLineBreak(); - pXFPara->Add(pLineBreak); - } - break; - case FRIB_TAG_UNICODE: //fall through - case FRIB_TAG_UNICODE2: //fall through - case FRIB_TAG_UNICODE3: //fall through - { - LwpFribUnicode* unicodeFrib= static_cast(pFrib); - unicodeFrib->XFConvert(pXFPara,pPara->GetStory()); - } - break; - case FRIB_TAG_HARDSPACE: - { - rtl::OUString sHardSpace(sal_Unicode(0x00a0)); - LwpHyperlinkMgr* pHyperlink = - pPara->GetStory()->GetHyperlinkMgr(); - if (pHyperlink->GetHyperlinkFlag()) - pFrib->ConvertHyperLink(pXFPara,pHyperlink,sHardSpace); - else - pFrib->ConvertChars(pXFPara,sHardSpace); - } - break; - case FRIB_TAG_SOFTHYPHEN: - { - rtl::OUString sSoftHyphen(sal_Unicode(0x00ad)); - pFrib->ConvertChars(pXFPara,sSoftHyphen); - } - break; -/* case FRIB_TAG_FRAME: - { - LwpFribFrame* frameFrib= static_cast(pFrib); - LwpObject* pLayout = frameFrib->GetLayout(); - if (pLayout->GetTag() == VO_DROPCAPLAYOUT) - { - pPara->GetFoundry()->GetDropcapMgr()->SetXFPara(pXFPara); - //LwpObject* pDropCap = frameFrib->GetLayout(); - //pDropCap ->XFConvert(m_pXFPara); - } - //pLayout->XFConvert(m_pXFPara); - frameFrib->XFConvert(pXFPara); - } - break; -*/ case FRIB_TAG_CHBLOCK: - { - LwpFribCHBlock* chbFrib = static_cast(pFrib); - chbFrib->XFConvert(pXFPara,pPara->GetStory()); - } - break; -/* case FRIB_TAG_TABLE: - { - LwpFribTable* tableFrib = static_cast(pFrib); - //tableFrib->XFConvert(m_pPara->GetXFContainer()); - tableFrib->XFConvert(pXFPara); - } - break; -*/ case FRIB_TAG_BOOKMARK: - { - LwpFribBookMark* bookmarkFrib = static_cast(pFrib); - bookmarkFrib->XFConvert(pXFPara); - } - break; - case FRIB_TAG_FOOTNOTE: - { - LwpFribFootnote* pFootnoteFrib = static_cast(pFrib); - pFootnoteFrib->XFConvert(pXFPara); - break; - } - case FRIB_TAG_FIELD: - { - LwpFribField* fieldFrib = static_cast(pFrib); - fieldFrib->XFConvert(pXFPara); - break; - } - case FRIB_TAG_NOTE: - { - LwpFribNote* pNoteFrib = static_cast(pFrib); - pNoteFrib->XFConvert(pXFPara); - break; - } - case FRIB_TAG_PAGENUMBER: - { - LwpFribPageNumber* pagenumFrib = static_cast(pFrib); - pagenumFrib->XFConvert(pXFPara); - break; - } - case FRIB_TAG_DOCVAR: - { - LwpFribDocVar* docFrib = static_cast(pFrib); - docFrib->XFConvert(pXFPara); - break; - } - case FRIB_TAG_RUBYMARKER: - { - LwpFribRubyMarker* rubyFrib = static_cast(pFrib); - rubyFrib->XFConvert(pXFPara); - break; - } - case FRIB_TAG_RUBYFRAME: - { - LwpFribRubyFrame* rubyfrmeFrib = static_cast(pFrib); - rubyfrmeFrib->XFConvert(pXFPara); - break; - } - default : - break; - } - pCont->Add(pXFPara); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/lwpchangemgr.hxx b/lotuswordpro/source/filter/lwpchangemgr.hxx index 0c12e078a605..3262b1bf98ad 100644 --- a/lotuswordpro/source/filter/lwpchangemgr.hxx +++ b/lotuswordpro/source/filter/lwpchangemgr.hxx @@ -90,7 +90,6 @@ private: std::map m_HeadFootFribMap; std::vector m_ChangeList; sal_uInt32 m_nCounter; - void ConvertFribContent(XFContentContainer* pCont, LwpFrib* pFrib); }; #endif diff --git a/lotuswordpro/source/filter/lwpmarker.cxx b/lotuswordpro/source/filter/lwpmarker.cxx index 174ad2f4102e..6229d44a7f01 100644 --- a/lotuswordpro/source/filter/lwpmarker.cxx +++ b/lotuswordpro/source/filter/lwpmarker.cxx @@ -165,8 +165,6 @@ void LwpCHBlkMarker::ConvertCHBlock(XFContentContainer* pXFPara, sal_uInt8 nType case CLICKHERE_CHBEHAVIORDATETIME: ProcessOtherCHB(pXFPara,nType); break; -// ProcessPageNumber(pXFPara,nType); -// break; case CLICKHERE_CHBEHAVIORSTRINGLIST: ProcessKeylist(pXFPara,nType); break; @@ -240,30 +238,6 @@ void LwpCHBlkMarker::ProcessOtherCHB(XFContentContainer* pXFPara,sal_uInt8 nType } -void LwpCHBlkMarker::ProcessPageNumber(XFContentContainer* pXFPara,sal_uInt8 nType) -{ - sal_Bool bFillFlag = IsHasFilled(); - sal_Bool bHelpFlag = IsBubbleHelp(); - - if ( bFillFlag ) - return; - if (nType == MARKER_START) - { - XFHolderStart* pHolder= new XFHolderStart; - pHolder->SetType(A2OUSTR("text")); - if (bHelpFlag) - pHolder->SetDesc(m_Help.str()); - pHolder->SetPrompt(GetPromptText()); - pXFPara->Add(pHolder); - } - else if (nType == MARKER_END) - { - XFHolderEnd* pHolder = new XFHolderEnd; - pXFPara->Add(pHolder); - } - -} - //note: there will be a blank to mark the list //all input content of key list processed as normal text void LwpCHBlkMarker::ProcessKeylist(XFContentContainer* pXFPara,sal_uInt8 nType) diff --git a/lotuswordpro/source/filter/lwpmarker.hxx b/lotuswordpro/source/filter/lwpmarker.hxx index c99643c080c9..3b78bcad4304 100644 --- a/lotuswordpro/source/filter/lwpmarker.hxx +++ b/lotuswordpro/source/filter/lwpmarker.hxx @@ -144,7 +144,6 @@ public: private: void ProcessPlaceHolder(XFContentContainer* pXFPara,sal_uInt16 nAction,sal_uInt8 nType); void ProcessOtherCHB(XFContentContainer* pXFPara,sal_uInt8 nType); - void ProcessPageNumber(XFContentContainer* pXFPara,sal_uInt8 nType); void ProcessKeylist(XFContentContainer* pXFPara,sal_uInt8 nType); sal_Bool IsHasFilled(); sal_Bool IsBubbleHelp(); -- cgit