From 5abc669599001bf888b97c4d3c2715e1fb7523b9 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 20 Apr 2016 10:34:01 +0200 Subject: new plugin stylepolice check for local variables which follow our member field naming convention, which is highly confusing Change-Id: Idacedf7145d09843e96a584237b385f7662eea10 --- lotuswordpro/source/filter/lwpdoc.cxx | 14 +++++++------- lotuswordpro/source/filter/lwppagelayout.cxx | 26 +++++++++++++------------- 2 files changed, 20 insertions(+), 20 deletions(-) (limited to 'lotuswordpro') diff --git a/lotuswordpro/source/filter/lwpdoc.cxx b/lotuswordpro/source/filter/lwpdoc.cxx index 9cc5f686bfa9..540f978c1e72 100644 --- a/lotuswordpro/source/filter/lwpdoc.cxx +++ b/lotuswordpro/source/filter/lwpdoc.cxx @@ -102,21 +102,21 @@ void LwpDocument::Read() //Skip the SortOption and UIDocument { - LwpSortOption m_DocSort( m_pObjStrm ); - LwpUIDocument m_UIDoc( m_pObjStrm ); + LwpSortOption aDocSort( m_pObjStrm ); + LwpUIDocument aUIDoc( m_pObjStrm ); } m_pLnOpts = new LwpLineNumberOptions(m_pObjStrm); //Skip LwpUserDictFiles { - LwpUserDictFiles m_UsrDicts( m_pObjStrm ); + LwpUserDictFiles aUsrDicts( m_pObjStrm ); } if( !IsChildDoc()) { //Skip LwpPrinterInfo - LwpPrinterInfo m_PrtInfo( m_pObjStrm ); + LwpPrinterInfo aPrtInfo( m_pObjStrm ); } m_pFoundry = m_pOwnedFoundry = new LwpFoundry(m_pObjStrm, this); @@ -308,12 +308,12 @@ void LwpDocument::RegisterBulletStyles() if (!m_pFoundry) return; //Register bullet styles - LwpDLVListHeadHolder* mBulletHead = dynamic_cast + LwpDLVListHeadHolder* pBulletHead = dynamic_cast (m_pFoundry->GetBulletManagerID().obj(VO_HEADHOLDER).get()); - if (!mBulletHead) + if (!pBulletHead) return; LwpSilverBullet* pBullet = dynamic_cast - (mBulletHead->GetHeadID().obj().get()); + (pBulletHead->GetHeadID().obj().get()); while(pBullet) { pBullet->SetFoundry(m_pFoundry); diff --git a/lotuswordpro/source/filter/lwppagelayout.cxx b/lotuswordpro/source/filter/lwppagelayout.cxx index d57eadcd1030..3a0fd641a92f 100644 --- a/lotuswordpro/source/filter/lwppagelayout.cxx +++ b/lotuswordpro/source/filter/lwppagelayout.cxx @@ -339,11 +339,11 @@ void LwpPageLayout::RegisterStyle() OUString pmname = pm1->GetStyleName(); //Add master page - XFMasterPage* mp1 = new XFMasterPage(); - mp1->SetStyleName(GetName().str()); - mp1->SetPageMaster(pmname); - mp1 = static_cast(pXFStyleManager->AddStyle(mp1).m_pStyle); - m_StyleName = mp1->GetStyleName(); + XFMasterPage* p1 = new XFMasterPage(); + p1->SetStyleName(GetName().str()); + p1->SetPageMaster(pmname); + p1 = static_cast(pXFStyleManager->AddStyle(p1).m_pStyle); + m_StyleName = p1->GetStyleName(); //Set footer style LwpFooterLayout* pLayoutFooter = GetFooterLayout(); @@ -351,7 +351,7 @@ void LwpPageLayout::RegisterStyle() { pLayoutFooter->SetFoundry(m_pFoundry); pLayoutFooter->RegisterStyle(pm1); - pLayoutFooter->RegisterStyle(mp1); + pLayoutFooter->RegisterStyle(p1); } //Set header style @@ -360,7 +360,7 @@ void LwpPageLayout::RegisterStyle() { pLayoutHeader->SetFoundry(m_pFoundry); pLayoutHeader->RegisterStyle(pm1); - pLayoutHeader->RegisterStyle(mp1); + pLayoutHeader->RegisterStyle(p1); } //register child layout style for mirror page and frame RegisterChildStyle(); @@ -398,9 +398,9 @@ OUString LwpPageLayout::RegisterEndnoteStyle() OUString pmname = pm1->GetStyleName(); //Add master page - XFMasterPage* mp1 = new XFMasterPage(); - mp1->SetStyleName("Endnote"); - mp1->SetPageMaster(pmname); + XFMasterPage* p1 = new XFMasterPage(); + p1->SetStyleName("Endnote"); + p1->SetPageMaster(pmname); //Set footer style LwpFooterLayout* pLayoutFooter = GetFooterLayout(); @@ -408,7 +408,7 @@ OUString LwpPageLayout::RegisterEndnoteStyle() { pLayoutFooter->SetFoundry(m_pFoundry); pLayoutFooter->RegisterStyle(pm1); - pLayoutFooter->RegisterStyle(mp1); + pLayoutFooter->RegisterStyle(p1); } //Set header style @@ -417,10 +417,10 @@ OUString LwpPageLayout::RegisterEndnoteStyle() { pLayoutHeader->SetFoundry(m_pFoundry); pLayoutHeader->RegisterStyle(pm1); - pLayoutHeader->RegisterStyle(mp1); + pLayoutHeader->RegisterStyle(p1); } - return pXFStyleManager->AddStyle(mp1).m_pStyle->GetStyleName(); + return pXFStyleManager->AddStyle(p1).m_pStyle->GetStyleName(); } /** * @descr: Whether current page layout has columns -- cgit v1.2.3