From b48a6f14e5fff7ec8f2a9f9fcf49a035b7287c97 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 18 Aug 2011 00:56:28 +0100 Subject: callcatcher: unused code --- lotuswordpro/source/filter/bencont.cxx | 69 ---------------------- lotuswordpro/source/filter/bento.hxx | 6 -- lotuswordpro/source/filter/lwpgrfobj.cxx | 34 ----------- lotuswordpro/source/filter/lwpgrfobj.hxx | 2 - lotuswordpro/source/filter/lwplayout.cxx | 36 ----------- lotuswordpro/source/filter/lwplayout.hxx | 5 -- .../source/filter/lwpnumberingoverride.cxx | 51 ---------------- .../source/filter/lwpnumberingoverride.hxx | 2 - lotuswordpro/source/filter/lwpobj.cxx | 6 -- 9 files changed, 211 deletions(-) (limited to 'lotuswordpro') diff --git a/lotuswordpro/source/filter/bencont.cxx b/lotuswordpro/source/filter/bencont.cxx index 6a68f2c6f6e0..f19535b361ca 100644 --- a/lotuswordpro/source/filter/bencont.cxx +++ b/lotuswordpro/source/filter/bencont.cxx @@ -113,12 +113,6 @@ LtcBenContainer::Open() // delete two inputs return BenErr_OK; } -void -LtcBenContainer::Release() -{ - delete this; -} - BenError LtcBenContainer::RegisterPropertyName(const char * sPropertyName, pCBenPropertyName * ppPropertyName) @@ -147,34 +141,6 @@ LtcBenContainer::RegisterPropertyName(const char * sPropertyName, return BenErr_OK; } -BenError -LtcBenContainer::RegisterTypeName(const char * sTypeName, - pCBenTypeName * ppTypeName) -{ - pCBenNamedObjectListElmt pPrevNamedObjectListElmt; - pCBenNamedObject pNamedObject = FindNamedObject(&cNamedObjects, sTypeName, - &pPrevNamedObjectListElmt); - - if (pNamedObject != NULL) - { - if (! pNamedObject->IsTypeName()) - return BenErr_NameConflict; - else *ppTypeName = (pCBenTypeName) pNamedObject; - } - else - { - pCBenIDListElmt pPrevObject; - if (FindID(&cObjects, cNextAvailObjectID, &pPrevObject) != NULL) - return BenErr_DuplicateObjectID; - - *ppTypeName = new CBenTypeName(this, cNextAvailObjectID, - (pCBenObject) pPrevObject, sTypeName, pPrevNamedObjectListElmt); - ++cNextAvailObjectID; - } - - return BenErr_OK; -} - BenError LtcBenContainer::NewObject(pCBenObject * ppBenObject) { @@ -280,17 +246,6 @@ BenError LtcBenContainer::SeekFromEnd(long Offset) return BenErr_OK; } /** -* Get position in the bento file -* @date 07/05/2004 -* @param pointer of current position in container file from end -* @return BenError -*/ -BenError LtcBenContainer::GetPosition(BenContainerPos * pPosition) -{ - *pPosition = cpStream->Tell(); - return BenErr_OK; -} -/** * Find the next value stream with property name * @date 07/05/2004 * @param string of property name @@ -338,30 +293,6 @@ LtcUtBenValueStream * LtcBenContainer::FindValueStreamWithPropertyName(const cha return FindNextValueStreamWithPropertyName(sPropertyName, NULL); } /** -* Find the unique value stream with property name and Object ID -* @date 10/24/2005 -* @param object ID -* @param string of property name -* @return the only value stream pointer with the property names -*/ -LtcUtBenValueStream * LtcBenContainer::FindObjectValueStreamWithObjectIDAndProperty(BenObjectID ObjectID, const char * sPropertyName) -{ - CBenPropertyName * pPropertyName; - RegisterPropertyName(sPropertyName, &pPropertyName); // Get property name object - if (NULL == pPropertyName) - return NULL; // Property not exist - // Get current object - CBenObject * pObj = NULL; - pObj = FindObject(ObjectID); // Get object with object ID - if (NULL == pObj) - return NULL; - CBenValue * pValue; - LtcUtBenValueStream * pValueStream; - pValue = pObj->UseValue(pPropertyName->GetID()); - pValueStream = new LtcUtBenValueStream(pValue); - return pValueStream; -} -/** * * @date 07/05/2004 * @param pointer to length of bento file diff --git a/lotuswordpro/source/filter/bento.hxx b/lotuswordpro/source/filter/bento.hxx index c870f0d3a9bb..f9715bf9628a 100644 --- a/lotuswordpro/source/filter/bento.hxx +++ b/lotuswordpro/source/filter/bento.hxx @@ -261,10 +261,7 @@ class LtcBenContainer { public: BenError Open(); - void Release(); // Deletes container object--last call BenError Close(); - BenError RegisterTypeName(const char * sTypeName, - pCBenTypeName * ppTypeName); BenError RegisterPropertyName(const char * sPropertyName, pCBenPropertyName * ppPropertyName); // Pass NULL to begin iteration. Done when returns NULL. @@ -285,8 +282,6 @@ public: // Internal methods BenError SeekToPosition(BenContainerPos Pos); BenError SeekFromEnd(long Offset); - BenError GetPosition(BenContainerPos * pPosition); - BenObjectID GetNextAvailObjectID() { return cNextAvailObjectID; } void SetNextAvailObjectID(BenObjectID ID) { cNextAvailObjectID = ID; } pCUtList GetObjects() { return &cObjects; } @@ -294,7 +289,6 @@ public: // Internal methods LtcUtBenValueStream * FindNextValueStreamWithPropertyName(const char * sPropertyName, LtcUtBenValueStream * pCurrentValueStream); LtcUtBenValueStream * FindValueStreamWithPropertyName(const char * sPropertyName); - LtcUtBenValueStream * FindObjectValueStreamWithObjectIDAndProperty(BenObjectID ObjectID, const char * sPropertyName); BenError CreateGraphicStream(SvStream * &pStream, const char *pObjectName); BenError GetSize(sal_uLong * pLength); diff --git a/lotuswordpro/source/filter/lwpgrfobj.cxx b/lotuswordpro/source/filter/lwpgrfobj.cxx index 04fba146d28a..6998e69e22ce 100644 --- a/lotuswordpro/source/filter/lwpgrfobj.cxx +++ b/lotuswordpro/source/filter/lwpgrfobj.cxx @@ -250,40 +250,6 @@ void LwpGraphicObject::XFConvert (XFContentContainer* pCont) { XFConvertEquation(pCont); } - if (m_sServerContextFormat[1]=='l'&&m_sServerContextFormat[2]=='c'&&m_sServerContextFormat[3]=='h') - { - //LwpSvStream* pDocStream = m_pStrm; - //LwpChartStreamTools::ParseChart(pDocStream, GetObjectID(), - // GetRectIn100thMM(), GetRectInCM(), pOutputStream); - //LwpChartStreamTools::ParseChart(pDocStream, GetObjectID(), - // GetRectIn100thMM(), GetRectInCM(), pCont, m_strStyleName); - } -} - -/** -* @short Get the rectangle of a chart in 100thMM -* @descr -* @return the rectangle of the chart -*/ -Rectangle LwpGraphicObject::GetRectIn100thMM() -{ -#define To100thMM(num) (long)(2540* (double(num)/(72 * 65536L))) - sal_Int32 nLeft,nTop,nRight,nBottom; - GetRect(nLeft,nTop,nRight,nBottom); - return Rectangle( To100thMM(nLeft),To100thMM(nTop),To100thMM(nRight),To100thMM(nBottom) ); -} - -/** -* @short Get the rectangle of a chart in CM -* @descr -* @return The rectangle of the chart -*/ -XFRect LwpGraphicObject::GetRectInCM() -{ -#define ToCM(num) (2.54*(double(num)/(72 * 65536L))) - sal_Int32 nLeft,nTop,nRight,nBottom; - GetRect(nLeft,nTop,nRight,nBottom); - return XFRect( ToCM(nLeft),ToCM(nTop),ToCM(nRight-nLeft),ToCM(nBottom-nTop) ); } /** diff --git a/lotuswordpro/source/filter/lwpgrfobj.hxx b/lotuswordpro/source/filter/lwpgrfobj.hxx index b5c3ef4cdeac..a0dc6347e8bf 100644 --- a/lotuswordpro/source/filter/lwpgrfobj.hxx +++ b/lotuswordpro/source/filter/lwpgrfobj.hxx @@ -105,8 +105,6 @@ private: ImageProcessingData m_aIPData; void GetRect(sal_Int32& nLeft, sal_Int32& nTop, sal_Int32& nRight, sal_Int32& nBottom); - XFRect GetRectInCM(); - Rectangle GetRectIn100thMM(); void XFConvertEquation(XFContentContainer* pCont); void ParseChart(IXFStream* pOutputStream); diff --git a/lotuswordpro/source/filter/lwplayout.cxx b/lotuswordpro/source/filter/lwplayout.cxx index 2bb90d7cccb2..4a4ebe9a5bcd 100644 --- a/lotuswordpro/source/filter/lwplayout.cxx +++ b/lotuswordpro/source/filter/lwplayout.cxx @@ -955,15 +955,6 @@ sal_uInt16 LwpMiddleLayout::GetScaleTile(void) return 0; } -void LwpMiddleLayout::SetScaleTile(sal_uInt16 nVal) -{ - m_nOverrideFlag |= OVER_SCALING; - if (nVal) - GetLayoutScale()->SetPlacement(GetLayoutScale()->GetPlacement() | LwpLayoutScale::TILED); - else - GetLayoutScale()->SetPlacement(GetLayoutScale()->GetPlacement() & ~LwpLayoutScale::TILED); -} - sal_uInt16 LwpMiddleLayout::GetScaleCenter(void) { if ((m_nOverrideFlag & OVER_SCALING) && m_LayScale.obj()) @@ -975,15 +966,6 @@ sal_uInt16 LwpMiddleLayout::GetScaleCenter(void) return 0; } -void LwpMiddleLayout::SetScaleCenter(sal_uInt16 nVal) -{ - m_nOverrideFlag |= OVER_SCALING; - if (nVal) - GetLayoutScale()->SetPlacement(GetLayoutScale()->GetPlacement() | LwpLayoutScale::CENTERED); - else - GetLayoutScale()->SetPlacement(GetLayoutScale()->GetPlacement() & ~LwpLayoutScale::CENTERED); -} - sal_uInt32 LwpMiddleLayout::GetScalePercentage(void) { if ((m_nOverrideFlag & OVER_SCALING) && m_LayScale.obj()) @@ -994,12 +976,6 @@ sal_uInt32 LwpMiddleLayout::GetScalePercentage(void) return 100; } -void LwpMiddleLayout::SetScalePercentage(sal_uInt32 nVal) -{ - m_nOverrideFlag |= OVER_SCALING; - GetLayoutScale()->SetScalePercentage(nVal*10); -} - double LwpMiddleLayout::GetScaleWidth(void) { if ((m_nOverrideFlag & OVER_SCALING) && m_LayScale.obj()) @@ -1010,12 +986,6 @@ double LwpMiddleLayout::GetScaleWidth(void) return 0; } -void LwpMiddleLayout::SetScaleWidth(double fVal) -{ - m_nOverrideFlag |= OVER_SCALING; - GetLayoutScale()->SetScaleWidth(LwpTools::ConvertToUnits(fVal)); -} - double LwpMiddleLayout::GetScaleHeight(void) { if ((m_nOverrideFlag & OVER_SCALING) && m_LayScale.obj()) @@ -1144,12 +1114,6 @@ LwpPoint LwpMiddleLayout::GetOrigin() return LwpPoint(); } -void LwpMiddleLayout::SetScaleHeight(double fVal) -{ - m_nOverrideFlag |= OVER_SCALING; - GetLayoutScale()->SetScaleHeight(LwpTools::ConvertToUnits(fVal)); -} - /** * @descr: Whether the fill is pattern fill or not * @return: True if yes, false if not. diff --git a/lotuswordpro/source/filter/lwplayout.hxx b/lotuswordpro/source/filter/lwplayout.hxx index 39f82e98d050..2ea81957856e 100644 --- a/lotuswordpro/source/filter/lwplayout.hxx +++ b/lotuswordpro/source/filter/lwplayout.hxx @@ -306,15 +306,10 @@ public: LwpLayoutScale* GetLayoutScale(){return dynamic_cast(m_LayScale.obj());} sal_uInt16 GetScaleMode(void); sal_uInt16 GetScaleTile(void); - void SetScaleTile(sal_uInt16 nVal); sal_uInt16 GetScaleCenter(void); - void SetScaleCenter(sal_uInt16 nVal); sal_uInt32 GetScalePercentage(void); - void SetScalePercentage(sal_uInt32 nVal); double GetScaleWidth(void); - void SetScaleWidth(double fVal); double GetScaleHeight(void); - void SetScaleHeight(double fVal); sal_Bool CanSizeRight(void); virtual double GetWidth(); diff --git a/lotuswordpro/source/filter/lwpnumberingoverride.cxx b/lotuswordpro/source/filter/lwpnumberingoverride.cxx index 47f3b9a8976c..a87ee781aeb7 100644 --- a/lotuswordpro/source/filter/lwpnumberingoverride.cxx +++ b/lotuswordpro/source/filter/lwpnumberingoverride.cxx @@ -92,57 +92,6 @@ void LwpNumberingOverride::Read(LwpObjectStream *pStrm) pStrm->SkipExtra(); } -void LwpNumberingOverride::Override(LwpNumberingOverride* pOther) -{ - if (m_nApply & NO_LEVEL) - { - if (IsLevelOverridden()) - { - pOther->OverrideLevel(m_nLevel); - } - else - { - pOther->RevertLevel(); - } - } - - if (m_nApply & NO_POSITION) - { - if (IsPositionOverridden()) - { - pOther->OverridePosition(m_nPosition); - } - else - { - pOther->RevertPosition(); - } - } - - if (m_nApply & HEADING) - { - if (IsHeadingOverridden()) - { - pOther->OverrideHeading(IsHeading()); - } - else - { - pOther->RevertHeading(); - } - } - - if (m_nApply & SMARTLEVEL) - { - if (IsSmartLevelOverridden()) - { - pOther->OverrideSmartLevel(IsSmartLevel()); - } - else - { - pOther->RevertSmartLevel(); - } - } -} - void LwpNumberingOverride::OverrideLevel(sal_uInt16 nNewLv) { m_nLevel = nNewLv; diff --git a/lotuswordpro/source/filter/lwpnumberingoverride.hxx b/lotuswordpro/source/filter/lwpnumberingoverride.hxx index 68749a12d0f6..4cb443f326f0 100644 --- a/lotuswordpro/source/filter/lwpnumberingoverride.hxx +++ b/lotuswordpro/source/filter/lwpnumberingoverride.hxx @@ -81,8 +81,6 @@ public: public: virtual void Read(LwpObjectStream *pStrm); - void Override(LwpNumberingOverride* pOther); - inline sal_uInt16 GetLevel() const; inline sal_uInt16 GetPosition() const; diff --git a/lotuswordpro/source/filter/lwpobj.cxx b/lotuswordpro/source/filter/lwpobj.cxx index b434f655e085..be52cda36c32 100644 --- a/lotuswordpro/source/filter/lwpobj.cxx +++ b/lotuswordpro/source/filter/lwpobj.cxx @@ -60,12 +60,6 @@ #include "lwpobj.hxx" -/** - * @descr private contor to ensure only object constructed from stream - */ -LwpObject::LwpObject() - : m_pObjStrm(NULL), m_pFoundry(NULL), m_pStrm(NULL) -{} /** * @descr construct lwpobject from stream */ -- cgit