From 68f519f5d3f90a9f7ae7c91dc1d6653440a9c6d6 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 20 Jan 2016 20:46:05 +0000 Subject: cppcheck: silence unusedPrivateFunction somewhat odd this-> syntax here Change-Id: Ic69e72e15a9f90741e9422e14eb9a6d4784c7aa9 --- lotuswordpro/source/filter/lwpbackgroundstuff.cxx | 2 +- lotuswordpro/source/filter/lwpcelllayout.cxx | 6 +-- lotuswordpro/source/filter/lwpdrawobj.cxx | 60 +++++++++++----------- lotuswordpro/source/filter/lwpgrfobj.cxx | 20 ++++---- lotuswordpro/source/filter/lwppagelayout.cxx | 16 +++--- lotuswordpro/source/filter/lwppara.cxx | 14 ++--- lotuswordpro/source/filter/lwppara1.cxx | 8 +-- .../source/filter/lwpsdwgrouploaderv0102.cxx | 6 +-- lotuswordpro/source/filter/lwpsilverbullet.cxx | 14 ++--- lotuswordpro/source/filter/lwpstory.cxx | 2 +- lotuswordpro/source/filter/lwptablelayout.cxx | 4 +- .../source/filter/xfilter/xfpagemaster.hxx | 2 +- 12 files changed, 77 insertions(+), 77 deletions(-) (limited to 'lotuswordpro') diff --git a/lotuswordpro/source/filter/lwpbackgroundstuff.cxx b/lotuswordpro/source/filter/lwpbackgroundstuff.cxx index d54dfc4f4e4e..9df07b1c3a3d 100644 --- a/lotuswordpro/source/filter/lwpbackgroundstuff.cxx +++ b/lotuswordpro/source/filter/lwpbackgroundstuff.cxx @@ -104,7 +104,7 @@ LwpColor* LwpBackgroundStuff::GetFillColor() XFBGImage* LwpBackgroundStuff::GetFillPattern() { // not pattern fill? - if (!this->IsPatternFill()) + if (!IsPatternFill()) { return nullptr; } diff --git a/lotuswordpro/source/filter/lwpcelllayout.cxx b/lotuswordpro/source/filter/lwpcelllayout.cxx index 9db1307ed006..eb3d0cdc9f03 100644 --- a/lotuswordpro/source/filter/lwpcelllayout.cxx +++ b/lotuswordpro/source/filter/lwpcelllayout.cxx @@ -222,7 +222,7 @@ void LwpCellLayout::ApplyWatermark(XFCellStyle *pCellStyle) */ void LwpCellLayout::ApplyPatternFill(XFCellStyle* pCellStyle) { - XFBGImage* pXFBGImage = this->GetFillPattern(); + XFBGImage* pXFBGImage = GetFillPattern(); if (pXFBGImage) { pCellStyle->SetBackImage(pXFBGImage); @@ -236,7 +236,7 @@ void LwpCellLayout::ApplyPatternFill(XFCellStyle* pCellStyle) */ void LwpCellLayout::ApplyBackGround(XFCellStyle* pCellStyle) { - if (this->IsPatternFill()) + if (IsPatternFill()) { ApplyPatternFill(pCellStyle); } @@ -344,7 +344,7 @@ XFCell* LwpCellLayout::ConvertCell(LwpObjectID aTableID, sal_uInt16 nRow, sal_uI LwpPara* LwpCellLayout::GetLastParaOfPreviousStory() { - LwpObjectID* pPreStoryID = this->GetPreviousCellStory(); + LwpObjectID* pPreStoryID = GetPreviousCellStory(); if (pPreStoryID && !(pPreStoryID->IsNull())) { LwpStory* pPreStory = dynamic_cast(pPreStoryID->obj(VO_STORY).get()); diff --git a/lotuswordpro/source/filter/lwpdrawobj.cxx b/lotuswordpro/source/filter/lwpdrawobj.cxx index ef99e2440f80..d964ae6f6c0b 100644 --- a/lotuswordpro/source/filter/lwpdrawobj.cxx +++ b/lotuswordpro/source/filter/lwpdrawobj.cxx @@ -94,7 +94,7 @@ LwpDrawObj::LwpDrawObj(SvStream * pStream, DrawingOffsetAndScale* pTransData) , m_pStream(pStream) , m_pTransData(pTransData) { - this->ReadObjHeaderRecord(); + ReadObjHeaderRecord(); } /** @@ -378,10 +378,10 @@ OUString LwpDrawObj::GetArrowName(sal_uInt8 nArrowStyle) XFFrame* LwpDrawObj::CreateXFDrawObject() { // read records - this->Read(); + Read(); // register style - OUString aStyleName = this->RegisterStyle(); + OUString aStyleName = RegisterStyle(); // create XF-Objects XFFrame* pXFObj = nullptr; @@ -391,11 +391,11 @@ XFFrame* LwpDrawObj::CreateXFDrawObject() && FABS(m_pTransData->fScaleX - 1.0) < THRESHOLD && FABS(m_pTransData->fScaleY - 1.0) < THRESHOLD) { - pXFObj = this->CreateStandardDrawObj(aStyleName); + pXFObj = CreateStandardDrawObj(aStyleName); } else { - pXFObj = this->CreateDrawObj(aStyleName); + pXFObj = CreateDrawObj(aStyleName); } // set anchor type @@ -457,7 +457,7 @@ XFFrame* LwpDrawLine::CreateDrawObj(const OUString& rStyleName ) (double)(m_aLineRec.nStartY)/TWIPS_PER_CM * m_pTransData->fScaleY)); pLine->LineTo(XFPoint((double)(m_aLineRec.nEndX)/TWIPS_PER_CM * m_pTransData->fScaleX, (double)(m_aLineRec.nEndY)/TWIPS_PER_CM * m_pTransData->fScaleY)); - this->SetPosition(pLine); + SetPosition(pLine); pLine->SetStyleName(rStyleName); @@ -542,7 +542,7 @@ XFFrame* LwpDrawPolyLine::CreateDrawObj(const OUString& rStyleName ) pPolyline->LineTo(XFPoint((double)m_pVector[nC].x/TWIPS_PER_CM * m_pTransData->fScaleX, (double)m_pVector[nC].y/TWIPS_PER_CM * m_pTransData->fScaleY)); } - this->SetPosition(pPolyline); + SetPosition(pPolyline); pPolyline->SetStyleName(rStyleName); @@ -588,7 +588,7 @@ LwpDrawPolygon::~LwpDrawPolygon() */ void LwpDrawPolygon::Read() { - this->ReadClosedObjStyle(); + ReadClosedObjStyle(); m_pStream->ReadUInt16( m_nNumPoints ); if (m_nNumPoints > m_pStream->remainingSize() / 4) @@ -612,7 +612,7 @@ OUString LwpDrawPolygon::RegisterStyle() m_aClosedObjStyleRec.aPenColor); // set fill style - this->SetFillStyle(pStyle); + SetFillStyle(pStyle); XFStyleManager* pXFStyleManager = LwpGlobalMgr::GetInstance()->GetXFStyleManager(); return pXFStyleManager->AddStyle(pStyle).m_pStyle->GetStyleName(); @@ -629,7 +629,7 @@ XFFrame* LwpDrawPolygon::CreateDrawObj(const OUString& rStyleName) (double)m_pVector[nC].y/TWIPS_PER_CM * m_pTransData->fScaleY)); } pPolygon->ClosePath(); - this->SetPosition(pPolygon); + SetPosition(pPolygon); pPolygon->SetStyleName(rStyleName); return pPolygon; @@ -663,7 +663,7 @@ LwpDrawRectangle::LwpDrawRectangle(SvStream * pStream, DrawingOffsetAndScale* pT */ void LwpDrawRectangle::Read() { - this->ReadClosedObjStyle(); + ReadClosedObjStyle(); sal_uInt8 nPointsCount; if (m_eType == OT_RNDRECT) @@ -692,7 +692,7 @@ OUString LwpDrawRectangle::RegisterStyle() m_aClosedObjStyleRec.aPenColor); // set fill style - this->SetFillStyle(pStyle); + SetFillStyle(pStyle); XFStyleManager* pXFStyleManager = LwpGlobalMgr::GetInstance()->GetXFStyleManager(); return pXFStyleManager->AddStyle(pStyle).m_pStyle->GetStyleName(); @@ -702,7 +702,7 @@ XFFrame* LwpDrawRectangle::CreateDrawObj(const OUString& rStyleName) { if (m_eType == OT_RNDRECT) { - return this->CreateRoundedRect(rStyleName); + return CreateRoundedRect(rStyleName); } else { @@ -717,7 +717,7 @@ XFFrame* LwpDrawRectangle::CreateDrawObj(const OUString& rStyleName) pRect->LineTo(XFPoint((double)m_aVector[0].x/TWIPS_PER_CM * m_pTransData->fScaleX, (double)m_aVector[0].y/TWIPS_PER_CM * m_pTransData->fScaleY)); pRect->ClosePath(); - this->SetPosition(pRect); + SetPosition(pRect); pRect->SetStyleName(rStyleName); @@ -761,7 +761,7 @@ XFFrame* LwpDrawRectangle::CreateRoundedRect(const OUString& rStyleName) pRoundedRect->LineTo(XFPoint((double)m_aVector[0].x/TWIPS_PER_CM * m_pTransData->fScaleX, (double)m_aVector[0].y/TWIPS_PER_CM * m_pTransData->fScaleY)); pRoundedRect->ClosePath(); - this->SetPosition(pRoundedRect); + SetPosition(pRoundedRect); pRoundedRect->SetStyleName(rStyleName); @@ -772,7 +772,7 @@ XFFrame* LwpDrawRectangle::CreateStandardDrawObj(const OUString& rStyleName) { if (m_eType == OT_RNDRECT) { - return this->CreateRoundedRect(rStyleName); + return CreateRoundedRect(rStyleName); } else { @@ -833,7 +833,7 @@ LwpDrawEllipse::LwpDrawEllipse(SvStream * pStream, DrawingOffsetAndScale* pTrans */ void LwpDrawEllipse::Read() { - this->ReadClosedObjStyle(); + ReadClosedObjStyle(); for (sal_uInt8 nC = 0; nC < 13; nC++) { @@ -851,7 +851,7 @@ OUString LwpDrawEllipse::RegisterStyle() m_aClosedObjStyleRec.aPenColor); // set fill style - this->SetFillStyle(pStyle); + SetFillStyle(pStyle); XFStyleManager* pXFStyleManager = LwpGlobalMgr::GetInstance()->GetXFStyleManager(); return pXFStyleManager->AddStyle(pStyle).m_pStyle->GetStyleName(); @@ -878,7 +878,7 @@ XFFrame* LwpDrawEllipse::CreateDrawObj(const OUString& rStyleName ) pEllipse->CurveTo(aDest, aCtrl1, aCtrl2); } pEllipse->ClosePath(); - this->SetPosition(pEllipse); + SetPosition(pEllipse); pEllipse->SetStyleName(rStyleName); @@ -887,7 +887,7 @@ XFFrame* LwpDrawEllipse::CreateDrawObj(const OUString& rStyleName ) XFFrame* LwpDrawEllipse::CreateStandardDrawObj(const OUString& rStyleName) { - return this->CreateDrawObj(rStyleName); + return CreateDrawObj(rStyleName); } /** @@ -949,7 +949,7 @@ XFFrame* LwpDrawArc::CreateDrawObj(const OUString& rStyleName ) (double)m_aVector[2].y/TWIPS_PER_CM * m_pTransData->fScaleY); pArc->CurveTo(aDest, aCtl1, aCtl2); - this->SetPosition(pArc); + SetPosition(pArc); pArc->SetStyleName(rStyleName); @@ -958,7 +958,7 @@ XFFrame* LwpDrawArc::CreateDrawObj(const OUString& rStyleName ) XFFrame* LwpDrawArc::CreateStandardDrawObj(const OUString& rStyleName) { - return this->CreateDrawObj(rStyleName); + return CreateDrawObj(rStyleName); } /** @@ -1107,7 +1107,7 @@ XFFrame* LwpDrawTextBox::CreateDrawObj(const OUString& rStyleName ) pXFPara->SetStyleName(rStyleName); pTextBox->Add(pXFPara); - this->SetPosition(pTextBox); + SetPosition(pTextBox); XFTextBoxStyle* pBoxStyle = new XFTextBoxStyle(); @@ -1127,7 +1127,7 @@ XFFrame* LwpDrawTextBox::CreateDrawObj(const OUString& rStyleName ) XFFrame* LwpDrawTextBox::CreateStandardDrawObj(const OUString& rStyleName) { - return this->CreateDrawObj(rStyleName); + return CreateDrawObj(rStyleName); } /** @@ -1200,7 +1200,7 @@ void LwpDrawTextArt::Read() m_pStream->ReadInt16( m_aVector[nC].y ); } - this->ReadClosedObjStyle(); + ReadClosedObjStyle(); m_aTextArtRec.aTextColor = m_aClosedObjStyleRec.aForeColor; m_pStream->ReadUChar( m_aTextArtRec.nIndex ); @@ -1298,10 +1298,10 @@ XFFrame* LwpDrawTextArt::CreateDrawObj(const OUString& rStyleName) pRetObj = new XFDrawPath(); XFDrawPath* pFWPath = static_cast(pRetObj); - this->CreateFWPath(pFWPath); + CreateFWPath(pFWPath); pStyle->SetFontWorkStyle(0, enumXFFWSlantY, enumXFFWAdjustAutosize); - this->SetPosition(pRetObj); + SetPosition(pRetObj); rtl_TextEncoding aEncoding; if (!m_aTextArtRec.nTextCharacterSet) @@ -1327,7 +1327,7 @@ XFFrame* LwpDrawTextArt::CreateDrawObj(const OUString& rStyleName) XFFrame* LwpDrawTextArt::CreateStandardDrawObj(const OUString& rStyleName ) { - return this->CreateDrawObj(rStyleName); + return CreateDrawObj(rStyleName); } /** @@ -1493,7 +1493,7 @@ XFFrame* LwpDrawBitmap::CreateDrawObj(const OUString& rStyleName) { XFImage* pImage = new XFImage(); pImage->SetImageData(m_pImageData, m_aBmpRec.nFileSize); - this->SetPosition(pImage); + SetPosition(pImage); pImage->SetStyleName(rStyleName); @@ -1502,7 +1502,7 @@ XFFrame* LwpDrawBitmap::CreateDrawObj(const OUString& rStyleName) XFFrame* LwpDrawBitmap::CreateStandardDrawObj(const OUString& rStyleName) { - return this->CreateDrawObj(rStyleName); + return CreateDrawObj(rStyleName); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/lwpgrfobj.cxx b/lotuswordpro/source/filter/lwpgrfobj.cxx index 6383d5de357e..bf04563f8732 100644 --- a/lotuswordpro/source/filter/lwpgrfobj.cxx +++ b/lotuswordpro/source/filter/lwpgrfobj.cxx @@ -199,7 +199,7 @@ void LwpGraphicObject::XFConvert (XFContentContainer* pCont) pCont->Add(iter->get()); } } - else if (this->IsGrafFormatValid() && !m_vXFDrawObjects.empty()) + else if (IsGrafFormatValid() && !m_vXFDrawObjects.empty()) { XFImage* pImage = static_cast(m_vXFDrawObjects.front().get()); @@ -211,7 +211,7 @@ void LwpGraphicObject::XFConvert (XFContentContainer* pCont) else { sal_uInt8* pGrafData = nullptr; - sal_uInt32 nDataLen = this->GetRawGrafData(pGrafData); + sal_uInt32 nDataLen = GetRawGrafData(pGrafData); if (pGrafData) { @@ -263,12 +263,12 @@ void LwpGraphicObject::RegisterStyle() { if (m_sServerContextFormat[1]=='s'&&m_sServerContextFormat[2]=='d'&&m_sServerContextFormat[3]=='w') { - this->CreateDrawObjects(); + CreateDrawObjects(); } // test codes for importing pictures - else if(this->IsGrafFormatValid()) + else if(IsGrafFormatValid()) { - this->CreateGrafObject(); + CreateGrafObject(); } if (m_sServerContextFormat[1]=='l'&&m_sServerContextFormat[2]=='c'&&m_sServerContextFormat[3]=='h') @@ -302,7 +302,7 @@ void LwpGraphicObject::CreateDrawObjects() SvStream* pDrawObjStream = nullptr; // get graphic object's bento objet name - LwpObjectID& rMyID = this->GetObjectID(); + LwpObjectID& rMyID = GetObjectID(); std::string aGrfObjName; GetBentoNamebyID(rMyID, aGrfObjName); @@ -354,7 +354,7 @@ sal_uInt32 LwpGraphicObject::GetRawGrafData(sal_uInt8*& pGrafData) SvStream* pGrafStream = nullptr; // get graphic object's bento objet name - LwpObjectID& rMyID = this->GetObjectID(); + LwpObjectID& rMyID = GetObjectID(); std::string aGrfObjName; GetBentoNamebyID(rMyID, aGrfObjName); @@ -397,7 +397,7 @@ sal_uInt32 LwpGraphicObject::GetGrafData(sal_uInt8*& pGrafData) SvStream* pGrafStream = nullptr; // get graphic object's bento objet name - LwpObjectID& rMyID = this->GetObjectID(); + LwpObjectID& rMyID = GetObjectID(); std::string aGrfObjName; GetBentoNamebyID(rMyID, aGrfObjName); @@ -649,7 +649,7 @@ void LwpGraphicObject::CreateGrafObject() pImage->SetAnchorType(enumXFAnchorFrame); // set object name - LwpAtomHolder& rHolder = this->GetName(); + LwpAtomHolder& rHolder = GetName(); if ( !rHolder.str().isEmpty() ) { pImage->SetName(rHolder.str()); @@ -666,7 +666,7 @@ void LwpGraphicObject::CreateGrafObject() void LwpGraphicObject::XFConvertEquation(XFContentContainer * pCont) { sal_uInt8* pGrafData = nullptr; - sal_uInt32 nDataLen = this->GetGrafData(pGrafData); + sal_uInt32 nDataLen = GetGrafData(pGrafData); if(pGrafData) { //convert equation diff --git a/lotuswordpro/source/filter/lwppagelayout.cxx b/lotuswordpro/source/filter/lwppagelayout.cxx index 5bddd8cee1b2..3b10d2cb6c30 100644 --- a/lotuswordpro/source/filter/lwppagelayout.cxx +++ b/lotuswordpro/source/filter/lwppagelayout.cxx @@ -222,7 +222,7 @@ void LwpPageLayout::ParseShadow(XFPageMaster *pm1) */ void LwpPageLayout::ParsePatternFill(XFPageMaster* pm1) { - XFBGImage* pXFBGImage = this->GetFillPattern(); + XFBGImage* pXFBGImage = GetFillPattern(); if (pXFBGImage) { pm1->SetBackImage(pXFBGImage); @@ -234,7 +234,7 @@ void LwpPageLayout::ParsePatternFill(XFPageMaster* pm1) */ void LwpPageLayout::ParseBackGround(XFPageMaster* pm1) { - if (this->IsPatternFill()) + if (IsPatternFill()) { ParsePatternFill(pm1); } @@ -575,7 +575,7 @@ double LwpPageLayout::GetMarginWidth() sal_Int32 LwpPageLayout::GetPageNumber(sal_uInt16 nLayoutNumber) { sal_Int16 nPageNumber = -1; - LwpFoundry* pFoundry = this->GetFoundry(); + LwpFoundry* pFoundry = GetFoundry(); if (!pFoundry) return nPageNumber; LwpDocument* pDoc = pFoundry->GetDocument(); @@ -586,7 +586,7 @@ sal_Int32 LwpPageLayout::GetPageNumber(sal_uInt16 nLayoutNumber) LwpPageHint* pPageHint = dynamic_cast(pHeadTail->GetHead().obj().get()); while(pPageHint) { - if(this->GetObjectID() == pPageHint->GetPageLayoutID()) + if(GetObjectID() == pPageHint->GetPageLayoutID()) { sal_uInt16 nNumber = pPageHint->GetPageNumber(); if(nLayoutNumber==FIRST_LAYOUTPAGENO && pPageHint->GetLayoutPageNumber()==1) @@ -830,7 +830,7 @@ void LwpHeaderLayout::ParseShadow(XFHeaderStyle* pHeaderStyle) */ void LwpHeaderLayout::ParsePatternFill(XFHeaderStyle* pHeaderStyle) { - XFBGImage* pXFBGImage = this->GetFillPattern(); + XFBGImage* pXFBGImage = GetFillPattern(); if (pXFBGImage) { pHeaderStyle->SetBackImage(pXFBGImage); @@ -842,7 +842,7 @@ void LwpHeaderLayout::ParsePatternFill(XFHeaderStyle* pHeaderStyle) */ void LwpHeaderLayout::ParseBackGround(XFHeaderStyle* pHeaderStyle) { - if (this->IsPatternFill()) + if (IsPatternFill()) { ParsePatternFill(pHeaderStyle); } @@ -993,7 +993,7 @@ void LwpFooterLayout::ParseShadow(XFFooterStyle* pFooterStyle) */ void LwpFooterLayout::ParsePatternFill(XFFooterStyle* pFooterStyle) { - XFBGImage* pXFBGImage = this->GetFillPattern(); + XFBGImage* pXFBGImage = GetFillPattern(); if (pXFBGImage) { pFooterStyle->SetBackImage(pXFBGImage); @@ -1005,7 +1005,7 @@ void LwpFooterLayout::ParsePatternFill(XFFooterStyle* pFooterStyle) */ void LwpFooterLayout::ParseBackGround(XFFooterStyle* pFooterStyle) { - if (this->IsPatternFill()) + if (IsPatternFill()) { ParsePatternFill(pFooterStyle); } diff --git a/lotuswordpro/source/filter/lwppara.cxx b/lotuswordpro/source/filter/lwppara.cxx index 62118713514d..f27b6840ff1b 100644 --- a/lotuswordpro/source/filter/lwppara.cxx +++ b/lotuswordpro/source/filter/lwppara.cxx @@ -295,7 +295,7 @@ void LwpPara::XFConvert(XFContentContainer* pCont) } else if (m_pXFContainer) { - LwpBulletStyleMgr* pBulletStyleMgr = this->GetBulletStyleMgr(); + LwpBulletStyleMgr* pBulletStyleMgr = GetBulletStyleMgr(); if (pBulletStyleMgr) { pBulletStyleMgr->SetCurrentSilverBullet(LwpObjectID()); @@ -530,7 +530,7 @@ void LwpPara::RegisterStyle() OverrideParaNumbering(pNumberingProps); //register bullet style - LwpBulletStyleMgr* pBulletStyleMgr = this->GetBulletStyleMgr(); + LwpBulletStyleMgr* pBulletStyleMgr = GetBulletStyleMgr(); if (pBulletStyleMgr) { // if has bullet or numbering @@ -552,7 +552,7 @@ void LwpPara::RegisterStyle() if (m_pSilverBullet->IsBulletOrdered()) { OUString aPreBullStyleName; - LwpNumberingOverride* pNumbering = this->GetParaNumbering(); + LwpNumberingOverride* pNumbering = GetParaNumbering(); sal_uInt16 nPosition = pNumbering->GetPosition(); bool bLesser = m_pSilverBullet->IsLesserLevel(nPosition); LwpPara* pPara = this; @@ -579,7 +579,7 @@ void LwpPara::RegisterStyle() LwpSilverBullet* pParaSilverBullet = pPara->GetSilverBullet(); pNumbering = pPara->GetParaNumbering(); - if (pPara->GetObjectID() != this->GetObjectID()) + if (pPara->GetObjectID() != GetObjectID()) { if (!pParaSilverBullet) { @@ -688,7 +688,7 @@ void LwpPara::RegisterStyle() else { m_bBullContinue = false; - if (this->IsInCell()) + if (IsInCell()) { XFListStyle* pOldStyle = static_cast(pXFStyleManager->FindStyle(m_aBulletStyleName)); if (pOldStyle) @@ -699,7 +699,7 @@ void LwpPara::RegisterStyle() } } - LwpStory* pMyStory = this->GetStory(); + LwpStory* pMyStory = GetStory(); if (pMyStory) { if (pMyStory->IsBullStyleUsedBefore(m_aBulletStyleName, m_pParaNumbering->GetPosition())) @@ -739,7 +739,7 @@ void LwpPara::RegisterStyle() XFParaStyle* pNewParaStyle = new XFParaStyle; *pNewParaStyle = *GetXFParaStyle(); //pOverStyle->SetStyleName(""); - this->RegisterTabStyle(pNewParaStyle); + RegisterTabStyle(pNewParaStyle); if (!m_ParentStyleName.isEmpty()) pNewParaStyle->SetParentStyleName(m_ParentStyleName); m_StyleName = pXFStyleManager->AddStyle(pNewParaStyle).m_pStyle->GetStyleName(); diff --git a/lotuswordpro/source/filter/lwppara1.cxx b/lotuswordpro/source/filter/lwppara1.cxx index 2ad9036d4dbb..a8b4e7a70b5b 100644 --- a/lotuswordpro/source/filter/lwppara1.cxx +++ b/lotuswordpro/source/filter/lwppara1.cxx @@ -343,7 +343,7 @@ LwpParaStyle* LwpPara::GetParaStyle() void LwpPara::OverrideParaBorder(LwpParaProperty* pProps, XFParaStyle* pOverStyle) { // get paraborder in parastyle - LwpParaStyle* pParaStyle = this->GetParaStyle(); + LwpParaStyle* pParaStyle = GetParaStyle(); if (!pParaStyle) { return; @@ -375,7 +375,7 @@ void LwpPara::OverrideParaBorder(LwpParaProperty* pProps, XFParaStyle* pOverStyl void LwpPara::OverrideParaBreaks(LwpParaProperty* pProps, XFParaStyle* pOverStyle) { // get breaks in parastyle - LwpParaStyle* pParaStyle = this->GetParaStyle(); + LwpParaStyle* pParaStyle = GetParaStyle(); if (!pParaStyle) { return; @@ -441,7 +441,7 @@ void LwpPara::OverrideParaBreaks(LwpParaProperty* pProps, XFParaStyle* pOverStyl void LwpPara::OverrideParaBullet(LwpParaProperty* pProps) { // get bulletoverride in parastyle - LwpParaStyle* pParaStyle = this->GetParaStyle(); + LwpParaStyle* pParaStyle = GetParaStyle(); if (!pParaStyle) { return; @@ -518,7 +518,7 @@ void LwpPara::OverrideParaBullet(LwpParaProperty* pProps) void LwpPara::OverrideParaNumbering(LwpParaProperty* pProps) { // get numbering override in parastyle - LwpParaStyle* pParaStyle = this->GetParaStyle(); + LwpParaStyle* pParaStyle = GetParaStyle(); if (!pParaStyle) { return; diff --git a/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.cxx b/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.cxx index fc2c7b43799b..de653c52402f 100644 --- a/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.cxx +++ b/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.cxx @@ -225,7 +225,7 @@ void LwpSdwGroupLoaderV0102::BeginDrawObjects(std::vector< rtl::ReferenceCreateDrawObject(); + XFFrame* pXFDrawObj = CreateDrawObject(); if (pXFDrawObj) { @@ -278,7 +278,7 @@ XFDrawGroup* LwpSdwGroupLoaderV0102::CreateDrawGroupObject() //load draw object for (unsigned short i = 0; i < nRecCount; i++) { - XFFrame* pXFDrawObj = this->CreateDrawObject(); + XFFrame* pXFDrawObj = CreateDrawObject(); if (pXFDrawObj) { @@ -369,7 +369,7 @@ XFFrame* LwpSdwGroupLoaderV0102::CreateDrawObject() // read out the object header pDrawObj = new LwpDrawGroup(m_pStream); - pRetObjct = this->CreateDrawGroupObject(); + pRetObjct = CreateDrawGroupObject(); // set anchor type pRetObjct->SetAnchorType(enumXFAnchorFrame); diff --git a/lotuswordpro/source/filter/lwpsilverbullet.cxx b/lotuswordpro/source/filter/lwpsilverbullet.cxx index 01a92530cbf5..4bfd7b636ea8 100644 --- a/lotuswordpro/source/filter/lwpsilverbullet.cxx +++ b/lotuswordpro/source/filter/lwpsilverbullet.cxx @@ -115,9 +115,9 @@ void LwpSilverBullet::RegisterStyle() XFListStyle* pListStyle = new XFListStyle(); XFStyleManager* pXFStyleManager = LwpGlobalMgr::GetInstance()->GetXFStyleManager(); - this->GetBulletPara(); + GetBulletPara(); - if (this->IsBulletOrdered() && this->HasName()) + if (IsBulletOrdered() && HasName()) { //todo: find the flag in the file bool bCumulative = false; @@ -133,9 +133,9 @@ void LwpSilverBullet::RegisterStyle() if (pParaNumber->GetStyleID() != NUMCHAR_other) { m_pHideLevels[nPos] = aParaNumbering.nNumLevel; - sal_uInt16 nDisplayLevel = this->GetDisplayLevel(nPos); + sal_uInt16 nDisplayLevel = GetDisplayLevel(nPos); bCumulative = (nDisplayLevel > 1); - OUString aPrefix = this->GetAdditionalName(nPos); + OUString aPrefix = GetAdditionalName(nPos); XFNumFmt aFmt; if (!bCumulative && aParaNumbering.pPrefix) @@ -398,11 +398,11 @@ OUString LwpSilverBullet::GetAdditionalName(sal_uInt8 nPos) if (bDivisionName) { - aRet += this->GetDivisionName(); + aRet += GetDivisionName(); } if (bSectionName) { - aRet += this->GetSectionName(); + aRet += GetSectionName(); } return aRet; @@ -445,7 +445,7 @@ OUString LwpSilverBullet::GetSectionName() bool LwpSilverBullet::HasName() { - LwpAtomHolder& rName = this->GetName(); + LwpAtomHolder& rName = GetName(); return (!rName.str().isEmpty()); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/lwpstory.cxx b/lotuswordpro/source/filter/lwpstory.cxx index 64d15c0d41a8..6abdba41476c 100644 --- a/lotuswordpro/source/filter/lwpstory.cxx +++ b/lotuswordpro/source/filter/lwpstory.cxx @@ -407,7 +407,7 @@ XFContentContainer* LwpStory::GetXFContent() LwpPara* LwpStory::GetLastParaOfPreviousStory() { - rtl::Reference xVLayout(this->GetLayout(nullptr)); + rtl::Reference xVLayout(GetLayout(nullptr)); if (xVLayout.is()) { return xVLayout->GetLastParaOfPreviousStory(); diff --git a/lotuswordpro/source/filter/lwptablelayout.cxx b/lotuswordpro/source/filter/lwptablelayout.cxx index 0faf772d1054..fa65944f4281 100644 --- a/lotuswordpro/source/filter/lwptablelayout.cxx +++ b/lotuswordpro/source/filter/lwptablelayout.cxx @@ -276,7 +276,7 @@ void LwpSuperTableLayout::ApplyShadow(XFTableStyle *pTableStyle) */ void LwpSuperTableLayout::ApplyPatternFill(XFTableStyle* pTableStyle) { - XFBGImage* pXFBGImage = this->GetFillPattern(); + XFBGImage* pXFBGImage = GetFillPattern(); if (pXFBGImage) { pTableStyle->SetBackImage(pXFBGImage); @@ -290,7 +290,7 @@ void LwpSuperTableLayout::ApplyPatternFill(XFTableStyle* pTableStyle) */ void LwpSuperTableLayout::ApplyBackGround(XFTableStyle* pTableStyle) { - if (this->IsPatternFill()) + if (IsPatternFill()) { ApplyPatternFill(pTableStyle); } diff --git a/lotuswordpro/source/filter/xfilter/xfpagemaster.hxx b/lotuswordpro/source/filter/xfilter/xfpagemaster.hxx index 32b5b12c3525..a0c6cea22688 100644 --- a/lotuswordpro/source/filter/xfilter/xfpagemaster.hxx +++ b/lotuswordpro/source/filter/xfilter/xfpagemaster.hxx @@ -147,7 +147,7 @@ private: inline void XFPageMaster::SetPageUsage(enumXFPageUsage usage) { - this->m_eUsage = usage; + m_eUsage = usage; } inline void XFPageMaster::SetTextDir(enumXFTextDir dir) -- cgit v1.2.3