From 01c2626107326cc55cd5e5842c78310cf53be9c4 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 28 Apr 2015 14:09:29 +0200 Subject: loplugin:staticmethods Change-Id: Ib765ce5a61916b0598ebb42cb9445a5f09c8d37f --- lotuswordpro/source/filter/explode.hxx | 2 +- lotuswordpro/source/filter/lwpbackgroundstuff.hxx | 2 +- lotuswordpro/source/filter/lwpbulletstylemgr.cxx | 2 +- lotuswordpro/source/filter/lwpcelllayout.hxx | 4 ++-- lotuswordpro/source/filter/lwpdivopts.hxx | 2 +- lotuswordpro/source/filter/lwpdoc.hxx | 2 +- lotuswordpro/source/filter/lwpdocdata.hxx | 4 ++-- lotuswordpro/source/filter/lwpdrawobj.cxx | 22 +++++++++++----------- lotuswordpro/source/filter/lwpdrawobj.hxx | 6 +++--- lotuswordpro/source/filter/lwpfont.hxx | 4 ++-- lotuswordpro/source/filter/lwpfoundry.cxx | 2 +- lotuswordpro/source/filter/lwpfoundry.hxx | 4 ++-- lotuswordpro/source/filter/lwpfribmark.hxx | 2 +- lotuswordpro/source/filter/lwpfribptr.hxx | 2 +- lotuswordpro/source/filter/lwpgrfobj.cxx | 6 +++--- lotuswordpro/source/filter/lwpgrfobj.hxx | 2 +- lotuswordpro/source/filter/lwpnumericfmt.hxx | 2 +- lotuswordpro/source/filter/lwpobjstrm.hxx | 2 +- lotuswordpro/source/filter/lwppara.hxx | 2 +- lotuswordpro/source/filter/lwppara1.cxx | 2 +- lotuswordpro/source/filter/lwpparastyle.cxx | 2 +- lotuswordpro/source/filter/lwpparastyle.hxx | 4 ++-- lotuswordpro/source/filter/lwpprtinfo.hxx | 4 ++-- lotuswordpro/source/filter/lwpsilverbullet.hxx | 6 +++--- lotuswordpro/source/filter/lwptablelayout.hxx | 2 +- lotuswordpro/source/filter/lwptoc.hxx | 2 +- lotuswordpro/source/filter/lwpuidoc.cxx | 2 +- lotuswordpro/source/filter/lwpuidoc.hxx | 2 +- lotuswordpro/source/filter/lwpusrdicts.hxx | 2 +- lotuswordpro/source/filter/xfilter/xfframe.hxx | 2 +- 30 files changed, 52 insertions(+), 52 deletions(-) (limited to 'lotuswordpro') diff --git a/lotuswordpro/source/filter/explode.hxx b/lotuswordpro/source/filter/explode.hxx index 9db360bcc847..5cb560182f67 100644 --- a/lotuswordpro/source/filter/explode.hxx +++ b/lotuswordpro/source/filter/explode.hxx @@ -119,7 +119,7 @@ public: void ConstructTree1(); void ConstructTree2(); void fillArray(); - void ToString(sal_uInt32 nBits, sal_Char *pChar, sal_uInt32 nLen); + static void ToString(sal_uInt32 nBits, sal_Char *pChar, sal_uInt32 nLen); }; #endif diff --git a/lotuswordpro/source/filter/lwpbackgroundstuff.hxx b/lotuswordpro/source/filter/lwpbackgroundstuff.hxx index 085e0926e1ec..60d12d1d75ce 100644 --- a/lotuswordpro/source/filter/lwpbackgroundstuff.hxx +++ b/lotuswordpro/source/filter/lwpbackgroundstuff.hxx @@ -145,7 +145,7 @@ public: } private: - void GetPattern(sal_uInt16 btPttnIndex, sal_uInt8* pPttnArray); + static void GetPattern(sal_uInt16 btPttnIndex, sal_uInt8* pPttnArray); public: void Read(LwpObjectStream *pStrm); diff --git a/lotuswordpro/source/filter/lwpbulletstylemgr.cxx b/lotuswordpro/source/filter/lwpbulletstylemgr.cxx index feb3e49a736f..933f239bd5fa 100644 --- a/lotuswordpro/source/filter/lwpbulletstylemgr.cxx +++ b/lotuswordpro/source/filter/lwpbulletstylemgr.cxx @@ -172,7 +172,7 @@ OUString LwpBulletStyleMgr::RegisterBulletStyle(LwpPara* pPara, LwpBulletOverrid for (sal_uInt8 nC = 1; nC < 11; nC++) { pListStyle->SetListBullet(nC, pSilverBullet->GetBulletChar(), pSilverBullet->GetBulletFontName(), - pSilverBullet->GetPrefix(), pSilverBullet->GetSuffix()); + LwpSilverBullet::GetPrefix(), LwpSilverBullet::GetSuffix()); if (pIndent->GetMRest() > 0) /* note: used to be 0.001, no idea why */ { diff --git a/lotuswordpro/source/filter/lwpcelllayout.hxx b/lotuswordpro/source/filter/lwpcelllayout.hxx index ac0630e6e62f..1ca533ad8d60 100644 --- a/lotuswordpro/source/filter/lwpcelllayout.hxx +++ b/lotuswordpro/source/filter/lwpcelllayout.hxx @@ -117,8 +117,8 @@ protected: OUString GetCellStyleName(sal_uInt16 nRow, sal_uInt16 nCol, LwpTableLayout * pTableLayout); void RegisterDefaultCell(); virtual LwpCellBorderType GetCellBorderType(sal_uInt16 nRow, sal_uInt16 nCol, LwpTableLayout * pTableLayout); - LwpCellLayout * GetCellByRowCol(sal_uInt16 nRow, sal_uInt16 nCol, LwpTableLayout * pTableLayout); - sal_uInt16 GetLeftColID(sal_uInt16 nCol){return nCol - 1; }; + static LwpCellLayout * GetCellByRowCol(sal_uInt16 nRow, sal_uInt16 nCol, LwpTableLayout * pTableLayout); + static sal_uInt16 GetLeftColID(sal_uInt16 nCol){return nCol - 1; }; virtual sal_uInt16 GetBelowRowID(sal_uInt16 nRow){return nRow + 1; }; sal_uInt16 crowid; diff --git a/lotuswordpro/source/filter/lwpdivopts.hxx b/lotuswordpro/source/filter/lwpdivopts.hxx index 1445aa5c16d6..432178772936 100644 --- a/lotuswordpro/source/filter/lwpdivopts.hxx +++ b/lotuswordpro/source/filter/lwpdivopts.hxx @@ -100,7 +100,7 @@ public: ~LwpTextLanguage(); void Read(LwpObjectStream *pStrm); private: - sal_uInt16 ConvertFrom96(sal_uInt16 orgLang); + static sal_uInt16 ConvertFrom96(sal_uInt16 orgLang); sal_uInt16 m_nLanguage; }; diff --git a/lotuswordpro/source/filter/lwpdoc.hxx b/lotuswordpro/source/filter/lwpdoc.hxx index a1dfee26d4d4..31b9338dbfc9 100644 --- a/lotuswordpro/source/filter/lwpdoc.hxx +++ b/lotuswordpro/source/filter/lwpdoc.hxx @@ -174,7 +174,7 @@ public: private: void MaxNumberOfPages(sal_uInt16& nNumPages); void XFConvertFrameInPage(XFContentContainer* pCont); - void ChangeStyleName(); + static void ChangeStyleName(); bool IsSkippedDivision(); }; diff --git a/lotuswordpro/source/filter/lwpdocdata.hxx b/lotuswordpro/source/filter/lwpdocdata.hxx index 48414b32a769..226a18a77ce1 100644 --- a/lotuswordpro/source/filter/lwpdocdata.hxx +++ b/lotuswordpro/source/filter/lwpdocdata.hxx @@ -176,8 +176,8 @@ private: LtTm m_nLastRevisionTime; LtTm m_nTotalEditTime; private: - OUString DateTimeToOUString(LtTm& dt); - OUString TimeToOUString(LtTm& dt); + static OUString DateTimeToOUString(LtTm& dt); + static OUString TimeToOUString(LtTm& dt); public: void Read() SAL_OVERRIDE; diff --git a/lotuswordpro/source/filter/lwpdrawobj.cxx b/lotuswordpro/source/filter/lwpdrawobj.cxx index 63a5d33be74f..5fc78170fd5b 100644 --- a/lotuswordpro/source/filter/lwpdrawobj.cxx +++ b/lotuswordpro/source/filter/lwpdrawobj.cxx @@ -317,11 +317,11 @@ void LwpDrawObj::SetArrowHead(XFDrawStyle* pOpenedObjStyle, sal_uInt8 nArrowFlag if (nLeftArrow) { - pOpenedObjStyle->SetArrowStart( this->GetArrowName(nLeftArrow), fArrowSize, true); + pOpenedObjStyle->SetArrowStart( GetArrowName(nLeftArrow), fArrowSize, true); } if (nRightArrow) { - pOpenedObjStyle->SetArrowEnd( this->GetArrowName(nRightArrow), fArrowSize, true); + pOpenedObjStyle->SetArrowEnd( GetArrowName(nRightArrow), fArrowSize, true); } } @@ -440,10 +440,10 @@ OUString LwpDrawLine::RegisterStyle() XFDrawStyle* pStyle = new XFDrawStyle(); // set line style - this->SetLineStyle(pStyle, m_aLineRec.nLineWidth, m_aLineRec.nLineStyle, m_aLineRec.aPenColor); + SetLineStyle(pStyle, m_aLineRec.nLineWidth, m_aLineRec.nLineStyle, m_aLineRec.aPenColor); // set arrow head - this->SetArrowHead(pStyle, m_aLineRec.nLineEnd, m_aLineRec.nLineWidth); + SetArrowHead(pStyle, m_aLineRec.nLineEnd, m_aLineRec.nLineWidth); XFStyleManager* pXFStyleManager = LwpGlobalMgr::GetInstance()->GetXFStyleManager(); return (pXFStyleManager->AddStyle(pStyle)).m_pStyle->GetStyleName(); @@ -522,11 +522,11 @@ OUString LwpDrawPolyLine::RegisterStyle() XFDrawStyle* pStyle = new XFDrawStyle(); // set line style - this->SetLineStyle(pStyle, m_aPolyLineRec.nLineWidth, m_aPolyLineRec.nLineStyle, + SetLineStyle(pStyle, m_aPolyLineRec.nLineWidth, m_aPolyLineRec.nLineStyle, m_aPolyLineRec.aPenColor); // set arrow head - this->SetArrowHead(pStyle, m_aPolyLineRec.nLineEnd, m_aPolyLineRec.nLineWidth); + SetArrowHead(pStyle, m_aPolyLineRec.nLineEnd, m_aPolyLineRec.nLineWidth); XFStyleManager* pXFStyleManager = LwpGlobalMgr::GetInstance()->GetXFStyleManager(); return pXFStyleManager->AddStyle(pStyle).m_pStyle->GetStyleName(); @@ -608,7 +608,7 @@ OUString LwpDrawPolygon::RegisterStyle() XFDrawStyle* pStyle = new XFDrawStyle(); // set line style - this->SetLineStyle(pStyle, m_aClosedObjStyleRec.nLineWidth, m_aClosedObjStyleRec.nLineStyle, + SetLineStyle(pStyle, m_aClosedObjStyleRec.nLineWidth, m_aClosedObjStyleRec.nLineStyle, m_aClosedObjStyleRec.aPenColor); // set fill style @@ -688,7 +688,7 @@ OUString LwpDrawRectangle::RegisterStyle() XFDrawStyle* pStyle = new XFDrawStyle(); // set line style - this->SetLineStyle(pStyle, m_aClosedObjStyleRec.nLineWidth, m_aClosedObjStyleRec.nLineStyle, + SetLineStyle(pStyle, m_aClosedObjStyleRec.nLineWidth, m_aClosedObjStyleRec.nLineStyle, m_aClosedObjStyleRec.aPenColor); // set fill style @@ -847,7 +847,7 @@ OUString LwpDrawEllipse::RegisterStyle() XFDrawStyle* pStyle = new XFDrawStyle(); // set line style - this->SetLineStyle(pStyle, m_aClosedObjStyleRec.nLineWidth, m_aClosedObjStyleRec.nLineStyle, + SetLineStyle(pStyle, m_aClosedObjStyleRec.nLineWidth, m_aClosedObjStyleRec.nLineStyle, m_aClosedObjStyleRec.aPenColor); // set fill style @@ -926,11 +926,11 @@ OUString LwpDrawArc::RegisterStyle() XFDrawStyle* pStyle = new XFDrawStyle(); // set line style - this->SetLineStyle(pStyle, m_aArcRec.nLineWidth, m_aArcRec.nLineStyle, + SetLineStyle(pStyle, m_aArcRec.nLineWidth, m_aArcRec.nLineStyle, m_aArcRec.aPenColor); // set arrow head - this->SetArrowHead(pStyle, m_aArcRec.nLineEnd, m_aArcRec.nLineWidth); + SetArrowHead(pStyle, m_aArcRec.nLineEnd, m_aArcRec.nLineWidth); XFStyleManager* pXFStyleManager = LwpGlobalMgr::GetInstance()->GetXFStyleManager(); return pXFStyleManager->AddStyle(pStyle).m_pStyle->GetStyleName(); diff --git a/lotuswordpro/source/filter/lwpdrawobj.hxx b/lotuswordpro/source/filter/lwpdrawobj.hxx index 457a1fbccc5c..a379478c5969 100644 --- a/lotuswordpro/source/filter/lwpdrawobj.hxx +++ b/lotuswordpro/source/filter/lwpdrawobj.hxx @@ -95,11 +95,11 @@ private: protected: void ReadClosedObjStyle(); void SetFillStyle(XFDrawStyle* pStyle); - void SetLineStyle(XFDrawStyle* pStyle, sal_uInt8 nWidth, sal_uInt8 nLineStyle, + static void SetLineStyle(XFDrawStyle* pStyle, sal_uInt8 nWidth, sal_uInt8 nLineStyle, const SdwColor& rColor); void SetPosition(XFFrame* pObj); - void SetArrowHead(XFDrawStyle* pOpenedObjStyle, sal_uInt8 nArrowFlag, sal_uInt8 nLineWidth); - OUString GetArrowName(sal_uInt8 nArrowStyle); + static void SetArrowHead(XFDrawStyle* pOpenedObjStyle, sal_uInt8 nArrowFlag, sal_uInt8 nLineWidth); + static OUString GetArrowName(sal_uInt8 nArrowStyle); protected: /** diff --git a/lotuswordpro/source/filter/lwpfont.hxx b/lotuswordpro/source/filter/lwpfont.hxx index cda119dd5eae..bee86af38249 100644 --- a/lotuswordpro/source/filter/lwpfont.hxx +++ b/lotuswordpro/source/filter/lwpfont.hxx @@ -280,8 +280,8 @@ public: private: void Override(sal_uInt32 fontID, rtl::Reference const & pFont); - inline sal_uInt16 GetFontNameIndex(sal_uInt32 fontID); - inline sal_uInt16 GetFontAttrIndex(sal_uInt32 fontID); + static inline sal_uInt16 GetFontNameIndex(sal_uInt32 fontID); + static inline sal_uInt16 GetFontAttrIndex(sal_uInt32 fontID); }; sal_uInt16 LwpFontManager::GetFontNameIndex(sal_uInt32 fontID) diff --git a/lotuswordpro/source/filter/lwpfoundry.cxx b/lotuswordpro/source/filter/lwpfoundry.cxx index 232afb861d09..d343520ae96e 100644 --- a/lotuswordpro/source/filter/lwpfoundry.cxx +++ b/lotuswordpro/source/filter/lwpfoundry.cxx @@ -111,7 +111,7 @@ void LwpFoundry::Read(LwpObjectStream *pStrm) { if (!m_pDoc->IsChildDoc()) { - m_VerMgr.Read(pStrm); + LwpVersionManager::Read(pStrm); } m_ObjMgr.Read(pStrm); diff --git a/lotuswordpro/source/filter/lwpfoundry.hxx b/lotuswordpro/source/filter/lwpfoundry.hxx index b0d9af4b552a..3f137c2aeec1 100644 --- a/lotuswordpro/source/filter/lwpfoundry.hxx +++ b/lotuswordpro/source/filter/lwpfoundry.hxx @@ -86,8 +86,8 @@ public: LwpVersionManager(){} ~LwpVersionManager(){} public: - void Read(LwpObjectStream *pStrm); - void Skip(LwpObjectStream *pStrm); + static void Read(LwpObjectStream *pStrm); + static void Skip(LwpObjectStream *pStrm); }; class LwpObjectManager diff --git a/lotuswordpro/source/filter/lwpfribmark.hxx b/lotuswordpro/source/filter/lwpfribmark.hxx index 93b8ca1ab61b..cf8484159f07 100644 --- a/lotuswordpro/source/filter/lwpfribmark.hxx +++ b/lotuswordpro/source/filter/lwpfribmark.hxx @@ -144,7 +144,7 @@ private: void ConvertDocFieldEnd(XFContentContainer* pXFPara,LwpFieldMark* pFieldMark); void ConvertDateTimeStart(XFContentContainer* pXFPara,LwpFieldMark* pFieldMark); void ConvertDateTimeEnd(XFContentContainer* pXFPara,LwpFieldMark* pFieldMark); - void ConvertCrossRefEnd(XFContentContainer* pXFPara,LwpFieldMark* pFieldMark); + static void ConvertCrossRefEnd(XFContentContainer* pXFPara,LwpFieldMark* pFieldMark); void ConvertCrossRefStart(XFContentContainer* pXFPara,LwpFieldMark* pFieldMark); }; diff --git a/lotuswordpro/source/filter/lwpfribptr.hxx b/lotuswordpro/source/filter/lwpfribptr.hxx index 8892b3f7484b..ada571f09595 100644 --- a/lotuswordpro/source/filter/lwpfribptr.hxx +++ b/lotuswordpro/source/filter/lwpfribptr.hxx @@ -82,7 +82,7 @@ private: LwpFrib* m_pFribs; XFParagraph* m_pXFPara;//for parse ,add by 1-17 //Current XFPara used for frib parsing LwpPara* m_pPara;//for get foundry, add by 1-17 - void ProcessDropcap(LwpStory* pStory,LwpFrib* pFrib,sal_uInt32 nLen); + static void ProcessDropcap(LwpStory* pStory,LwpFrib* pFrib,sal_uInt32 nLen); public: // String GetText(); void XFConvert(); diff --git a/lotuswordpro/source/filter/lwpgrfobj.cxx b/lotuswordpro/source/filter/lwpgrfobj.cxx index 2d5e2a6935f8..6192263b8075 100644 --- a/lotuswordpro/source/filter/lwpgrfobj.cxx +++ b/lotuswordpro/source/filter/lwpgrfobj.cxx @@ -308,7 +308,7 @@ void LwpGraphicObject::CreateDrawObjects() // get graphic object's bento objet name LwpObjectID& rMyID = this->GetObjectID(); std::string aGrfObjName; - this->GetBentoNamebyID(rMyID, aGrfObjName); + GetBentoNamebyID(rMyID, aGrfObjName); // get bento stream by the name pBentoContainer->CreateGraphicStream(pDrawObjStream, aGrfObjName.c_str()); @@ -360,7 +360,7 @@ sal_uInt32 LwpGraphicObject::GetRawGrafData(sal_uInt8*& pGrafData) // get graphic object's bento objet name LwpObjectID& rMyID = this->GetObjectID(); std::string aGrfObjName; - this->GetBentoNamebyID(rMyID, aGrfObjName); + GetBentoNamebyID(rMyID, aGrfObjName); // get bento stream by the name pBentoContainer->CreateGraphicStream(pGrafStream, aGrfObjName.c_str()); @@ -403,7 +403,7 @@ sal_uInt32 LwpGraphicObject::GetGrafData(sal_uInt8*& pGrafData) // get graphic object's bento objet name LwpObjectID& rMyID = this->GetObjectID(); std::string aGrfObjName; - this->GetBentoNamebyID(rMyID, aGrfObjName); + GetBentoNamebyID(rMyID, aGrfObjName); char sDName[64]=""; sprintf(sDName, "%s-D", aGrfObjName.c_str()); diff --git a/lotuswordpro/source/filter/lwpgrfobj.hxx b/lotuswordpro/source/filter/lwpgrfobj.hxx index 473a23fd2cc3..481b437fb817 100644 --- a/lotuswordpro/source/filter/lwpgrfobj.hxx +++ b/lotuswordpro/source/filter/lwpgrfobj.hxx @@ -124,7 +124,7 @@ public: // add by , 03/25/2005 void CreateDrawObjects(); void CreateGrafObject(); - void GetBentoNamebyID(LwpObjectID& rMyID, std::string& rName); + static void GetBentoNamebyID(LwpObjectID& rMyID, std::string& rName); sal_uInt32 GetRawGrafData(sal_uInt8*& pGrafData); sal_uInt32 GetGrafData(sal_uInt8*& pGrafData); void GetGrafOrgSize(long& rWidth, long& rHeight) { rWidth = m_Cache.Width; rHeight = m_Cache.Height; } diff --git a/lotuswordpro/source/filter/lwpnumericfmt.hxx b/lotuswordpro/source/filter/lwpnumericfmt.hxx index 74b9587ed3b9..c4881f7ba066 100644 --- a/lotuswordpro/source/filter/lwpnumericfmt.hxx +++ b/lotuswordpro/source/filter/lwpnumericfmt.hxx @@ -282,7 +282,7 @@ private: void GetCurrencyStr(LwpNumericFormatSubset aNumber, OUString& aPrefix, OUString& aSuffix, bool bNegtive=false); void SetNumberType(XFNumberStyle* pStyle); - OUString reencode(const OUString& sCode); + static OUString reencode(const OUString& sCode); }; inline bool diff --git a/lotuswordpro/source/filter/lwpobjstrm.hxx b/lotuswordpro/source/filter/lwpobjstrm.hxx index 5c6f3aa9fd3f..3138a496a1ed 100644 --- a/lotuswordpro/source/filter/lwpobjstrm.hxx +++ b/lotuswordpro/source/filter/lwpobjstrm.hxx @@ -114,7 +114,7 @@ private: void ReadStream(); void Read2Buffer(); sal_uInt8* AllocBuffer(sal_uInt16 size); - sal_uInt16 DecompressBuffer(sal_uInt8* pDst, sal_uInt8* pSrc, sal_uInt16 Size); + static sal_uInt16 DecompressBuffer(sal_uInt8* pDst, sal_uInt8* pSrc, sal_uInt16 Size); void ReleaseBuffer(); }; diff --git a/lotuswordpro/source/filter/lwppara.hxx b/lotuswordpro/source/filter/lwppara.hxx index acc694673cbc..d3d7bf637ccc 100644 --- a/lotuswordpro/source/filter/lwppara.hxx +++ b/lotuswordpro/source/filter/lwppara.hxx @@ -276,7 +276,7 @@ protected: private: virtual ~LwpPara(); - void OverrideAlignment(LwpAlignmentOverride* base,LwpAlignmentOverride* over,XFParaStyle* pOverStyle);//add by 1-24 + static void OverrideAlignment(LwpAlignmentOverride* base,LwpAlignmentOverride* over,XFParaStyle* pOverStyle);//add by 1-24 void OverrideIndent(LwpIndentOverride* base,LwpIndentOverride* over,XFParaStyle* pOverStyle); void OverrideSpacing(LwpSpacingOverride* base,LwpSpacingOverride* over,XFParaStyle* pOverStyle); void OverrideParaBorder(LwpParaProperty* pProps, XFParaStyle* pOverStyle); diff --git a/lotuswordpro/source/filter/lwppara1.cxx b/lotuswordpro/source/filter/lwppara1.cxx index bba150691ae6..c6eb252fa047 100644 --- a/lotuswordpro/source/filter/lwppara1.cxx +++ b/lotuswordpro/source/filter/lwppara1.cxx @@ -369,7 +369,7 @@ void LwpPara::OverrideParaBorder(LwpParaProperty* pProps, XFParaStyle* pOverStyl pLocalBorder->Override(pFinalBorder.get()); } - pParaStyle->ApplyParaBorder(pOverStyle, pFinalBorder.get()); + LwpParaStyle::ApplyParaBorder(pOverStyle, pFinalBorder.get()); } /** * @short: Override parabreaks style. diff --git a/lotuswordpro/source/filter/lwpparastyle.cxx b/lotuswordpro/source/filter/lwpparastyle.cxx index 0b0241beb3d1..6d6d6372ce94 100644 --- a/lotuswordpro/source/filter/lwpparastyle.cxx +++ b/lotuswordpro/source/filter/lwpparastyle.cxx @@ -194,7 +194,7 @@ void LwpParaStyle::Apply(XFParaStyle *pParaStyle) LwpParaBorderOverride *pBorder = dynamic_cast(pPiece->GetOverride()); if( pBorder ) { - this->ApplyParaBorder(pParaStyle, pBorder); + ApplyParaBorder(pParaStyle, pBorder); } } diff --git a/lotuswordpro/source/filter/lwpparastyle.hxx b/lotuswordpro/source/filter/lwpparastyle.hxx index 6a394f4e9bf4..42bcb4a2a50f 100644 --- a/lotuswordpro/source/filter/lwpparastyle.hxx +++ b/lotuswordpro/source/filter/lwpparastyle.hxx @@ -86,8 +86,8 @@ public: virtual void Apply(XFParaStyle *pStrm); // 01/26/2005 - void ApplyParaBorder(XFParaStyle* pParaStyle, LwpParaBorderOverride* pBorder); - void ApplyBreaks(XFParaStyle* pParaStyle, LwpBreaksOverride* pBreaks); + static void ApplyParaBorder(XFParaStyle* pParaStyle, LwpParaBorderOverride* pBorder); + static void ApplyBreaks(XFParaStyle* pParaStyle, LwpBreaksOverride* pBreaks); //end static void ApplyAlignment(XFParaStyle* pParaStyle, LwpAlignmentOverride* pAlign); static void ApplyIndent(LwpPara* pPara, XFParaStyle* pParaStyle, LwpIndentOverride* pIndent); diff --git a/lotuswordpro/source/filter/lwpprtinfo.hxx b/lotuswordpro/source/filter/lwpprtinfo.hxx index 95e67a688201..057a390e3f67 100644 --- a/lotuswordpro/source/filter/lwpprtinfo.hxx +++ b/lotuswordpro/source/filter/lwpprtinfo.hxx @@ -87,8 +87,8 @@ private: LwpAtomHolder m_SelectedPages; public: - void Read(LwpObjectStream* pStrm); - void Skip(LwpObjectStream *pStrm); + static void Read(LwpObjectStream* pStrm); + static void Skip(LwpObjectStream *pStrm); }; #endif diff --git a/lotuswordpro/source/filter/lwpsilverbullet.hxx b/lotuswordpro/source/filter/lwpsilverbullet.hxx index 27412b084749..c56f35e1c25a 100644 --- a/lotuswordpro/source/filter/lwpsilverbullet.hxx +++ b/lotuswordpro/source/filter/lwpsilverbullet.hxx @@ -109,9 +109,9 @@ public: UChar32 GetBulletChar(); - OUString GetPrefix() { return OUString(); } + static OUString GetPrefix() { return OUString(); } - OUString GetSuffix() { return OUString(); } + static OUString GetSuffix() { return OUString(); } inline OUString GetNumberingName(); @@ -121,7 +121,7 @@ public: static OUString GetNumCharByStyleID(LwpFribParaNumber* pParaNumber); - inline bool IsPosCumulative(sal_uInt16 nHideLevels); + static inline bool IsPosCumulative(sal_uInt16 nHideLevels); inline bool IsLesserLevel(sal_uInt16 nPos); inline bool IsNewSection(sal_uInt16 nPos); diff --git a/lotuswordpro/source/filter/lwptablelayout.hxx b/lotuswordpro/source/filter/lwptablelayout.hxx index 97f8e6bc8602..54c43465cab3 100644 --- a/lotuswordpro/source/filter/lwptablelayout.hxx +++ b/lotuswordpro/source/filter/lwptablelayout.hxx @@ -141,7 +141,7 @@ private: sal_uInt8 nEndCol,sal_uInt16 nRowID); void ConvertColumn(XFTable *pXFTable,sal_uInt8 nStartCol,sal_uInt8 nEndCol); sal_uInt16 ConvertHeadingRow(XFTable* pXFTable,sal_uInt16 nStartHeadRow,sal_uInt16 nEndHeadRow); - bool FindSplitColMark(XFTable* pXFTable,sal_uInt8* pCellMark,sal_uInt8& nMaxColSpan); + static bool FindSplitColMark(XFTable* pXFTable,sal_uInt8* pCellMark,sal_uInt8& nMaxColSpan); void SplitRowToCells(XFTable* pTmpTable,XFTable* pXFTable, sal_uInt8 nFirstColSpann,sal_uInt8* pCellMark); diff --git a/lotuswordpro/source/filter/lwptoc.hxx b/lotuswordpro/source/filter/lwptoc.hxx index 59d922aeaa94..a9463e55a7b7 100644 --- a/lotuswordpro/source/filter/lwptoc.hxx +++ b/lotuswordpro/source/filter/lwptoc.hxx @@ -85,7 +85,7 @@ protected: bool GetUsePageNumber(sal_uInt16 index); sal_uInt16 GetSeparatorType(sal_uInt16 index); LwpTocLevelData * GetSearchLevelPtr(sal_uInt16 index); - LwpTocLevelData * GetNextSearchLevelPtr(sal_uInt16 index, LwpTocLevelData * pCurData); + static LwpTocLevelData * GetNextSearchLevelPtr(sal_uInt16 index, LwpTocLevelData * pCurData); void AddSourceStyle(XFIndex* pToc, LwpTocLevelData * pLevel, LwpFoundry * pFoundry); private: enum {MAX_LEVELS = 9}; diff --git a/lotuswordpro/source/filter/lwpuidoc.cxx b/lotuswordpro/source/filter/lwpuidoc.cxx index fbd96e1de46d..5b02530b8d56 100644 --- a/lotuswordpro/source/filter/lwpuidoc.cxx +++ b/lotuswordpro/source/filter/lwpuidoc.cxx @@ -75,7 +75,7 @@ LwpUIDocument::~LwpUIDocument() void LwpUIDocument::Read(LwpObjectStream *pStrm) { - m_NamedProps.Read(pStrm); + LwpNamedProperties::Read(pStrm); m_ARMacroOpts.Read(pStrm); m_MergedOpts.Read(pStrm); m_SheetFullPath.ReadPathAtom(pStrm); diff --git a/lotuswordpro/source/filter/lwpuidoc.hxx b/lotuswordpro/source/filter/lwpuidoc.hxx index 92c96a82cbda..004e78225b2d 100644 --- a/lotuswordpro/source/filter/lwpuidoc.hxx +++ b/lotuswordpro/source/filter/lwpuidoc.hxx @@ -83,7 +83,7 @@ public: LwpNamedProperties(){} ~LwpNamedProperties(){} public: - void Read(LwpObjectStream *pStrm); + static void Read(LwpObjectStream *pStrm); }; /** * @brief macro options contained in UIDocument structure diff --git a/lotuswordpro/source/filter/lwpusrdicts.hxx b/lotuswordpro/source/filter/lwpusrdicts.hxx index 640bb56f0a3d..b0523c2fc7de 100644 --- a/lotuswordpro/source/filter/lwpusrdicts.hxx +++ b/lotuswordpro/source/filter/lwpusrdicts.hxx @@ -76,7 +76,7 @@ public: LwpUserDictFiles(){} LwpUserDictFiles(LwpObjectStream *pStrm); ~LwpUserDictFiles(){} - void Read(LwpObjectStream *pStrm); + static void Read(LwpObjectStream *pStrm); }; #endif diff --git a/lotuswordpro/source/filter/xfilter/xfframe.hxx b/lotuswordpro/source/filter/xfilter/xfframe.hxx index aeb2efb2c06f..60a27d6e86a4 100644 --- a/lotuswordpro/source/filter/xfilter/xfframe.hxx +++ b/lotuswordpro/source/filter/xfilter/xfframe.hxx @@ -174,7 +174,7 @@ public: private: void StartFrame(IXFStream *pStrm); - void EndFrame(IXFStream *pStrm); + static void EndFrame(IXFStream *pStrm); void AdjustZIndex(); -- cgit v1.2.3