new plugin stylepolice

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

Change-Id: Idacedf7145d09843e96a584237b385f7662eea10

11 files changed, 90 insertions, 90 deletions

diff --git a/vcl/opengl/program.cxx b/vcl/opengl/program.cxx
index 340b10f6bb8f..c8b0583f56a2 100644
--- a/vcl/opengl/program.cxx
+++ b/vcl/opengl/program.cxx
@@ -278,8 +278,8 @@ void OpenGLProgram::SetTransform(
         (float) aYRel.getX()/nTexHeight, (float) aYRel.getY()/nTexHeight, 0, 0,
         0,                               0,                               1, 0,
         (float) rNull.getX(),            (float) rNull.getY(),            0, 1 };
-    glm::mat4 mMatrix = glm::make_mat4( aValues );
-    glUniformMatrix4fv( nUniform, 1, GL_FALSE, glm::value_ptr( mMatrix ) );
+    glm::mat4 aMatrix = glm::make_mat4( aValues );
+    glUniformMatrix4fv( nUniform, 1, GL_FALSE, glm::value_ptr( aMatrix ) );
     CHECK_GL_ERROR();
 }
 
@@ -296,12 +296,12 @@ void OpenGLProgram::ApplyMatrix(float fWidth, float fHeight, float fPixelOffset)
     OString sProjectionMatrix("mvp");
     GLuint nUniform = GetUniformLocation(sProjectionMatrix);
 
-    glm::mat4 mMVP = glm::ortho(0.0f, fWidth, fHeight, 0.0f, 0.0f, 1.0f);
+    glm::mat4 aMVP = glm::ortho(0.0f, fWidth, fHeight, 0.0f, 0.0f, 1.0f);
 
     if (fPixelOffset != 0.0f)
-        mMVP = glm::translate(mMVP, glm::vec3(fPixelOffset, fPixelOffset, 0.0f));
+        aMVP = glm::translate(aMVP, glm::vec3(fPixelOffset, fPixelOffset, 0.0f));
 
-    glUniformMatrix4fv(nUniform, 1, GL_FALSE, glm::value_ptr(mMVP));
+    glUniformMatrix4fv(nUniform, 1, GL_FALSE, glm::value_ptr(aMVP));
     CHECK_GL_ERROR();
 }
 
diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx
index 6dce7e787b2e..9b973be74dff 100644
--- a/vcl/source/app/help.cxx
+++ b/vcl/source/app/help.cxx
@@ -584,8 +584,8 @@ void ImplSetHelpWindowPos( vcl::Window* pHelpWin, sal_uInt16 nHelpWinStyle, Quic
     Rectangle   aScreenRect = pHelpWin->ImplGetFrameWindow()->GetDesktopRectPixel();
     aPos = pHelpWin->GetParent()->ImplGetFrameWindow()->OutputToAbsoluteScreenPixel( aPos );
     // get mouse screen coords
-    Point mPos( pHelpWin->GetParent()->ImplGetFrameWindow()->GetPointerPosPixel() );
-    mPos = pHelpWin->GetParent()->ImplGetFrameWindow()->OutputToAbsoluteScreenPixel( mPos );
+    Point aMousePos( pHelpWin->GetParent()->ImplGetFrameWindow()->GetPointerPosPixel() );
+    aMousePos = pHelpWin->GetParent()->ImplGetFrameWindow()->OutputToAbsoluteScreenPixel( aMousePos );
 
     if ( nHelpWinStyle == HELPWINSTYLE_QUICK )
     {
@@ -603,7 +603,7 @@ void ImplSetHelpWindowPos( vcl::Window* pHelpWin, sal_uInt16 nHelpWinStyle, Quic
     {
         // If it's the mouse position, move the window slightly
         // so the mouse pointer does not cover it
-        if ( aPos == mPos )
+        if ( aPos == aMousePos )
         {
             aPos.X() += 12;
             aPos.Y() += 16;
@@ -665,15 +665,15 @@ void ImplSetHelpWindowPos( vcl::Window* pHelpWin, sal_uInt16 nHelpWinStyle, Quic
         // otherwise it would directly be closed due to a focus change...
         */
         Rectangle aHelpRect( aPos, aSz );
-        if( aHelpRect.IsInside( mPos ) )
+        if( aHelpRect.IsInside( aMousePos ) )
         {
             Point delta(2,2);
             Point pSize( aSz.Width(), aSz.Height() );
-            Point pTest( mPos - pSize - delta );
+            Point pTest( aMousePos - pSize - delta );
             if( pTest.X() > aScreenRect.Left() &&  pTest.Y() > aScreenRect.Top() )
                 aPos = pTest;
             else
-                aPos = mPos + delta;
+                aPos = aMousePos + delta;
         }
     }
 
diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx
index 40b6161dd29c..de89a6c3336d 100644
--- a/vcl/source/control/scrbar.cxx
+++ b/vcl/source/control/scrbar.cxx
@@ -138,12 +138,12 @@ void ScrollBar::ImplUpdateRects( bool bUpdate )
     mnStateFlags  &= ~SCRBAR_STATE_BTN1_DISABLE;
     mnStateFlags  &= ~SCRBAR_STATE_BTN2_DISABLE;
 
-    Rectangle& maTrackRect = mpData->maTrackRect; // TODO: remove when maTrackRect is no longer in mpData
+    Rectangle& aTrackRect = mpData->maTrackRect; // TODO: remove when maTrackRect is no longer in mpData
     if ( mnThumbPixRange )
     {
         if ( GetStyle() & WB_HORZ )
         {
-            maThumbRect.Left()      = maTrackRect.Left()+mnThumbPixPos;
+            maThumbRect.Left()      = aTrackRect.Left()+mnThumbPixPos;
             maThumbRect.Right()     = maThumbRect.Left()+mnThumbPixSize-1;
             if ( !mnThumbPixPos )
                 maPage1Rect.Right()     = RECT_EMPTY;
@@ -154,12 +154,12 @@ void ScrollBar::ImplUpdateRects( bool bUpdate )
             else
             {
                 maPage2Rect.Left()      = maThumbRect.Right()+1;
-                maPage2Rect.Right()     = maTrackRect.Right();
+                maPage2Rect.Right()     = aTrackRect.Right();
             }
         }
         else
         {
-            maThumbRect.Top()       = maTrackRect.Top()+mnThumbPixPos;
+            maThumbRect.Top()       = aTrackRect.Top()+mnThumbPixPos;
             maThumbRect.Bottom()    = maThumbRect.Top()+mnThumbPixSize-1;
             if ( !mnThumbPixPos )
                 maPage1Rect.Bottom()    = RECT_EMPTY;
@@ -170,7 +170,7 @@ void ScrollBar::ImplUpdateRects( bool bUpdate )
             else
             {
                 maPage2Rect.Top()       = maThumbRect.Bottom()+1;
-                maPage2Rect.Bottom()    = maTrackRect.Bottom();
+                maPage2Rect.Bottom()    = aTrackRect.Bottom();
             }
         }
     }
@@ -178,24 +178,24 @@ void ScrollBar::ImplUpdateRects( bool bUpdate )
     {
         if ( GetStyle() & WB_HORZ )
         {
-            const long nSpace = maTrackRect.Right() - maTrackRect.Left();
+            const long nSpace = aTrackRect.Right() - aTrackRect.Left();
             if ( nSpace > 0 )
             {
-                maPage1Rect.Left()   = maTrackRect.Left();
-                maPage1Rect.Right()  = maTrackRect.Left() + (nSpace/2);
+                maPage1Rect.Left()   = aTrackRect.Left();
+                maPage1Rect.Right()  = aTrackRect.Left() + (nSpace/2);
                 maPage2Rect.Left()   = maPage1Rect.Right() + 1;
-                maPage2Rect.Right()  = maTrackRect.Right();
+                maPage2Rect.Right()  = aTrackRect.Right();
             }
         }
         else
         {
-            const long nSpace = maTrackRect.Bottom() - maTrackRect.Top();
+            const long nSpace = aTrackRect.Bottom() - aTrackRect.Top();
             if ( nSpace > 0 )
             {
-                maPage1Rect.Top()    = maTrackRect.Top();
-                maPage1Rect.Bottom() = maTrackRect.Top() + (nSpace/2);
+                maPage1Rect.Top()    = aTrackRect.Top();
+                maPage1Rect.Bottom() = aTrackRect.Top() + (nSpace/2);
                 maPage2Rect.Top()    = maPage1Rect.Bottom() + 1;
-                maPage2Rect.Bottom() = maTrackRect.Bottom();
+                maPage2Rect.Bottom() = aTrackRect.Bottom();
             }
         }
     }
@@ -250,7 +250,7 @@ void ScrollBar::ImplCalc( bool bUpdate )
     const Size aSize = GetOutputSizePixel();
     const long nMinThumbSize = GetSettings().GetStyleSettings().GetMinThumbSize();
 
-    Rectangle& maTrackRect = mpData->maTrackRect;  // TODO: remove when maTrackRect is no longer in mpData
+    Rectangle& aTrackRect = mpData->maTrackRect;  // TODO: remove when maTrackRect is no longer in mpData
     if ( mbCalcSize )
     {
         Size aOldSize = getCurrentCalcSize();
@@ -279,18 +279,18 @@ void ScrollBar::ImplCalc( bool bUpdate )
 
             if ( GetNativeControlRegion( CTRL_SCROLLBAR, PART_TRACK_HORZ_AREA,
                      aControlRegion, ControlState::NONE, ImplControlValue(), OUString(), aBoundingRegion, aTrackRegion ) )
-                maTrackRect = aTrackRegion;
+                aTrackRect = aTrackRegion;
             else
-                maTrackRect = Rectangle( maBtn1Rect.TopRight(), maBtn2Rect.BottomLeft() );
+                aTrackRect = Rectangle( maBtn1Rect.TopRight(), maBtn2Rect.BottomLeft() );
 
             // Check if available space is big enough for thumb ( min thumb size = ScrBar width/height )
-            mnThumbPixRange = maTrackRect.Right() - maTrackRect.Left();
+            mnThumbPixRange = aTrackRect.Right() - aTrackRect.Left();
             if( mnThumbPixRange > 0 )
             {
-                maPage1Rect.Left()      = maTrackRect.Left();
+                maPage1Rect.Left()      = aTrackRect.Left();
                 maPage1Rect.Bottom()    =
                 maPage2Rect.Bottom()    =
-                maThumbRect.Bottom()    = maTrackRect.Bottom();
+                maThumbRect.Bottom()    = aTrackRect.Bottom();
             }
             else
             {
@@ -320,18 +320,18 @@ void ScrollBar::ImplCalc( bool bUpdate )
 
             if ( GetNativeControlRegion( CTRL_SCROLLBAR, PART_TRACK_VERT_AREA,
                      aControlRegion, ControlState::NONE, ImplControlValue(), OUString(), aBoundingRegion, aTrackRegion ) )
-                maTrackRect = aTrackRegion;
+                aTrackRect = aTrackRegion;
             else
-                maTrackRect = Rectangle( maBtn1Rect.BottomLeft()+Point(0,1), maBtn2Rect.TopRight() );
+                aTrackRect = Rectangle( maBtn1Rect.BottomLeft()+Point(0,1), maBtn2Rect.TopRight() );
 
             // Check if available space is big enough for thumb
-            mnThumbPixRange = maTrackRect.Bottom() - maTrackRect.Top();
+            mnThumbPixRange = aTrackRect.Bottom() - aTrackRect.Top();
             if( mnThumbPixRange > 0 )
             {
-                maPage1Rect.Top()       = maTrackRect.Top();
+                maPage1Rect.Top()       = aTrackRect.Top();
                 maPage1Rect.Right()     =
                 maPage2Rect.Right()     =
-                maThumbRect.Right()     = maTrackRect.Right();
+                maThumbRect.Right()     = aTrackRect.Right();
             }
             else
             {
diff --git a/vcl/source/gdi/regionband.cxx b/vcl/source/gdi/regionband.cxx
index 759c0121a62d..44663759e217 100644
--- a/vcl/source/gdi/regionband.cxx
+++ b/vcl/source/gdi/regionband.cxx
@@ -1233,25 +1233,25 @@ void RegionBand::GetRegionRectangles(RectangleVector& rTarget) const
 {
     // clear result vector
     rTarget.clear();
-    ImplRegionBand* mpCurrRectBand = mpFirstBand;
+    ImplRegionBand* pCurrRectBand = mpFirstBand;
     Rectangle aRectangle;
 
-    while(mpCurrRectBand)
+    while(pCurrRectBand)
     {
-        ImplRegionBandSep* mpCurrRectBandSep = mpCurrRectBand->mpFirstSep;
+        ImplRegionBandSep* pCurrRectBandSep = pCurrRectBand->mpFirstSep;
 
-        aRectangle.Top() = mpCurrRectBand->mnYTop;
-        aRectangle.Bottom() = mpCurrRectBand->mnYBottom;
+        aRectangle.Top() = pCurrRectBand->mnYTop;
+        aRectangle.Bottom() = pCurrRectBand->mnYBottom;
 
-        while(mpCurrRectBandSep)
+        while(pCurrRectBandSep)
         {
-            aRectangle.Left() = mpCurrRectBandSep->mnXLeft;
-            aRectangle.Right() = mpCurrRectBandSep->mnXRight;
+            aRectangle.Left() = pCurrRectBandSep->mnXLeft;
+            aRectangle.Right() = pCurrRectBandSep->mnXRight;
             rTarget.push_back(aRectangle);
-            mpCurrRectBandSep = mpCurrRectBandSep->mpNextSep;
+            pCurrRectBandSep = pCurrRectBandSep->mpNextSep;
         }
 
-        mpCurrRectBand = mpCurrRectBand->mpNextBand;
+        pCurrRectBand = pCurrRectBand->mpNextBand;
     }
 }
 
diff --git a/vcl/source/window/decoview.cxx b/vcl/source/window/decoview.cxx
index 0d43be98f19e..4e75b536c608 100644
--- a/vcl/source/window/decoview.cxx
+++ b/vcl/source/window/decoview.cxx
@@ -955,11 +955,11 @@ Rectangle DecorationView::DrawFrame( const Rectangle& rRect, DrawFrameStyle nSty
              ImplDrawFrame( mpOutDev, aRect, mpOutDev->GetSettings().GetStyleSettings(), nStyle, nFlags );
         else
         {
-             Color maOldLineColor  = mpOutDev->GetLineColor();
-             Color maOldFillColor  = mpOutDev->GetFillColor();
+             Color aOldLineColor  = mpOutDev->GetLineColor();
+             Color aOldFillColor  = mpOutDev->GetFillColor();
              ImplDrawFrame( mpOutDev, aRect, mpOutDev->GetSettings().GetStyleSettings(), nStyle, nFlags );
-             mpOutDev->SetLineColor( maOldLineColor );
-             mpOutDev->SetFillColor( maOldFillColor );
+             mpOutDev->SetLineColor( aOldLineColor );
+             mpOutDev->SetFillColor( aOldFillColor );
         }
     }
 
@@ -988,11 +988,11 @@ Rectangle DecorationView::DrawButton( const Rectangle& rRect, DrawButtonFlags nS
         mpOutDev->EnableMapMode( false );
     }
 
-    const Color maOldLineColor = mpOutDev->GetLineColor();
-    const Color maOldFillColor = mpOutDev->GetFillColor();
+    const Color aOldLineColor = mpOutDev->GetLineColor();
+    const Color aOldFillColor = mpOutDev->GetFillColor();
     ImplDrawButton( mpOutDev, aRect, nStyle );
-    mpOutDev->SetLineColor( maOldLineColor );
-    mpOutDev->SetFillColor( maOldFillColor );
+    mpOutDev->SetLineColor( aOldLineColor );
+    mpOutDev->SetFillColor( aOldFillColor );
 
     // keep border free, although it is used at default representation
     ++aRect.Left();
diff --git a/vcl/source/window/menuitemlist.cxx b/vcl/source/window/menuitemlist.cxx
index d1042b4fb30b..5f73bc5b9615 100644
--- a/vcl/source/window/menuitemlist.cxx
+++ b/vcl/source/window/menuitemlist.cxx
@@ -198,13 +198,13 @@ MenuItemData* MenuItemList::SearchItem(
                 sal_Int32 n = pData->aText.indexOf('~');
                 if ( n != -1 )
                 {
-                    KeyCode mnKeyCode;
-                    sal_Unicode mnUnicode = pData->aText[n+1];
+                    KeyCode nKeyCode;
+                    sal_Unicode nUnicode = pData->aText[n+1];
                     vcl::Window* pDefWindow = ImplGetDefaultWindow();
                     if(  (  pDefWindow
-                         && pDefWindow->ImplGetFrame()->MapUnicodeToKeyCode( mnUnicode,
-                             Application::GetSettings().GetUILanguageTag().getLanguageType(), mnKeyCode )
-                         && aKeyCode.GetCode() == mnKeyCode.GetCode()
+                         && pDefWindow->ImplGetFrame()->MapUnicodeToKeyCode( nUnicode,
+                             Application::GetSettings().GetUILanguageTag().getLanguageType(), nKeyCode )
+                         && aKeyCode.GetCode() == nKeyCode.GetCode()
                          )
                       || (  ascii
                          && rI18nHelper.MatchMnemonic( pData->aText, ascii )
@@ -258,14 +258,14 @@ size_t MenuItemList::GetItemCount( KeyCode aKeyCode ) const
             sal_Int32 n = pData->aText.indexOf('~');
             if (n != -1)
             {
-                KeyCode mnKeyCode;
+                KeyCode nKeyCode;
                 // if MapUnicodeToKeyCode fails or is unsupported we try the pure ascii mapping of the keycodes
                 // so we have working shortcuts when ascii mnemonics are used
                 vcl::Window* pDefWindow = ImplGetDefaultWindow();
                 if(  (  pDefWindow
                      && pDefWindow->ImplGetFrame()->MapUnicodeToKeyCode( pData->aText[n+1],
-                         Application::GetSettings().GetUILanguageTag().getLanguageType(), mnKeyCode )
-                     && aKeyCode.GetCode() == mnKeyCode.GetCode()
+                         Application::GetSettings().GetUILanguageTag().getLanguageType(), nKeyCode )
+                     && aKeyCode.GetCode() == nKeyCode.GetCode()
                      )
                   || (  ascii
                      && rI18nHelper.MatchMnemonic( pData->aText, ascii )
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 34c722f3c51f..09d35239204f 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -956,7 +956,7 @@ sal_uInt16 ToolBox::ImplTestLineSize( ToolBox* pThis, const Point& rPos )
 
 void ToolBox::ImplLineSizing( ToolBox* pThis, const Point& rPos, Rectangle& rRect, sal_uInt16 nLineMode )
 {
-    bool    mbHorz;
+    bool    bHorz;
     long    nOneLineSize;
     long    nCurSize;
     long    nMaxSize;
@@ -966,34 +966,34 @@ void ToolBox::ImplLineSizing( ToolBox* pThis, const Point& rPos, Rectangle& rRec
     if ( nLineMode & DOCK_LINERIGHT )
     {
         nCurSize = rPos.X() - rRect.Left();
-        mbHorz = false;
+        bHorz = false;
     }
     else if ( nLineMode & DOCK_LINEBOTTOM )
     {
         nCurSize = rPos.Y() - rRect.Top();
-        mbHorz = true;
+        bHorz = true;
     }
     else if ( nLineMode & DOCK_LINELEFT )
     {
         nCurSize = rRect.Right() - rPos.X();
-        mbHorz = false;
+        bHorz = false;
     }
     else if ( nLineMode & DOCK_LINETOP )
     {
         nCurSize = rRect.Bottom() - rPos.Y();
-        mbHorz = true;
+        bHorz = true;
     }
     else {
         OSL_FAIL( "ImplLineSizing: Trailing else" );
         nCurSize = 0;
-        mbHorz = false;
+        bHorz = false;
     }
 
     Size    aWinSize = pThis->GetSizePixel();
     sal_uInt16  nMaxLines = (pThis->mnLines > pThis->mnCurLines) ? pThis->mnLines : pThis->mnCurLines;
     if ( nMaxLines > TB_MAXLINES )
         nMaxLines = TB_MAXLINES;
-    if ( mbHorz )
+    if ( bHorz )
     {
         nOneLineSize = ImplCalcSize( pThis, 1 ).Height();
         nMaxSize = pThis->maOutDockRect.GetHeight() - 20;
@@ -1018,7 +1018,7 @@ void ToolBox::ImplLineSizing( ToolBox* pThis, const Point& rPos, Rectangle& rRec
         {
             i++;
             aSize = ImplCalcSize( pThis, i );
-            if ( mbHorz )
+            if ( bHorz )
                 nSize = aSize.Height();
             else
                 nSize = aSize.Width();
@@ -1026,7 +1026,7 @@ void ToolBox::ImplLineSizing( ToolBox* pThis, const Point& rPos, Rectangle& rRec
             {
                 i--;
                 aSize = ImplCalcSize( pThis, i );
-                if ( mbHorz )
+                if ( bHorz )
                     nSize = aSize.Height();
                 else
                     nSize = aSize.Width();
@@ -4584,7 +4584,7 @@ void ToolBox::ToggleFloatingMode()
     if (!mpData)
         return;
 
-    bool mbOldHorz = mbHorz;
+    bool bOldHorz = mbHorz;
 
     if ( ImplIsFloatingMode() )
     {
@@ -4592,7 +4592,7 @@ void ToolBox::ToggleFloatingMode()
         meAlign  = WindowAlign::Top;
         mbScroll = true;
 
-        if( mbOldHorz != mbHorz )
+        if( bOldHorz != mbHorz )
             mbCalc = true;  // orientation was changed !
 
         ImplSetMinMaxFloatSize( this );
@@ -4610,7 +4610,7 @@ void ToolBox::ToggleFloatingMode()
         ImplGetFrameWindow()->GetWindow( GetWindowType::Client )->GrabFocus();
     }
 
-    if( mbOldHorz != mbHorz )
+    if( bOldHorz != mbHorz )
     {
         // if orientation changes, the toolbox has to be initialized again
         // to update the direction of the gradient
diff --git a/vcl/unx/generic/app/i18n_cb.cxx b/vcl/unx/generic/app/i18n_cb.cxx
index fe0207aff528..7fea53241df1 100644
--- a/vcl/unx/generic/app/i18n_cb.cxx
+++ b/vcl/unx/generic/app/i18n_cb.cxx
@@ -385,15 +385,15 @@ GetPreeditSpotLocation(XIC ic, XPointer client_data)
 
     // Send SalEventExtTextInputPos event to get spotlocation
 
-    SalExtTextInputPosEvent mPosEvent;
+    SalExtTextInputPosEvent aPosEvent;
     preedit_data_t* pPreeditData = reinterpret_cast<preedit_data_t*>(client_data);
 
     if( pPreeditData->pFrame )
-        pPreeditData->pFrame->CallCallback(SALEVENT_EXTTEXTINPUTPOS, static_cast<void*>(&mPosEvent));
+        pPreeditData->pFrame->CallCallback(SALEVENT_EXTTEXTINPUTPOS, static_cast<void*>(&aPosEvent));
 
     XPoint point;
-    point.x = mPosEvent.mnX + mPosEvent.mnWidth;
-    point.y = mPosEvent.mnY + mPosEvent.mnHeight;
+    point.x = aPosEvent.mnX + aPosEvent.mnWidth;
+    point.y = aPosEvent.mnY + aPosEvent.mnHeight;
 
     XVaNestedList preedit_attr;
     preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &point, nullptr);
diff --git a/vcl/unx/generic/app/i18n_im.cxx b/vcl/unx/generic/app/i18n_im.cxx
index 7b88e3327a66..0f6672d6f6dd 100644
--- a/vcl/unx/generic/app/i18n_im.cxx
+++ b/vcl/unx/generic/app/i18n_im.cxx
@@ -387,20 +387,20 @@ SalI18N_InputMethod::FilterEvent( XEvent *pEvent, ::Window window    )
      * fix broken key release handling of some IMs
      */
     XKeyEvent*         pKeyEvent = &(pEvent->xkey);
-    static XKeyEventOp maLastKeyPress;
+    static XKeyEventOp s_aLastKeyPress;
 
     if (bFilterEvent)
     {
         if (pKeyEvent->type == KeyRelease)
-            bFilterEvent = !maLastKeyPress.match (*pKeyEvent);
-        maLastKeyPress.erase();
+            bFilterEvent = !s_aLastKeyPress.match (*pKeyEvent);
+        s_aLastKeyPress.erase();
     }
     else /* (!bFilterEvent) */
     {
         if (pKeyEvent->type == KeyPress)
-            maLastKeyPress = *pKeyEvent;
+            s_aLastKeyPress = *pKeyEvent;
         else
-            maLastKeyPress.erase();
+            s_aLastKeyPress.erase();
     }
 
     return bFilterEvent;
diff --git a/vcl/unx/generic/print/printerjob.cxx b/vcl/unx/generic/print/printerjob.cxx
index 9266c820a584..ca68522a93da 100644
--- a/vcl/unx/generic/print/printerjob.cxx
+++ b/vcl/unx/generic/print/printerjob.cxx
@@ -273,10 +273,10 @@ PrinterJob::~PrinterJob ()
 
 static void WriteLocalTimePS( osl::File *rFile )
 {
-    TimeValue m_start_time, tLocal;
+    TimeValue aStartTime, tLocal;
     oslDateTime date_time;
-    if (osl_getSystemTime( &m_start_time ) &&
-        osl_getLocalTimeFromSystemTime( &m_start_time, &tLocal ) &&
+    if (osl_getSystemTime( &aStartTime ) &&
+        osl_getLocalTimeFromSystemTime( &aStartTime, &tLocal ) &&
         osl_getDateTimeFromTimeValue( &tLocal, &date_time ))
     {
         char ar[ 256 ];
diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
index 9b77a41a6dba..1c95e32ba3dd 100644
--- a/vcl/workben/vcldemo.cxx
+++ b/vcl/workben/vcldemo.cxx
@@ -404,7 +404,7 @@ public:
             else
                 aText = aLatinText;
 
-            std::vector<OUString> maFontNames;
+            std::vector<OUString> aFontNames;
 
             sal_uInt32 nCols[] = {
                 COL_BLACK, COL_BLUE, COL_GREEN, COL_CYAN, COL_RED, COL_MAGENTA,
@@ -420,7 +420,7 @@ public:
             size_t nNumFontNames = SAL_N_ELEMENTS(pNames);
 
             for (size_t i = 0; i < nNumFontNames; i++)
-                maFontNames.push_back(OUString::createFromAscii(pNames[i]));
+                aFontNames.push_back(OUString::createFromAscii(pNames[i]));
 
             if (bClip && !bRotate)
             {
@@ -445,12 +445,12 @@ public:
                 {
                     // random font size to avoid buffering
                     nFontHeight = 1 + i * (0.9 + comphelper::rng::uniform_real_distribution(0.0, std::nextafter(0.1, DBL_MAX))) * (r.Top() - r.Bottom()) / nPrintNumCopies;
-                    nFontIndex = (i % maFontNames.size());
-                    nFontColorIndex=(i % maFontNames.size());
+                    nFontIndex = (i % aFontNames.size());
+                    nFontColorIndex=(i % aFontNames.size());
                 }
 
                 rDev.SetTextColor(Color(nCols[nFontColorIndex]));
-                vcl::Font aFont( maFontNames[nFontIndex], Size(0, nFontHeight ));
+                vcl::Font aFont( aFontNames[nFontIndex], Size(0, nFontHeight ));
 
                 if (bRotate)
                 {