diff options
author | Takeshi Abe <tabe@fixedpoint.jp> | 2012-06-07 23:02:48 +0900 |
---|---|---|
committer | Takeshi Abe <tabe@fixedpoint.jp> | 2012-06-07 23:03:11 +0900 |
commit | eb0497307bf381e7e065fc4b0b0d7b23f6ceeca9 (patch) | |
tree | f8408dea01957f913c4cd748ad38111805244a92 /lotuswordpro | |
parent | 9af0eb7e998c7bbf514e324919b710a0ff601244 (diff) |
nuke dead code
Change-Id: Id9920ea7b82ea178e904f78bbd41ffc434813e0b
Diffstat (limited to 'lotuswordpro')
-rw-r--r-- | lotuswordpro/source/filter/lwpdocdata.cxx | 39 | ||||
-rw-r--r-- | lotuswordpro/source/filter/lwpgrfobj.cxx | 6 | ||||
-rw-r--r-- | lotuswordpro/source/filter/lwpoleobject.hxx | 6 | ||||
-rw-r--r-- | lotuswordpro/source/filter/lwpsdwfileloader.cxx | 46 | ||||
-rw-r--r-- | lotuswordpro/source/filter/utbenvs.cxx | 14 | ||||
-rw-r--r-- | lotuswordpro/source/filter/xfilter/xfannotation.hxx | 11 | ||||
-rw-r--r-- | lotuswordpro/source/filter/xfilter/xfdrawobj.hxx | 16 | ||||
-rw-r--r-- | lotuswordpro/source/filter/xfilter/xffooterstyle.hxx | 38 | ||||
-rw-r--r-- | lotuswordpro/source/filter/xfilter/xfsection.cxx | 27 | ||||
-rw-r--r-- | lotuswordpro/source/filter/xfilter/xfsection.hxx | 5 | ||||
-rw-r--r-- | lotuswordpro/source/filter/xfilter/xftable.cxx | 6 |
11 files changed, 1 insertions, 213 deletions
diff --git a/lotuswordpro/source/filter/lwpdocdata.cxx b/lotuswordpro/source/filter/lwpdocdata.cxx index 2f2526c527ce..a54a2ff2d7ac 100644 --- a/lotuswordpro/source/filter/lwpdocdata.cxx +++ b/lotuswordpro/source/filter/lwpdocdata.cxx @@ -60,8 +60,6 @@ #include "lwpfilehdr.hxx" #include "lwpglobalmgr.hxx" -//std::map<sal_uInt16,LwpEditorAttr*> LwpDocData::m_EditorAttrMap; - LwpDocData::LwpDocData(LwpObjectHeader &objHdr, LwpSvStream* pStrm) :LwpObject(objHdr, pStrm)//m_pEditorAttrList(0) {} @@ -340,42 +338,5 @@ void LwpDocData::Parse(IXFStream *pOutputStream) xfMeta.SetEditTime(TimeToOUString(m_nTotalEditTime)); xfMeta.ToXml(pOutputStream); } -/* -OUString LwpDocData::GetEditorName(sal_uInt8 nID) -{ - std::map<sal_uInt16,LwpEditorAttr*>::iterator iter; - iter = m_EditorAttrMap.find(nID); - if (iter != m_EditorAttrMap.end()) - return iter->second->cName.str(); - return A2OUSTR(""); -} - -XFColor LwpDocData::GetHighLightColor(sal_uInt8 nID) -{ - std::map<sal_uInt16,LwpEditorAttr*>::iterator iter; - - iter = m_EditorAttrMap.find(nID); - if (iter != m_EditorAttrMap.end()) - { - LwpColor aLwpColor = iter->second->cHiLiteColor; - XFColor aColor(aLwpColor.GetRed(),aLwpColor.GetGreen(),aLwpColor.GetBlue()); - return aColor; - } - else - { - XFColor aColor(255,255,0);//yellow - return aColor; - } -} -void LwpDocData::Reset() -{ - std::map<sal_uInt16,LwpEditorAttr*>::iterator iter; - for (iter =m_EditorAttrMap.begin();iter != m_EditorAttrMap.end(); iter++) - { - delete iter->second; - iter->second = NULL; - } - m_EditorAttrMap.clear(); -}*/ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/lwpgrfobj.cxx b/lotuswordpro/source/filter/lwpgrfobj.cxx index 8971860926c2..56320836b00a 100644 --- a/lotuswordpro/source/filter/lwpgrfobj.cxx +++ b/lotuswordpro/source/filter/lwpgrfobj.cxx @@ -115,12 +115,6 @@ void LwpGraphicObject::Read() m_pObjStrm->QuickRead(m_sDataFormat,strsize); m_sDataFormat[strsize] = '\0'; } -/* - if (m_sDataFormat!=(unsigned char*)(".lch")) - { - return; - } -*/ sal_uInt32 nServerContextSize = m_pObjStrm->QuickReaduInt32(); unsigned char *pServerContext = NULL; if (nServerContextSize > 0) diff --git a/lotuswordpro/source/filter/lwpoleobject.hxx b/lotuswordpro/source/filter/lwpoleobject.hxx index 8a058bf6dfa3..a433bdfc1bbd 100644 --- a/lotuswordpro/source/filter/lwpoleobject.hxx +++ b/lotuswordpro/source/filter/lwpoleobject.hxx @@ -69,12 +69,6 @@ #include "lwpobjid.hxx" #include "lwpstory.hxx" #include "tools/gen.hxx" -/* -#include <so3/svstor.hxx> -#include <so3/outplace.hxx> -#include <so3/ipobj.hxx> -#include <so3/factory.hxx> -*/ #include <svx/svdoole2.hxx> #include <svx/svdpage.hxx> #include <sfx2/objsh.hxx> diff --git a/lotuswordpro/source/filter/lwpsdwfileloader.cxx b/lotuswordpro/source/filter/lwpsdwfileloader.cxx index 35465a78d899..a1987622325e 100644 --- a/lotuswordpro/source/filter/lwpsdwfileloader.cxx +++ b/lotuswordpro/source/filter/lwpsdwfileloader.cxx @@ -75,52 +75,6 @@ LwpSdwFileLoader::LwpSdwFileLoader(SvStream* pStream, LwpGraphicObject* pGraphic LwpSdwFileLoader::~LwpSdwFileLoader(void) { } -/* -void LwpSdwFileLoader::LoadObjectList(void) -{ - unsigned char BinSignature[2]; - m_pStream->Read(BinSignature,2); - - if (BinSignature[0] == 'S' && BinSignature[1] == 'M') - { - unsigned short nVersion; - m_pStream->Read(&nVersion,2); - - m_pStream->Seek(0); - if (nVersion<0x0102) - { - assert(false); - } - if (nVersion>=0x0102) - { - LwpSdwGroupLoaderV0102 sdwGroupLoader(m_pStream, m_pGraphicObj, m_pOutputStream); - sdwGroupLoader.LoadDrawGroupObject(); - } - } -} -void LwpSdwFileLoader::RegisterStyle() -{ - unsigned char BinSignature[2]; - m_pStream->Read(BinSignature,2); - - if (BinSignature[0] == 'S' && BinSignature[1] == 'M') - { - unsigned short nVersion; - m_pStream->Read(&nVersion,2); - - m_pStream->Seek(0); - if (nVersion<0x0102) - { - assert(false); - } - if (nVersion>=0x0102) - { - LwpSdwGroupLoaderV0102 sdwGroupLoader(m_pStream, m_pGraphicObj, m_pOutputStream); - sdwGroupLoader.RegisterGroupStyle(); - } - } -} -*/ // add by ,03/25/2005 /** * @descr entry of lwp-drawing objects. diff --git a/lotuswordpro/source/filter/utbenvs.cxx b/lotuswordpro/source/filter/utbenvs.cxx index 6fdb838f2bdb..4bbc6b848656 100644 --- a/lotuswordpro/source/filter/utbenvs.cxx +++ b/lotuswordpro/source/filter/utbenvs.cxx @@ -57,20 +57,6 @@ #include <assert.h> namespace OpenStormBento { -/* - * useless in SODC -void LtcUtBenValueStream::GetAmountLeft(sal_uLong * pAmtLeft) -{ - if (cCurrentPosition >= m_ulValueLength) - { - *pAmtLeft = 0; - } - else - { - *pAmtLeft = m_ulValueLength - cCurrentPosition; - } -} -*/ /** * Value stream read function * @date 07/05/2004 diff --git a/lotuswordpro/source/filter/xfilter/xfannotation.hxx b/lotuswordpro/source/filter/xfilter/xfannotation.hxx index a32c1b16111c..254263d022fe 100644 --- a/lotuswordpro/source/filter/xfilter/xfannotation.hxx +++ b/lotuswordpro/source/filter/xfilter/xfannotation.hxx @@ -71,14 +71,11 @@ public: void SetAuthor(rtl::OUString author); - //void Add(IXFContent *pContent); - virtual void ToXml(IXFStream *pStrm); private: rtl::OUString m_strDate; rtl::OUString m_strAuthor; - //XFContentContainer m_aContents; }; inline void XFAnnotation::SetDate(rtl::OUString date) @@ -90,12 +87,7 @@ inline void XFAnnotation::SetAuthor(rtl::OUString author) { m_strAuthor = author; } -/* -inline void XFAnnotation::Add(IXFContent *pContent) -{ - m_aContents.Add(pContent); -} -*/ + inline void XFAnnotation::ToXml(IXFStream *pStrm) { IXFAttrList *pAttrList = pStrm->GetAttrList(); @@ -107,7 +99,6 @@ inline void XFAnnotation::ToXml(IXFStream *pStrm) pAttrList->AddAttribute( A2OUSTR("office:author"), m_strAuthor); pStrm->StartElement( A2OUSTR("office:annotation") ); - //m_aContents.ToXml(pStrm); XFContentContainer::ToXml(pStrm); pStrm->EndElement( A2OUSTR("office:annotation") ); diff --git a/lotuswordpro/source/filter/xfilter/xfdrawobj.hxx b/lotuswordpro/source/filter/xfilter/xfdrawobj.hxx index 864449096a4e..d80e6df00cd8 100644 --- a/lotuswordpro/source/filter/xfilter/xfdrawobj.hxx +++ b/lotuswordpro/source/filter/xfilter/xfdrawobj.hxx @@ -129,23 +129,7 @@ inline void XFDrawObject::SetTextStyleName(rtl::OUString style) { m_strTextStyle = style; } -/* -inline void XFDrawObject::SetPosition(double x, double y, double width, double height) -{ - SetX(x); - SetY(y); - SetWidth(width); - SetHeight(height); -} -inline void XFDrawObject::SetPosition(XFRect rect) -{ - SetX(rect.GetX()); - SetY(rect.GetY()); - SetWidth(rect.GetWidth()); - SetHeight(rect.GetHeight()); -} -*/ inline void XFDrawObject::SetRotate(double degree, XFPoint aRotatePoint) { m_nFlag |= XFDRAWOBJECT_FLAG_ROTATE; diff --git a/lotuswordpro/source/filter/xfilter/xffooterstyle.hxx b/lotuswordpro/source/filter/xfilter/xffooterstyle.hxx index 7355d2da1628..a714a1c7e28c 100644 --- a/lotuswordpro/source/filter/xfilter/xffooterstyle.hxx +++ b/lotuswordpro/source/filter/xfilter/xffooterstyle.hxx @@ -79,44 +79,6 @@ public: if( top != -1 ) m_aMargin.SetTop(top); } -/* - void SetHeight(float height) - { - m_fHeight = height; - } - - void SetDynamicSpace(sal_Bool dynamic) - { - m_bDynamicSpace = dynamic; - } - virtual void ToXml(IXFStream *pStrm) - { - IXFAttrList *pAttrList = pStrm->GetAttrList(); - pAttrList->Clear(); - - pStrm->StartElement( A2OUSTR("style:footer-style") ); - - if(m_fHeight!=-1) - { - pAttrList->AddAttribute( A2OUSTR("svg:height"), FloatToOUString(m_fHeight) + A2OUSTR("cm") ); - } - - m_aMargin.ToXml(pStrm); - if( m_bDynamicSpace ) - pAttrList->AddAttribute( A2OUSTR("style:dynamic-spacing"), A2OUSTR("true") ); - else - pAttrList->AddAttribute( A2OUSTR("style:dynamic-spacing"), A2OUSTR("false") ); - pStrm->StartElement( A2OUSTR("style:properties") ); - pStrm->EndElement( A2OUSTR("style:properties") ); - - pStrm->EndElement( A2OUSTR("style:footer-style") ); - } - -private: - XFMargins m_aMargin; - sal_Bool m_bDynamicSpace; - float m_fHeight; - */ }; #endif diff --git a/lotuswordpro/source/filter/xfilter/xfsection.cxx b/lotuswordpro/source/filter/xfilter/xfsection.cxx index 3f422a10dee1..eeff45ad3407 100644 --- a/lotuswordpro/source/filter/xfilter/xfsection.cxx +++ b/lotuswordpro/source/filter/xfilter/xfsection.cxx @@ -103,31 +103,4 @@ void XFSection::ToXml(IXFStream *pStrm) pStrm->EndElement( A2OUSTR("text:section") ); } -/* -void XFSection::ToXmlHeader(IXFStream *pStrm) -{ - assert(m_strSectionName.getLength() > 0 ); - - IXFAttrList *pAttrList = pStrm->GetAttrList(); - - pAttrList->Clear(); - rtl::OUString style = GetStyleName(); - if( style.getLength() ) - pAttrList->AddAttribute( A2OUSTR("text:style-name"), style); - //section name - if( m_strSectionName.getLength() ) - pAttrList->AddAttribute( A2OUSTR("text:name"), m_strSectionName); - if( m_bProtected ) - pAttrList->AddAttribute( A2OUSTR("text:protected"), A2OUSTR("true") ); - if( m_bHiden ) - pAttrList->AddAttribute( A2OUSTR("text:display"), A2OUSTR("none") ); - - pStrm->StartElement( A2OUSTR("text:section") ); -} - -void XFSection::ToXmlTail(IXFStream *pStrm) -{ - pStrm->EndElement( A2OUSTR("text:section") ); -} -*/ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/xfilter/xfsection.hxx b/lotuswordpro/source/filter/xfilter/xfsection.hxx index fb3acb46c076..a6e1a04c6672 100644 --- a/lotuswordpro/source/filter/xfilter/xfsection.hxx +++ b/lotuswordpro/source/filter/xfilter/xfsection.hxx @@ -82,12 +82,7 @@ public: * @descr Output section obejct. */ virtual void ToXml(IXFStream *pStrm); -/* -private: - void ToXmlHeader(IXFStream *pStrm); - void ToXmlTail(IXFStream *pStrm); -*/ private: rtl::OUString m_strSectionName; sal_Bool m_bProtected; diff --git a/lotuswordpro/source/filter/xfilter/xftable.cxx b/lotuswordpro/source/filter/xfilter/xftable.cxx index c3fc14cbeab3..54915ea41d98 100644 --- a/lotuswordpro/source/filter/xfilter/xftable.cxx +++ b/lotuswordpro/source/filter/xfilter/xftable.cxx @@ -178,12 +178,6 @@ sal_Int32 XFTable::GetRowCount() } return rowMax; -/* - if( m_aRows.size()<1 ) - return 0; - std::map<sal_Int32,XFRow*>::iterator it = m_aRows.end(); - it--; - return it->first;*/ } XFRow* XFTable::GetRow(sal_Int32 row) |