diff options
author | Caolán McNamara <caolanm@redhat.com> | 2011-08-22 09:02:21 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2011-08-22 09:39:18 +0100 |
commit | acfe7d39e5359483124b79fc7e98fb9afa65c0a6 (patch) | |
tree | 4b09b46f669330a26fee63b0926f91486e1d4da6 /lotuswordpro | |
parent | gsl_getSystemTextEncoding->osl_getThreadTextEncoding (diff) | |
download | core-acfe7d39e5359483124b79fc7e98fb9afa65c0a6.tar.gz core-acfe7d39e5359483124b79fc7e98fb9afa65c0a6.zip |
regoptions (etc.) now unused post registration-removal
Diffstat (limited to 'lotuswordpro')
-rw-r--r-- | lotuswordpro/source/filter/lwpdoc.cxx | 33 | ||||
-rw-r--r-- | lotuswordpro/source/filter/lwpdoc.hxx | 2 | ||||
-rw-r--r-- | lotuswordpro/source/filter/lwpfootnote.cxx | 24 | ||||
-rw-r--r-- | lotuswordpro/source/filter/lwpfootnote.hxx | 2 | ||||
-rw-r--r-- | lotuswordpro/source/filter/lwpfribtable.cxx | 5 | ||||
-rw-r--r-- | lotuswordpro/source/filter/lwpfribtable.hxx | 1 | ||||
-rw-r--r-- | lotuswordpro/source/filter/xfilter/xfsection.cxx | 5 | ||||
-rw-r--r-- | lotuswordpro/source/filter/xfilter/xfsection.hxx | 2 |
8 files changed, 3 insertions, 71 deletions
diff --git a/lotuswordpro/source/filter/lwpdoc.cxx b/lotuswordpro/source/filter/lwpdoc.cxx index 60db658f9d9f..1a4b46676ccc 100644 --- a/lotuswordpro/source/filter/lwpdoc.cxx +++ b/lotuswordpro/source/filter/lwpdoc.cxx @@ -406,32 +406,13 @@ void LwpDocument::ParseDocContent(IXFStream* pOutputStream) LwpObject* pLayoutObj = pDivInfo->GetInitialLayoutID()->obj(); if(pLayoutObj==NULL) { - //Cause crash when parsing master document, master document not supported now. - //ParseMasterDoc(pOutputStream); + //master document not supported now. return; } pLayoutObj->SetFoundry(m_pFoundry); pLayoutObj->Parse(pOutputStream); } -/** - * @descr Parse master doc in this division to IXFStream - * - */ -void LwpDocument::ParseMasterDoc(IXFStream* pOutputStream) -{ - LwpDivInfo* pDivInfo = dynamic_cast<LwpDivInfo*> (m_DivInfo.obj()); - if(pDivInfo==NULL) return; - LwpAtomHolder* pExternal = pDivInfo->GetExternalName(); - if(pExternal && pExternal->HasValue()) - { - OUString linkedfilepath = pExternal->str(); - OUString fileURL = LwpTools::convertToFileUrl(OUStringToOString(linkedfilepath, osl_getThreadTextEncoding())); - XFSection* pSection = new XFSection(); - pSection->SetSourceLink( fileURL); - pSection->ToXml(pOutputStream); - delete pSection; - } -} + /** * @descr Get the footnoteoptions from the root document */ @@ -712,15 +693,7 @@ sal_uInt16 LwpDocument::GetNumberOfPagesBefore() pRoot->GetNumberOfPages(this,nPageNumber); return nPageNumber; } - /** - * @descr Get the numbers of page before this division - */ - sal_uInt16 LwpDocument::GetMaxNumberOfPages() -{ - sal_uInt16 nPageNumber = 0; - MaxNumberOfPages(nPageNumber); - return nPageNumber; -} + /** * @descr Get Max number of pages */ diff --git a/lotuswordpro/source/filter/lwpdoc.hxx b/lotuswordpro/source/filter/lwpdoc.hxx index 92b41c327a81..a920e648f4d2 100644 --- a/lotuswordpro/source/filter/lwpdoc.hxx +++ b/lotuswordpro/source/filter/lwpdoc.hxx @@ -141,7 +141,6 @@ protected: void RegisterLinenumberStyles(); void RegisterFootnoteStyles(); void RegisterDefaultParaStyles(); - void ParseMasterDoc(IXFStream* pOutputStream); public: void Parse(IXFStream* pOutputStream); @@ -178,7 +177,6 @@ public: LwpDocument* GetFirstDivision(); LwpVirtualLayout* GetEnSuperTableLayout(); sal_Bool GetNumberOfPages(LwpDocument* pEndDivision, sal_uInt16& nCount); - sal_uInt16 GetMaxNumberOfPages(); sal_uInt16 GetNumberOfPagesBefore(); void ParseFrameInPage(IXFStream* pOutputStream); diff --git a/lotuswordpro/source/filter/lwpfootnote.cxx b/lotuswordpro/source/filter/lwpfootnote.cxx index 686c7d34d5c7..dd399c221952 100644 --- a/lotuswordpro/source/filter/lwpfootnote.cxx +++ b/lotuswordpro/source/filter/lwpfootnote.cxx @@ -382,30 +382,6 @@ LwpEnSuperTableLayout* LwpFootnote::FindFootnoteTableLayout() } /** - * @descr Find footnote table, not used now - */ -LwpTable* LwpFootnote::FindFootnoteTable() -{ - LwpEnSuperTableLayout* pLayout = FindFootnoteTableLayout(); - //if (!ShouldBeInTable(Footnote)) return NULL; - return GetFootnoteTable(pLayout); -} - -/** - * @descr Find footnote table, not used now - */ -LwpTable* LwpFootnote::GetFootnoteTable(LwpEnSuperTableLayout * pLayout) -{ - if(pLayout) - { - LwpEndnoteLayout* pEndnoteLayout = static_cast<LwpEndnoteLayout*>(pLayout->GetMainTableLayout()); - if(pEndnoteLayout) - return dynamic_cast<LwpTable*>(pEndnoteLayout->GetContent()->obj()); - } - return NULL; -} - -/** * @descr Find footnote contents */ LwpContent* LwpFootnote::FindFootnoteContent() diff --git a/lotuswordpro/source/filter/lwpfootnote.hxx b/lotuswordpro/source/filter/lwpfootnote.hxx index 054b126f6b7a..8eb8b54964f2 100644 --- a/lotuswordpro/source/filter/lwpfootnote.hxx +++ b/lotuswordpro/source/filter/lwpfootnote.hxx @@ -145,8 +145,6 @@ private: LwpDocument* GetFootnoteTableDivision(); LwpDocument* GetEndnoteDivision(LwpDocument* pPossible); LwpEnSuperTableLayout* FindFootnoteTableLayout(); - LwpTable* FindFootnoteTable(); - LwpTable* GetFootnoteTable(LwpEnSuperTableLayout* pLayout); LwpContent* FindFootnoteContent(); OUString GetTableClass(); }; diff --git a/lotuswordpro/source/filter/lwpfribtable.cxx b/lotuswordpro/source/filter/lwpfribtable.cxx index 67c320fa1cd0..33e3cfe1c6b5 100644 --- a/lotuswordpro/source/filter/lwpfribtable.cxx +++ b/lotuswordpro/source/filter/lwpfribtable.cxx @@ -94,11 +94,6 @@ void LwpFribTable::RegisterNewStyle() } } -void LwpFribTable::Parse(IXFStream* pOutputStream) -{ - GetSuperTable()->Parse(pOutputStream); -} - void LwpFribTable::XFConvert(XFContentContainer* pCont) { XFContentContainer* pXFContentContainer = pCont; diff --git a/lotuswordpro/source/filter/lwpfribtable.hxx b/lotuswordpro/source/filter/lwpfribtable.hxx index 20f312292577..5d624fe76018 100644 --- a/lotuswordpro/source/filter/lwpfribtable.hxx +++ b/lotuswordpro/source/filter/lwpfribtable.hxx @@ -67,7 +67,6 @@ public: void Read(LwpObjectStream* pObjStrm, sal_uInt16 len); LwpSuperTableLayout* GetSuperTable(); void RegisterNewStyle(); - void Parse(IXFStream* pOutputStream); virtual void XFConvert(XFContentContainer* pCont); private: LwpObjectID m_objTable; diff --git a/lotuswordpro/source/filter/xfilter/xfsection.cxx b/lotuswordpro/source/filter/xfilter/xfsection.cxx index 2702677fed79..dc3182285625 100644 --- a/lotuswordpro/source/filter/xfilter/xfsection.cxx +++ b/lotuswordpro/source/filter/xfilter/xfsection.cxx @@ -75,11 +75,6 @@ void XFSection::SetSectionName(rtl::OUString name) m_strSectionName = name; } -void XFSection::SetSourceLink( rtl::OUString link) -{ - m_strSourceLink = link; -} - void XFSection::SetProtected(sal_Bool bProtected) { m_bProtected = bProtected; diff --git a/lotuswordpro/source/filter/xfilter/xfsection.hxx b/lotuswordpro/source/filter/xfilter/xfsection.hxx index cc700a9b3468..e2ae2e9aef97 100644 --- a/lotuswordpro/source/filter/xfilter/xfsection.hxx +++ b/lotuswordpro/source/filter/xfilter/xfsection.hxx @@ -82,8 +82,6 @@ public: */ void SetSectionName(rtl::OUString name); - void SetSourceLink(rtl::OUString link); - /** * @descr Set protected. */ |