diff options
author | Noel Grandin <noel@peralex.com> | 2016-04-20 10:34:01 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2016-04-21 08:32:47 +0200 |
commit | 5abc669599001bf888b97c4d3c2715e1fb7523b9 (patch) | |
tree | 2407c6fc040a795e6ffc69de02ba940285c04c7f /svx/source | |
parent | 5bb308a9ad16f6002486a60e4a753693818580b6 (diff) |
new plugin stylepolice
check for local variables which follow our member field naming
convention, which is highly confusing
Change-Id: Idacedf7145d09843e96a584237b385f7662eea10
Diffstat (limited to 'svx/source')
-rw-r--r-- | svx/source/dialog/dlgctrl.cxx | 12 | ||||
-rwxr-xr-x | svx/source/dialog/srchdlg.cxx | 6 | ||||
-rw-r--r-- | svx/source/engine3d/obj3d.cxx | 32 | ||||
-rw-r--r-- | svx/source/sidebar/nbdtmg.cxx | 8 | ||||
-rw-r--r-- | svx/source/unodraw/UnoNameItemTable.cxx | 6 | ||||
-rw-r--r-- | svx/source/unodraw/unomtabl.cxx | 8 |
6 files changed, 36 insertions, 36 deletions
diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx index c80c8c930109..bc0163f89c08 100644 --- a/svx/source/dialog/dlgctrl.cxx +++ b/svx/source/dialog/dlgctrl.cxx @@ -967,8 +967,8 @@ void SvxPixelCtl::KeyInput( const KeyEvent& rKEvt ) Point pRepaintPoint( aRectSize.Width() *( aFocusPosition.getX() - 1)/ nLines - 1, aRectSize.Height() *( aFocusPosition.getY() - 1)/ nLines -1 ); - Size mRepaintSize( aRectSize.Width() *3/ nLines + 2,aRectSize.Height() *3/ nLines + 2); - Rectangle mRepaintRect( pRepaintPoint, mRepaintSize ); + Size aRepaintSize( aRectSize.Width() *3/ nLines + 2,aRectSize.Height() *3/ nLines + 2); + Rectangle aRepaintRect( pRepaintPoint, aRepaintSize ); bool bFocusPosChanged=false; switch(nCode) { @@ -976,7 +976,7 @@ void SvxPixelCtl::KeyInput( const KeyEvent& rKEvt ) if((aFocusPosition.getX() >= 1)) { aFocusPosition.setX( aFocusPosition.getX() - 1 ); - Invalidate(mRepaintRect); + Invalidate(aRepaintRect); bFocusPosChanged=true; } break; @@ -984,7 +984,7 @@ void SvxPixelCtl::KeyInput( const KeyEvent& rKEvt ) if( aFocusPosition.getX() < (nLines - 1) ) { aFocusPosition.setX( aFocusPosition.getX() + 1 ); - Invalidate(mRepaintRect); + Invalidate(aRepaintRect); bFocusPosChanged=true; } break; @@ -992,7 +992,7 @@ void SvxPixelCtl::KeyInput( const KeyEvent& rKEvt ) if((aFocusPosition.getY() >= 1)) { aFocusPosition.setY( aFocusPosition.getY() - 1 ); - Invalidate(mRepaintRect); + Invalidate(aRepaintRect); bFocusPosChanged=true; } break; @@ -1000,7 +1000,7 @@ void SvxPixelCtl::KeyInput( const KeyEvent& rKEvt ) if( aFocusPosition.getY() < ( nLines - 1 ) ) { aFocusPosition.setY( aFocusPosition.getY() + 1 ); - Invalidate(mRepaintRect); + Invalidate(aRepaintRect); bFocusPosChanged=true; } break; diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index 3ff920eb0790..babd7ae740d1 100755 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -2336,9 +2336,9 @@ css::uno::Reference< css::awt::XWindowPeer > css::uno::Reference< css::awt::XWindowPeer > xPeer( Window::GetComponentInterface(false) ); if ( !xPeer.is() && bCreate ) { - css::awt::XWindowPeer* mxPeer = new VCLXSvxFindReplaceDialog(this); - SetComponentInterface(mxPeer); - return mxPeer; + css::awt::XWindowPeer* pPeer = new VCLXSvxFindReplaceDialog(this); + SetComponentInterface(pPeer); + return pPeer; } else return xPeer; diff --git a/svx/source/engine3d/obj3d.cxx b/svx/source/engine3d/obj3d.cxx index 4777944069e0..f4af93b60196 100644 --- a/svx/source/engine3d/obj3d.cxx +++ b/svx/source/engine3d/obj3d.cxx @@ -353,23 +353,23 @@ void E3dObject::NbcResize(const Point& rRef, const Fraction& xFact, const Fracti // build transform basegfx::B3DHomMatrix aInverseOrientation(aViewInfo3D.getOrientation()); aInverseOrientation.invert(); - basegfx::B3DHomMatrix mFullTransform(GetFullTransform()); - basegfx::B3DHomMatrix mTrans(mFullTransform); + basegfx::B3DHomMatrix aFullTransform(GetFullTransform()); + basegfx::B3DHomMatrix aTrans(aFullTransform); - mTrans *= aViewInfo3D.getOrientation(); - mTrans.translate(-aScaleCenter3D.getX(), -aScaleCenter3D.getY(), -aScaleCenter3D.getZ()); - mTrans.scale(fScaleX, fScaleY, 1.0); - mTrans.translate(aScaleCenter3D.getX(), aScaleCenter3D.getY(), aScaleCenter3D.getZ()); - mTrans *= aInverseOrientation; - mFullTransform.invert(); - mTrans *= mFullTransform; + aTrans *= aViewInfo3D.getOrientation(); + aTrans.translate(-aScaleCenter3D.getX(), -aScaleCenter3D.getY(), -aScaleCenter3D.getZ()); + aTrans.scale(fScaleX, fScaleY, 1.0); + aTrans.translate(aScaleCenter3D.getX(), aScaleCenter3D.getY(), aScaleCenter3D.getZ()); + aTrans *= aInverseOrientation; + aFullTransform.invert(); + aTrans *= aFullTransform; // Apply - basegfx::B3DHomMatrix mObjTrans(GetTransform()); - mObjTrans *= mTrans; + basegfx::B3DHomMatrix aObjTrans(GetTransform()); + aObjTrans *= aTrans; E3DModifySceneSnapRectUpdater aUpdater(this); - SetTransform(mObjTrans); + SetTransform(aObjTrans); } } @@ -386,11 +386,11 @@ void E3dObject::NbcMove(const Size& rSize) //Dimensions of the scene in 3D and 2D for comparison Rectangle aRect = pScene->GetSnapRect(); - basegfx::B3DHomMatrix mInvDispTransform; + basegfx::B3DHomMatrix aInvDispTransform; if(GetParentObj()) { - mInvDispTransform = GetParentObj()->GetFullTransform(); - mInvDispTransform.invert(); + aInvDispTransform = GetParentObj()->GetFullTransform(); + aInvDispTransform.invert(); } // BoundVolume from 3d world to 3d eye @@ -412,7 +412,7 @@ void E3dObject::NbcMove(const Size& rSize) // movement vector to local coordinates of objects' parent basegfx::B3DHomMatrix aInverseOrientation(aViewInfo3D.getOrientation()); aInverseOrientation.invert(); - basegfx::B3DHomMatrix aCompleteTrans(mInvDispTransform * aInverseOrientation); + basegfx::B3DHomMatrix aCompleteTrans(aInvDispTransform * aInverseOrientation); aMove = aCompleteTrans * aMove; aPos = aCompleteTrans * aPos; diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx index 2679bf40c0d5..a1b57725166b 100644 --- a/svx/source/sidebar/nbdtmg.cxx +++ b/svx/source/sidebar/nbdtmg.cxx @@ -166,7 +166,7 @@ void NBOTypeMgrBase::ImplLoad(const OUString& filename) if (nVersion==DEFAULT_NUMBERING_CACHE_FORMAT_VERSION) //first version { xIStm->ReadInt32( nNumIndex ); - sal_uInt16 mLevel = 0x1; + sal_uInt16 nLevel = 0x1; while (nNumIndex>=0 && nNumIndex<DEFAULT_NUM_VALUSET_COUNT) { SvxNumRule aNum(*xIStm); //bullet color in font properties is not stored correctly. Need set tranparency bits manually @@ -182,7 +182,7 @@ void NBOTypeMgrBase::ImplLoad(const OUString& filename) aNum.SetLevel(i, aFmt); } } - RelplaceNumRule(aNum,nNumIndex,mLevel); + RelplaceNumRule(aNum,nNumIndex,nLevel); xIStm->ReadInt32( nNumIndex ); } } @@ -209,9 +209,9 @@ void NBOTypeMgrBase::ImplStore(const OUString& filename) SvxNumRuleFlags::CHAR_TEXT_DISTANCE | SvxNumRuleFlags::SYMBOL_ALIGNMENT, 10, false, SvxNumRuleType::NUMBERING, SvxNumberFormat::LABEL_ALIGNMENT); - sal_uInt16 mLevel = 0x1; + sal_uInt16 nLevel = 0x1; xOStm->WriteInt32( nItem ); - ApplyNumRule(aDefNumRule,nItem,mLevel,false,true); + ApplyNumRule(aDefNumRule,nItem,nLevel,false,true); aDefNumRule.Store(*xOStm); } } diff --git a/svx/source/unodraw/UnoNameItemTable.cxx b/svx/source/unodraw/UnoNameItemTable.cxx index 9643a20ea04f..0dc2369cb78d 100644 --- a/svx/source/unodraw/UnoNameItemTable.cxx +++ b/svx/source/unodraw/UnoNameItemTable.cxx @@ -85,13 +85,13 @@ sal_Bool SAL_CALL SvxUnoNameItemTable::supportsService( const OUString& Service void SAL_CALL SvxUnoNameItemTable::ImplInsertByName( const OUString& aName, const uno::Any& aElement ) { - SfxItemSet* mpInSet = new SfxItemSet( *mpModelPool, mnWhich, mnWhich ); - maItemSetVector.push_back( mpInSet ); + SfxItemSet* pInSet = new SfxItemSet( *mpModelPool, mnWhich, mnWhich ); + maItemSetVector.push_back( pInSet ); std::unique_ptr<NameOrIndex> pNewItem(createItem()); pNewItem->SetName( aName ); pNewItem->PutValue( aElement, mnMemberId ); - mpInSet->Put( *pNewItem, mnWhich ); + pInSet->Put( *pNewItem, mnWhich ); } // XNameContainer diff --git a/svx/source/unodraw/unomtabl.cxx b/svx/source/unodraw/unomtabl.cxx index dda1e7c5f9cc..dc2eb3c808a8 100644 --- a/svx/source/unodraw/unomtabl.cxx +++ b/svx/source/unodraw/unomtabl.cxx @@ -148,20 +148,20 @@ uno::Sequence< OUString > SAL_CALL SvxUnoMarkerTable::getSupportedServiceNames( void SAL_CALL SvxUnoMarkerTable::ImplInsertByName( const OUString& aName, const uno::Any& aElement ) { - SfxItemSet* mpInSet = new SfxItemSet( *mpModelPool, XATTR_LINESTART, XATTR_LINEEND ); - maItemSetVector.push_back( mpInSet ); + SfxItemSet* pInSet = new SfxItemSet( *mpModelPool, XATTR_LINESTART, XATTR_LINEEND ); + maItemSetVector.push_back( pInSet ); XLineEndItem aEndMarker; aEndMarker.SetName( aName ); aEndMarker.PutValue( aElement, 0 ); - mpInSet->Put( aEndMarker, XATTR_LINEEND ); + pInSet->Put( aEndMarker, XATTR_LINEEND ); XLineStartItem aStartMarker; aStartMarker.SetName( aName ); aStartMarker.PutValue( aElement, 0 ); - mpInSet->Put( aStartMarker, XATTR_LINESTART ); + pInSet->Put( aStartMarker, XATTR_LINESTART ); } // XNameContainer |