new plugin stylepolice

check for local variables which follow our member field naming
convention, which is highly confusing

Change-Id: Idacedf7145d09843e96a584237b385f7662eea10

18 files changed, 88 insertions, 90 deletions

diff --git a/sw/source/core/access/accfrmobj.cxx b/sw/source/core/access/accfrmobj.cxx
index cbd7b518e486..c6986d9d9ac5 100644
--- a/sw/source/core/access/accfrmobj.cxx
+++ b/sw/source/core/access/accfrmobj.cxx
@@ -156,9 +156,9 @@ bool SwAccessibleChild::IsBoundAsChar() const
     }
     else if ( mpDrawObj )
     {
-        const SwFrameFormat* mpFrameFormat = ::FindFrameFormat( mpDrawObj );
-        bRet = mpFrameFormat
-               && (FLY_AS_CHAR == mpFrameFormat->GetAnchor().GetAnchorId());
+        const SwFrameFormat* pFrameFormat = ::FindFrameFormat( mpDrawObj );
+        bRet = pFrameFormat
+               && (FLY_AS_CHAR == pFrameFormat->GetAnchor().GetAnchorId());
     }
     else if ( mpWindow )
     {
diff --git a/sw/source/core/crsr/trvltbl.cxx b/sw/source/core/crsr/trvltbl.cxx
index dfd6da6b63f4..896893fe1c46 100644
--- a/sw/source/core/crsr/trvltbl.cxx
+++ b/sw/source/core/crsr/trvltbl.cxx
@@ -629,9 +629,9 @@ bool GotoCurrTable( SwPaM& rCurrentCursor, SwPosTable fnPosTable,
 bool SwCursor::MoveTable( SwWhichTable fnWhichTable, SwPosTable fnPosTable )
 {
     bool bRet = false;
-    SwTableCursor* m_pTableCursor = dynamic_cast<SwTableCursor*>(this);
+    SwTableCursor* pTableCursor = dynamic_cast<SwTableCursor*>(this);
 
-    if( m_pTableCursor || !HasMark() )
+    if( pTableCursor || !HasMark() )
     {
         SwCursorSaveState aSaveState( *this );
         bRet = (*fnWhichTable)( *this, fnPosTable, IsReadOnlyAvailable() ) &&
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index 1dcea3300233..aca03fb1f769 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -158,13 +158,13 @@ void StartGrammarChecking( SwDoc &rDoc )
 {
     // check for a visible view
     bool bVisible = false;
-    const SwDocShell *mpDocShell = rDoc.GetDocShell();
-    SfxViewFrame    *pFrame = SfxViewFrame::GetFirst( mpDocShell, false );
+    const SwDocShell *pDocShell = rDoc.GetDocShell();
+    SfxViewFrame     *pFrame = SfxViewFrame::GetFirst( pDocShell, false );
     while (pFrame && !bVisible)
     {
         if (pFrame->IsVisible())
             bVisible = true;
-        pFrame = SfxViewFrame::GetNext( *pFrame, mpDocShell, false );
+        pFrame = SfxViewFrame::GetNext( *pFrame, pDocShell, false );
     }
 
     //!! only documents with visible views need to be checked
diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx
index c3dc0f75e39a..8b3786d78bf7 100644
--- a/sw/source/core/edit/autofmt.cxx
+++ b/sw/source/core/edit/autofmt.cxx
@@ -2599,12 +2599,12 @@ void SwEditShell::AutoFormatBySplitNode()
         else
         {
             // then go one node backwards
-            SwNodeIndex m_aNdIdx( pCursor->GetMark()->nNode, -1 );
-            SwTextNode* pTextNd = m_aNdIdx.GetNode().GetTextNode();
+            SwNodeIndex aNdIdx( pCursor->GetMark()->nNode, -1 );
+            SwTextNode* pTextNd = aNdIdx.GetNode().GetTextNode();
             if (pTextNd && !pTextNd->GetText().isEmpty())
             {
                 pContent->Assign( pTextNd, 0 );
-                pCursor->GetMark()->nNode = m_aNdIdx;
+                pCursor->GetMark()->nNode = aNdIdx;
                 bRange = true;
             }
         }
diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx
index 599bef62d0a7..f65fe5b46f86 100644
--- a/sw/source/core/layout/wsfrm.cxx
+++ b/sw/source/core/layout/wsfrm.cxx
@@ -1974,15 +1974,15 @@ void SwContentFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem * pNew )
             }
             _InvalidatePrt();
         }
-        SwFrame* mpNextFrame = GetIndNext();
-        if ( mpNextFrame && nInvFlags & 0x10)
+        SwFrame* pNextFrame = GetIndNext();
+        if ( pNextFrame && nInvFlags & 0x10)
         {
-            mpNextFrame->_InvalidatePrt();
-            mpNextFrame->InvalidatePage( pPage );
+            pNextFrame->_InvalidatePrt();
+            pNextFrame->InvalidatePage( pPage );
         }
-        if ( mpNextFrame && nInvFlags & 0x80 )
+        if ( pNextFrame && nInvFlags & 0x80 )
         {
-            mpNextFrame->SetCompletePaint();
+            pNextFrame->SetCompletePaint();
         }
         if ( nInvFlags & 0x20 )
         {
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index 2b303329b048..95dadc18f664 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -840,31 +840,31 @@ static void lcl_DrawSpecial( const SwTextPaintInfo& rInf, const SwLinePortion& r
     const SwFont* pOldFnt = rInf.GetFont();
 
     // Font is generated only once:
-    static SwFont* m_pFnt = nullptr;
-    if ( ! m_pFnt )
+    static SwFont* s_pFnt = nullptr;
+    if ( ! s_pFnt )
     {
-        m_pFnt = new SwFont( *pOldFnt );
-        m_pFnt->SetFamily( FAMILY_DONTKNOW, m_pFnt->GetActual() );
-        m_pFnt->SetName( numfunc::GetDefBulletFontname(), m_pFnt->GetActual() );
-        m_pFnt->SetStyleName( aEmptyOUStr, m_pFnt->GetActual() );
-        m_pFnt->SetCharSet( RTL_TEXTENCODING_SYMBOL, m_pFnt->GetActual() );
+        s_pFnt = new SwFont( *pOldFnt );
+        s_pFnt->SetFamily( FAMILY_DONTKNOW, s_pFnt->GetActual() );
+        s_pFnt->SetName( numfunc::GetDefBulletFontname(), s_pFnt->GetActual() );
+        s_pFnt->SetStyleName( aEmptyOUStr, s_pFnt->GetActual() );
+        s_pFnt->SetCharSet( RTL_TEXTENCODING_SYMBOL, s_pFnt->GetActual() );
     }
 
     // Some of the current values are set at the font:
     if ( ! bRotate )
-        m_pFnt->SetVertical( 0, rInf.GetTextFrame()->IsVertical() );
+        s_pFnt->SetVertical( 0, rInf.GetTextFrame()->IsVertical() );
     else
-        m_pFnt->SetVertical( pOldFnt->GetOrientation() );
+        s_pFnt->SetVertical( pOldFnt->GetOrientation() );
 
-    m_pFnt->SetColor(rCol);
+    s_pFnt->SetColor(rCol);
 
     Size aFontSize( 0, SPECIAL_FONT_HEIGHT );
-    m_pFnt->SetSize( aFontSize, m_pFnt->GetActual() );
+    s_pFnt->SetSize( aFontSize, s_pFnt->GetActual() );
 
-    const_cast<SwTextPaintInfo&>(rInf).SetFont( m_pFnt );
+    const_cast<SwTextPaintInfo&>(rInf).SetFont( s_pFnt );
 
     // The maximum width depends on the current orientation
-    const sal_uInt16 nDir = m_pFnt->GetOrientation( rInf.GetTextFrame()->IsVertical() );
+    const sal_uInt16 nDir = s_pFnt->GetOrientation( rInf.GetTextFrame()->IsVertical() );
     SwTwips nMaxWidth;
     if (nDir == 900 || nDir == 2700)
         nMaxWidth = rRect.Height();
@@ -883,14 +883,14 @@ static void lcl_DrawSpecial( const SwTextPaintInfo& rInf, const SwLinePortion& r
         const SwTwips nOldWidth = aFontSize.Width();
 
         // new height for font
-        const SwFontScript nAct = m_pFnt->GetActual();
-        aFontSize.Height() = ( 100 * m_pFnt->GetSize( nAct ).Height() ) / nFactor;
-        aFontSize.Width() = ( 100 * m_pFnt->GetSize( nAct).Width() ) / nFactor;
+        const SwFontScript nAct = s_pFnt->GetActual();
+        aFontSize.Height() = ( 100 * s_pFnt->GetSize( nAct ).Height() ) / nFactor;
+        aFontSize.Width() = ( 100 * s_pFnt->GetSize( nAct).Width() ) / nFactor;
 
         if ( !aFontSize.Width() && !aFontSize.Height() )
             break;
 
-        m_pFnt->SetSize( aFontSize, nAct );
+        s_pFnt->SetSize( aFontSize, nAct );
 
         aFontSize = rInf.GetTextSize( aTmp ).SvLSize();
 
diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx
index cd1decb998e2..155004acf4b6 100644
--- a/sw/source/core/text/txtfrm.cxx
+++ b/sw/source/core/text/txtfrm.cxx
@@ -2227,7 +2227,7 @@ void SwTextFrame::_CalcHeightOfLastLine( const bool _bUseFont )
 {
     // i#71281
     // Invalidate printing area, if height of last line changes
-    const SwTwips mnOldHeightOfLastLine( mnHeightOfLastLine );
+    const SwTwips nOldHeightOfLastLine( mnHeightOfLastLine );
 
     // determine output device
     SwViewShell* pVsh = getRootFrame()->GetCurrShell();
@@ -2346,7 +2346,7 @@ void SwTextFrame::_CalcHeightOfLastLine( const bool _bUseFont )
     }
     // i#71281
     // invalidate printing area, if height of last line changes
-    if ( mnHeightOfLastLine != mnOldHeightOfLastLine )
+    if ( mnHeightOfLastLine != nOldHeightOfLastLine )
     {
         InvalidatePrt();
     }
diff --git a/sw/source/core/unocore/XMLRangeHelper.cxx b/sw/source/core/unocore/XMLRangeHelper.cxx
index b06e726d75b6..8047e000f2c6 100644
--- a/sw/source/core/unocore/XMLRangeHelper.cxx
+++ b/sw/source/core/unocore/XMLRangeHelper.cxx
@@ -37,12 +37,12 @@ public:
     explicit lcl_Escape( OUStringBuffer & aResultBuffer ) : m_aResultBuffer( aResultBuffer ) {}
     void operator() ( sal_Unicode aChar )
     {
-        static const sal_Unicode m_aQuote( '\'' );
-        static const sal_Unicode m_aBackslash( '\\' );
+        static const sal_Unicode s_aQuote( '\'' );
+        static const sal_Unicode s_aBackslash( '\\' );
 
-        if( aChar == m_aQuote ||
-            aChar == m_aBackslash )
-            m_aResultBuffer.append( m_aBackslash );
+        if( aChar == s_aQuote ||
+            aChar == s_aBackslash )
+            m_aResultBuffer.append( s_aBackslash );
         m_aResultBuffer.append( aChar );
     }
 
@@ -60,9 +60,9 @@ public:
     explicit lcl_UnEscape( OUStringBuffer & aResultBuffer ) : m_aResultBuffer( aResultBuffer ) {}
     void operator() ( sal_Unicode aChar )
     {
-        static const sal_Unicode m_aBackslash( '\\' );
+        static const sal_Unicode s_aBackslash( '\\' );
 
-        if( aChar != m_aBackslash )
+        if( aChar != s_aBackslash )
             m_aResultBuffer.append( aChar );
     }
 
diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx
index a040e992d9f8..9b2f278e6d67 100644
--- a/sw/source/core/unocore/unocoll.cxx
+++ b/sw/source/core/unocore/unocoll.cxx
@@ -126,8 +126,6 @@ public:
 
                 for ( sal_Int32 i=0; i < sModuleNames.getLength(); ++i )
                 {
-                    script::ModuleInfo mInfo;
-
                     if ( xVBAModuleInfo->hasModuleInfo( sModuleNames[ i ] ) &&  xVBAModuleInfo->getModuleInfo( sModuleNames[ i ] ).ModuleType == script::ModuleType::DOCUMENT )
                     {
                         msThisDocumentCodeName = sModuleNames[ i ];
diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx
index fce4122607db..c4c5ed21d0ef 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -3013,12 +3013,12 @@ void SwXFrame::attachToRange(const uno::Reference< text::XTextRange > & xTextRan
                 // Not sure if these setParent() and InsertEmbeddedObject() calls are really
                 // needed, it seems to work without, but logic from code elsewhere suggests
                 // they should be done.
-                SfxObjectShell& mrPers = *pDoc->GetPersist();
+                SfxObjectShell& rPers = *pDoc->GetPersist();
                 uno::Reference < container::XChild > xChild( obj, uno::UNO_QUERY );
                 if ( xChild.is() )
-                    xChild->setParent( mrPers.GetModel() );
+                    xChild->setParent( rPers.GetModel() );
                 OUString rName;
-                mrPers.GetEmbeddedObjectContainer().InsertEmbeddedObject( obj, rName );
+                rPers.GetEmbeddedObjectContainer().InsertEmbeddedObject( obj, rName );
 
                 SwFlyFrameFormat* pFrameFormat = nullptr;
                 pFrameFormat = pDoc->getIDocumentContentOperations().Insert( aPam, xObj, &aFrameSet, nullptr, nullptr );
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx
index 1ac6ae80164c..1b0086291e6f 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -178,14 +178,14 @@ void SwBasicEscherEx::WriteHyperlinkWithinFly( SvMemoryStream& rStrm, const SwFo
 {
     if ( !pINetFormatArg ) return;
 
-    sal_uInt8 maGuidStdLink[ 16 ] ={
+    sal_uInt8 aGuidStdLink[ 16 ] ={
         0xD0, 0xC9, 0xEA, 0x79, 0xF9, 0xBA, 0xCE, 0x11, 0x8C, 0x82, 0x00, 0xAA, 0x00, 0x4B, 0xA9, 0x0B };
-    sal_uInt8 maGuidUrlMoniker[ 16 ] = {
+    sal_uInt8 aGuidUrlMoniker[ 16 ] = {
         0xE0, 0xC9, 0xEA, 0x79, 0xF9, 0xBA, 0xCE, 0x11, 0x8C, 0x82, 0x00, 0xAA, 0x00, 0x4B, 0xA9, 0x0B };
 
-    sal_uInt8 maGuidFileMoniker[ 16 ] = {
+    sal_uInt8 aGuidFileMoniker[ 16 ] = {
         0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46 };
-    sal_uInt8 maGuidFileTail[] = {
+    sal_uInt8 aGuidFileTail[] = {
             0xFF, 0xFF, 0xAD, 0xDE, 0x00, 0x00, 0x00, 0x00,
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
@@ -202,7 +202,7 @@ void SwBasicEscherEx::WriteHyperlinkWithinFly( SvMemoryStream& rStrm, const SwFo
 
     OUString rUrl = pINetFormatArg->GetURL();
     OUString rTarFrame = pINetFormatArg->GetTargetFrameName();
-    sal_uInt32          mnFlags = 0;
+    sal_uInt32 nFlags = 0;
 
     INetURLObject aUrlObj( rUrl );
     const INetProtocol eProtocol = aUrlObj.GetProtocol();
@@ -215,7 +215,7 @@ void SwBasicEscherEx::WriteHyperlinkWithinFly( SvMemoryStream& rStrm, const SwFo
 
         tmpStrm.WriteUInt16( 0 );
 
-        mnFlags |= WW8_HLINK_FRAME;
+        nFlags |= WW8_HLINK_FRAME;
     }
 
     // file link or URL
@@ -226,15 +226,15 @@ void SwBasicEscherEx::WriteHyperlinkWithinFly( SvMemoryStream& rStrm, const SwFo
         OUString aFileName( BuildFileName( nLevel, bRel, rUrl ));
 
         if( !bRel )
-            mnFlags |= WW8_HLINK_ABS;
+            nFlags |= WW8_HLINK_ABS;
 
-        mnFlags |= WW8_HLINK_BODY;
+        nFlags |= WW8_HLINK_BODY;
 
-        tmpStrm.Write( maGuidFileMoniker,sizeof(maGuidFileMoniker) );
+        tmpStrm.Write( aGuidFileMoniker,sizeof(aGuidFileMoniker) );
         tmpStrm.WriteUInt16( nLevel );
         SwWW8Writer::WriteLong(tmpStrm, aFileName.getLength()+1);
         SwWW8Writer::WriteString8( tmpStrm, aFileName, true, RTL_TEXTENCODING_MS_1252 );
-        tmpStrm.Write( maGuidFileTail,sizeof(maGuidFileTail) );
+        tmpStrm.Write( aGuidFileTail,sizeof(aGuidFileTail) );
 
         //For UNICODE
         SwWW8Writer::WriteLong(tmpStrm, 2*aFileName.getLength()+6);
@@ -244,11 +244,11 @@ void SwBasicEscherEx::WriteHyperlinkWithinFly( SvMemoryStream& rStrm, const SwFo
     }
     else if( eProtocol != INetProtocol::NotValid )
     {
-        tmpStrm.Write( maGuidUrlMoniker,sizeof(maGuidUrlMoniker) );
+        tmpStrm.Write( aGuidUrlMoniker,sizeof(aGuidUrlMoniker) );
             SwWW8Writer::WriteLong(tmpStrm, 2*(rUrl.getLength()+1));
 
-            SwWW8Writer::WriteString16(tmpStrm, rUrl, true);
-            mnFlags |= WW8_HLINK_BODY | WW8_HLINK_ABS;
+        SwWW8Writer::WriteString16(tmpStrm, rUrl, true);
+            nFlags |= WW8_HLINK_BODY | WW8_HLINK_ABS;
     }
     else if (rUrl[0] == '#' )
     {
@@ -267,12 +267,12 @@ void SwBasicEscherEx::WriteHyperlinkWithinFly( SvMemoryStream& rStrm, const SwFo
         SwWW8Writer::WriteLong(tmpStrm, tmpTextMark.getLength()+1);
             SwWW8Writer::WriteString16(tmpStrm, tmpTextMark, true);
 
-        mnFlags |= WW8_HLINK_MARK;
+        nFlags |= WW8_HLINK_MARK;
     }
 
-    rStrm.Write( maGuidStdLink,16 );
+    rStrm.Write( aGuidStdLink,16 );
     rStrm .WriteUInt32( 2 )
-          .WriteUInt32( mnFlags );
+          .WriteUInt32( nFlags );
     tmpStrm.Seek( STREAM_SEEK_TO_BEGIN );
     sal_uInt32 const nLen = tmpStrm.remainingSize();
     if(nLen >0)
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 720c83c943ed..a6346c37a34f 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -278,10 +278,10 @@ void SwWW8ImplReader::ReadEmbeddedData( SvMemoryStream& rStrm, SwDocShell* pDocS
     //sal_uInt8 maGuidStdLink[ 16 ] ={
     //    0xD0, 0xC9, 0xEA, 0x79, 0xF9, 0xBA, 0xCE, 0x11, 0x8C, 0x82, 0x00, 0xAA, 0x00, 0x4B, 0xA9, 0x0B };
 
-    sal_uInt8 maGuidUrlMoniker[ 16 ] = {
+    sal_uInt8 aGuidUrlMoniker[ 16 ] = {
         0xE0, 0xC9, 0xEA, 0x79, 0xF9, 0xBA, 0xCE, 0x11, 0x8C, 0x82, 0x00, 0xAA, 0x00, 0x4B, 0xA9, 0x0B };
 
-    sal_uInt8 maGuidFileMoniker[ 16 ] = {
+    sal_uInt8 aGuidFileMoniker[ 16 ] = {
         0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46 };
 
     sal_uInt8 aGuid[16];
@@ -320,7 +320,7 @@ void SwWW8ImplReader::ReadEmbeddedData( SvMemoryStream& rStrm, SwDocShell* pDocS
     {
         rStrm.Read( aGuid, 16);
 
-        if( (memcmp(aGuid, maGuidFileMoniker, 16) == 0) )
+        if( (memcmp(aGuid, aGuidFileMoniker, 16) == 0) )
         {
             rStrm.ReadUInt16( nLevel );
             xShortName.reset( new OUString );
@@ -342,7 +342,7 @@ void SwWW8ImplReader::ReadEmbeddedData( SvMemoryStream& rStrm, SwDocShell* pDocS
             else
                 lclGetAbsPath( *xShortName, nLevel, pDocShell);
         }
-        else if( (memcmp(aGuid, maGuidUrlMoniker, 16) == 0) )
+        else if( (memcmp(aGuid, aGuidUrlMoniker, 16) == 0) )
         {
             sal_uInt32 nStrLen(0);
             rStrm.ReadUInt32( nStrLen );
@@ -1149,22 +1149,22 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream& rSt,
     {
         SvMemoryStream aMemStream;
         struct HyperLinksTable hlStr;
-        sal_uInt16 mnRawRecId,mnRawRecSize;
+        sal_uInt16 nRawRecId,nRawRecSize;
         aMemStream.WriteUInt16( 0 ).WriteUInt16( nBufferSize );
 
         // copy from DFF stream to memory stream
         ::std::vector< sal_uInt8 > aBuffer( nBufferSize );
         sal_uInt8* pnData = &aBuffer.front();
-        sal_uInt8 mnStreamSize;
+        sal_uInt8 nStreamSize;
         if( pnData && rSt.Read( pnData, nBufferSize ) == nBufferSize )
         {
             aMemStream.Write( pnData, nBufferSize );
             aMemStream.Seek( STREAM_SEEK_TO_END );
-            mnStreamSize = aMemStream.Tell();
+            nStreamSize = aMemStream.Tell();
             aMemStream.Seek( STREAM_SEEK_TO_BEGIN );
-            bool bRet =  4 <= mnStreamSize;
+            bool bRet =  4 <= nStreamSize;
             if( bRet )
-                aMemStream.ReadUInt16( mnRawRecId ).ReadUInt16( mnRawRecSize );
+                aMemStream.ReadUInt16( nRawRecId ).ReadUInt16( nRawRecSize );
             SwDocShell* pDocShell = rReader.m_pDocShell;
             if(pDocShell)
             {
diff --git a/sw/source/ui/chrdlg/numpara.cxx b/sw/source/ui/chrdlg/numpara.cxx
index 80326edc2faa..c90136653180 100644
--- a/sw/source/ui/chrdlg/numpara.cxx
+++ b/sw/source/ui/chrdlg/numpara.cxx
@@ -366,11 +366,11 @@ bool SwParagraphNumTabPage::ExecuteEditNumStyle_Impl(
 
     pItems[ nCount++ ] = nullptr;
 
-    const SfxPoolItem* mpItem = rDispatcher.Execute(
+    const SfxPoolItem* pItem = rDispatcher.Execute(
         nId, SfxCallMode::SYNCHRON | SfxCallMode::RECORD | SfxCallMode::MODAL,
         pItems );
 
-    if ( !mpItem )
+    if ( !pItem )
         return false;
 
     return true;
diff --git a/sw/source/ui/misc/linenum.cxx b/sw/source/ui/misc/linenum.cxx
index 5a30ab0f3977..789904392edd 100644
--- a/sw/source/ui/misc/linenum.cxx
+++ b/sw/source/ui/misc/linenum.cxx
@@ -39,8 +39,8 @@
 static rtl::Reference<SwDocStyleSheet> lcl_getDocStyleSheet(const OUString& rName, SwWrtShell *pSh)
 {
     sal_uInt16 nFamily = SFX_STYLE_FAMILY_PARA;
-    SfxStyleSheetBasePool* mpBase =  pSh->GetView().GetDocShell()->GetStyleSheetPool();
-    SfxStyleSheetBase* pStyle = mpBase->Find(rName, (SfxStyleFamily)nFamily);
+    SfxStyleSheetBasePool* pBase =  pSh->GetView().GetDocShell()->GetStyleSheetPool();
+    SfxStyleSheetBase* pStyle = pBase->Find(rName, (SfxStyleFamily)nFamily);
     SAL_WARN_IF( !pStyle, "sw.ui", "Style not found" );
     if(!pStyle)
         return nullptr;
diff --git a/sw/source/ui/vba/vbaaddins.cxx b/sw/source/ui/vba/vbaaddins.cxx
index 9d8e45d3410e..7d7e804b7d08 100644
--- a/sw/source/ui/vba/vbaaddins.cxx
+++ b/sw/source/ui/vba/vbaaddins.cxx
@@ -27,7 +27,7 @@ using namespace ::com::sun::star;
 
 static uno::Reference< container::XIndexAccess > lcl_getAddinCollection( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext )
 {
-    XNamedObjectCollectionHelper< word::XAddin >::XNamedVec maAddins;
+    XNamedObjectCollectionHelper< word::XAddin >::XNamedVec aAddins;
 
     // first get the autoload addins in the directory STARTUP
     uno::Reference< lang::XMultiComponentFactory > xMCF( xContext->getServiceManager(), uno::UNO_QUERY_THROW );
@@ -45,14 +45,14 @@ static uno::Reference< container::XIndexAccess > lcl_getAddinCollection( const u
             OUString sUrl = sEntries[ index ];
             if( !xSFA->isFolder( sUrl ) && sUrl.endsWithIgnoreAsciiCase( ".dot" ) )
             {
-                maAddins.push_back( uno::Reference< word::XAddin >( new SwVbaAddin( xParent, xContext, sUrl ) ) );
+                aAddins.push_back( uno::Reference< word::XAddin >( new SwVbaAddin( xParent, xContext, sUrl ) ) );
             }
         }
     }
 
     // TODO: second get the customize addins in the org.openoffice.Office.Writer/GlobalTemplateList
 
-    uno::Reference< container::XIndexAccess > xAddinsAccess( new XNamedObjectCollectionHelper< word::XAddin >( maAddins ) );
+    uno::Reference< container::XIndexAccess > xAddinsAccess( new XNamedObjectCollectionHelper< word::XAddin >( aAddins ) );
     return xAddinsAccess;
 }
 
diff --git a/sw/source/ui/vba/vbavariables.cxx b/sw/source/ui/vba/vbavariables.cxx
index d77ce2a19d49..ba2e445bf735 100644
--- a/sw/source/ui/vba/vbavariables.cxx
+++ b/sw/source/ui/vba/vbavariables.cxx
@@ -27,14 +27,14 @@ using namespace ::com::sun::star;
 uno::Reference< container::XIndexAccess > createVariablesAccess( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< beans::XPropertyAccess >& xUserDefined ) throw ( uno::RuntimeException )
 {
     // FIXME: the performance is poor?
-    XNamedObjectCollectionHelper< word::XVariable >::XNamedVec mVariables;
+    XNamedObjectCollectionHelper< word::XVariable >::XNamedVec aVariables;
     const uno::Sequence< beans::PropertyValue > props = xUserDefined->getPropertyValues();
     sal_Int32 nCount = props.getLength();
-    mVariables.reserve( nCount );
+    aVariables.reserve( nCount );
     for( sal_Int32 i=0; i < nCount; i++ )
-        mVariables.push_back( uno::Reference< word::XVariable > ( new SwVbaVariable( xParent, xContext, xUserDefined, props[i].Name ) ) );
+        aVariables.push_back( uno::Reference< word::XVariable > ( new SwVbaVariable( xParent, xContext, xUserDefined, props[i].Name ) ) );
 
-    uno::Reference< container::XIndexAccess > xVariables( new XNamedObjectCollectionHelper< word::XVariable >( mVariables ) );
+    uno::Reference< container::XIndexAccess > xVariables( new XNamedObjectCollectionHelper< word::XVariable >( aVariables ) );
     return xVariables;
 }
 
diff --git a/sw/source/uibase/uiview/viewport.cxx b/sw/source/uibase/uiview/viewport.cxx
index b68af257e300..b33e775961e1 100644
--- a/sw/source/uibase/uiview/viewport.cxx
+++ b/sw/source/uibase/uiview/viewport.cxx
@@ -87,7 +87,7 @@ static void lcl_GetPos(SwView* pView,
                 bool bBorder)
 {
     SwWrtShell &rSh = pView->GetWrtShell();
-    const Size m_aDocSz( rSh.GetDocSize() );
+    const Size aDocSz( rSh.GetDocSize() );
 
     const long lBorder = bBorder ? DOCUMENTBORDER : DOCUMENTBORDER * 2;
     const bool bHori = pScrollbar->IsHoriScroll();
@@ -96,7 +96,7 @@ static void lcl_GetPos(SwView* pView,
 
     long lDelta = lPos - (bHori ? rSh.VisArea().Pos().X() : rSh.VisArea().Pos().Y());
 
-    const long lSize = (bHori ? m_aDocSz.A() : m_aDocSz.B()) + lBorder;
+    const long lSize = (bHori ? aDocSz.A() : aDocSz.B()) + lBorder;
     // Should right or below are too much space,
     // then they must be subtracted out of the VisArea!
     long nTmp = pView->GetVisArea().Right()+lDelta;
diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx
index 476c95e36b30..165289ba089d 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -1418,7 +1418,7 @@ bool  SwContentTree::Expand( SvTreeListEntry* pParent )
                 m_nHiddenBlock |= nOr;
             if((pCntType->GetType() == ContentTypeId::OUTLINE))
             {
-                std::map< void*, bool > mCurrOutLineNodeMap;
+                std::map< void*, bool > aCurrOutLineNodeMap;
 
                 SwWrtShell* pShell = GetWrtShell();
                 bool bBool = SvTreeListBox::Expand(pParent);
@@ -1429,17 +1429,17 @@ bool  SwContentTree::Expand( SvTreeListEntry* pParent )
                     {
                         sal_Int32 nPos = static_cast<SwContent*>(pChild->GetUserData())->GetYPos();
                         void* key = static_cast<void*>(pShell->getIDocumentOutlineNodesAccess()->getOutlineNode( nPos ));
-                        mCurrOutLineNodeMap.insert(std::map<void*, bool>::value_type( key, false ) );
+                        aCurrOutLineNodeMap.insert(std::map<void*, bool>::value_type( key, false ) );
                         std::map<void*, bool>::iterator iter = mOutLineNodeMap.find( key );
                         if( iter != mOutLineNodeMap.end() && mOutLineNodeMap[key])
                         {
-                            mCurrOutLineNodeMap[key] = true;
+                            aCurrOutLineNodeMap[key] = true;
                             SvTreeListBox::Expand(pChild);
                         }
                     }
                     pChild = Next(pChild);
                 }
-                mOutLineNodeMap = mCurrOutLineNodeMap;
+                mOutLineNodeMap = aCurrOutLineNodeMap;
                 return bBool;
             }