new plugin stylepolice

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

Change-Id: Idacedf7145d09843e96a584237b385f7662eea10

9 files changed, 74 insertions, 74 deletions

diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
index 7b60554698e4..6b5861405254 100644
--- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
+++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
@@ -448,7 +448,7 @@ Image ColumnChartDialogController::getImage()
 }
 const tTemplateServiceChartTypeParameterMap& ColumnChartDialogController::getTemplateMap() const
 {
-    static tTemplateServiceChartTypeParameterMap m_aTemplateMap =
+    static tTemplateServiceChartTypeParameterMap s_aTemplateMap =
     tTemplateServiceChartTypeParameterMap
         ( "com.sun.star.chart2.template.Column" ,                         ChartTypeParameter(1,false,false,GlobalStackMode_NONE) )
         ( "com.sun.star.chart2.template.StackedColumn" ,                  ChartTypeParameter(2,false,false,GlobalStackMode_STACK_Y) )
@@ -458,7 +458,7 @@ const tTemplateServiceChartTypeParameterMap& ColumnChartDialogController::getTem
         ( "com.sun.star.chart2.template.PercentStackedThreeDColumnFlat" , ChartTypeParameter(3,false,true,GlobalStackMode_STACK_Y_PERCENT) )
         ( "com.sun.star.chart2.template.ThreeDColumnDeep" ,               ChartTypeParameter(4,false,true,GlobalStackMode_STACK_Z) )
         ;
-    return m_aTemplateMap;
+    return s_aTemplateMap;
 }
 void ColumnChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter )
 {
@@ -523,7 +523,7 @@ Image BarChartDialogController::getImage()
 }
 const tTemplateServiceChartTypeParameterMap& BarChartDialogController::getTemplateMap() const
 {
-    static tTemplateServiceChartTypeParameterMap m_aTemplateMap =
+    static tTemplateServiceChartTypeParameterMap s_aTemplateMap =
     tTemplateServiceChartTypeParameterMap
         ( "com.sun.star.chart2.template.Bar" ,                         ChartTypeParameter(1,false,false,GlobalStackMode_NONE) )
         ( "com.sun.star.chart2.template.StackedBar" ,                  ChartTypeParameter(2,false,false,GlobalStackMode_STACK_Y) )
@@ -533,7 +533,7 @@ const tTemplateServiceChartTypeParameterMap& BarChartDialogController::getTempla
         ( "com.sun.star.chart2.template.PercentStackedThreeDBarFlat" , ChartTypeParameter(3,false,true,GlobalStackMode_STACK_Y_PERCENT) )
         ( "com.sun.star.chart2.template.ThreeDBarDeep" ,               ChartTypeParameter(4,false,true,GlobalStackMode_STACK_Z) )
         ;
-    return m_aTemplateMap;
+    return s_aTemplateMap;
 }
 void BarChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter )
 {
@@ -597,7 +597,7 @@ Image PieChartDialogController::getImage()
 }
 const tTemplateServiceChartTypeParameterMap& PieChartDialogController::getTemplateMap() const
 {
-    static tTemplateServiceChartTypeParameterMap m_aTemplateMap =
+    static tTemplateServiceChartTypeParameterMap s_aTemplateMap =
     tTemplateServiceChartTypeParameterMap
     ( "com.sun.star.chart2.template.Pie" ,                    ChartTypeParameter(1,false,false) )
     ( "com.sun.star.chart2.template.PieAllExploded" ,         ChartTypeParameter(2,false,false) )
@@ -608,7 +608,7 @@ const tTemplateServiceChartTypeParameterMap& PieChartDialogController::getTempla
     ( "com.sun.star.chart2.template.ThreeDDonut" ,            ChartTypeParameter(3,false,true) )
     ( "com.sun.star.chart2.template.ThreeDDonutAllExploded" , ChartTypeParameter(4,false,true) )
     ;
-    return m_aTemplateMap;
+    return s_aTemplateMap;
 }
 void PieChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter )
 {
@@ -659,7 +659,7 @@ Image LineChartDialogController::getImage()
 }
 const tTemplateServiceChartTypeParameterMap& LineChartDialogController::getTemplateMap() const
 {
-    static tTemplateServiceChartTypeParameterMap m_aTemplateMap =
+    static tTemplateServiceChartTypeParameterMap s_aTemplateMap =
     tTemplateServiceChartTypeParameterMap
     ( "com.sun.star.chart2.template.Symbol" ,                     ChartTypeParameter(1,false,false,GlobalStackMode_NONE,true,false) )
     ( "com.sun.star.chart2.template.StackedSymbol" ,              ChartTypeParameter(1,false,false,GlobalStackMode_STACK_Y,true,false) )
@@ -674,7 +674,7 @@ const tTemplateServiceChartTypeParameterMap& LineChartDialogController::getTempl
     ( "com.sun.star.chart2.template.PercentStackedThreeDLine" ,   ChartTypeParameter(4,false,true,GlobalStackMode_STACK_Y_PERCENT,false,true) )
     ( "com.sun.star.chart2.template.ThreeDLineDeep" ,             ChartTypeParameter(4,false,true,GlobalStackMode_STACK_Z,false,true) )
     ;
-    return m_aTemplateMap;
+    return s_aTemplateMap;
 }
 void LineChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter )
 {
@@ -807,14 +807,14 @@ Image XYChartDialogController::getImage()
 }
 const tTemplateServiceChartTypeParameterMap& XYChartDialogController::getTemplateMap() const
 {
-    static tTemplateServiceChartTypeParameterMap m_aTemplateMap =
+    static tTemplateServiceChartTypeParameterMap s_aTemplateMap =
     tTemplateServiceChartTypeParameterMap
     ( "com.sun.star.chart2.template.ScatterSymbol" ,              ChartTypeParameter(1,true,false,GlobalStackMode_NONE,true,false) )
     ( "com.sun.star.chart2.template.ScatterLineSymbol" ,          ChartTypeParameter(2,true,false,GlobalStackMode_NONE,true,true) )
     ( "com.sun.star.chart2.template.ScatterLine" ,                ChartTypeParameter(3,true,false,GlobalStackMode_NONE,false,true) )
     ( "com.sun.star.chart2.template.ThreeDScatter" ,              ChartTypeParameter(4,true,true,GlobalStackMode_NONE,false,true) )
     ;
-    return m_aTemplateMap;
+    return s_aTemplateMap;
 }
 void XYChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter )
 {
@@ -910,7 +910,7 @@ bool AreaChartDialogController::shouldShow_3DLookControl() const
 }
 const tTemplateServiceChartTypeParameterMap& AreaChartDialogController::getTemplateMap() const
 {
-    static tTemplateServiceChartTypeParameterMap m_aTemplateMap =
+    static tTemplateServiceChartTypeParameterMap s_aTemplateMap =
     tTemplateServiceChartTypeParameterMap
     ( "com.sun.star.chart2.template.Area" ,                     ChartTypeParameter(1,false,false,GlobalStackMode_NONE) )
     ( "com.sun.star.chart2.template.ThreeDArea" ,               ChartTypeParameter(1,false,true,GlobalStackMode_STACK_Z) )
@@ -919,7 +919,7 @@ const tTemplateServiceChartTypeParameterMap& AreaChartDialogController::getTempl
     ( "com.sun.star.chart2.template.PercentStackedArea" ,       ChartTypeParameter(3,false,false,GlobalStackMode_STACK_Y_PERCENT) )
     ( "com.sun.star.chart2.template.PercentStackedThreeDArea" , ChartTypeParameter(3,false,true,GlobalStackMode_STACK_Y_PERCENT) )
     ;
-    return m_aTemplateMap;
+    return s_aTemplateMap;
 }
 void AreaChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter )
 {
@@ -992,7 +992,7 @@ bool NetChartDialogController::shouldShow_StackingControl() const
 }
 const tTemplateServiceChartTypeParameterMap& NetChartDialogController::getTemplateMap() const
 {
-    static tTemplateServiceChartTypeParameterMap m_aTemplateMap =
+    static tTemplateServiceChartTypeParameterMap s_aTemplateMap =
     tTemplateServiceChartTypeParameterMap
     //@todo need templates with symbols only
     ( "com.sun.star.chart2.template.NetSymbol" ,              ChartTypeParameter(1,false,false,GlobalStackMode_NONE,true,false) )
@@ -1011,7 +1011,7 @@ const tTemplateServiceChartTypeParameterMap& NetChartDialogController::getTempla
     ( "com.sun.star.chart2.template.StackedFilledNet" ,       ChartTypeParameter(4,false,false,GlobalStackMode_STACK_Y,false,false) )
     ( "com.sun.star.chart2.template.PercentStackedFilledNet" ,ChartTypeParameter(4,false,false,GlobalStackMode_STACK_Y_PERCENT,false,false) )
     ;
-    return m_aTemplateMap;
+    return s_aTemplateMap;
 }
 void NetChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter )
 {
@@ -1083,14 +1083,14 @@ Image StockChartDialogController::getImage()
 
 const tTemplateServiceChartTypeParameterMap& StockChartDialogController::getTemplateMap() const
 {
-    static tTemplateServiceChartTypeParameterMap m_aTemplateMap =
+    static tTemplateServiceChartTypeParameterMap s_aTemplateMap =
     tTemplateServiceChartTypeParameterMap
     ( "com.sun.star.chart2.template.StockLowHighClose" ,          ChartTypeParameter(1) )
     ( "com.sun.star.chart2.template.StockOpenLowHighClose" ,      ChartTypeParameter(2) )
     ( "com.sun.star.chart2.template.StockVolumeLowHighClose" ,    ChartTypeParameter(3) )
     ( "com.sun.star.chart2.template.StockVolumeOpenLowHighClose" ,ChartTypeParameter(4) )
     ;
-    return m_aTemplateMap;
+    return s_aTemplateMap;
 }
 
 void StockChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& /*rParameter*/ )
@@ -1132,12 +1132,12 @@ Image CombiColumnLineChartDialogController::getImage( )
 
 const tTemplateServiceChartTypeParameterMap& CombiColumnLineChartDialogController::getTemplateMap() const
 {
-    static tTemplateServiceChartTypeParameterMap m_aTemplateMap =
+    static tTemplateServiceChartTypeParameterMap s_aTemplateMap =
     tTemplateServiceChartTypeParameterMap
     ( "com.sun.star.chart2.template.ColumnWithLine" ,             ChartTypeParameter(1) )
     ( "com.sun.star.chart2.template.StackedColumnWithLine" ,      ChartTypeParameter(2,false,false,GlobalStackMode_STACK_Y) )
     ;
-    return m_aTemplateMap;
+    return s_aTemplateMap;
 }
 
 void CombiColumnLineChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& /*rParameter*/ )
@@ -1263,10 +1263,10 @@ Image BubbleChartDialogController::getImage()
 }
 const tTemplateServiceChartTypeParameterMap& BubbleChartDialogController::getTemplateMap() const
 {
-    static tTemplateServiceChartTypeParameterMap m_aTemplateMap =
+    static tTemplateServiceChartTypeParameterMap s_aTemplateMap =
     tTemplateServiceChartTypeParameterMap
         ( "com.sun.star.chart2.template.Bubble" ,          ChartTypeParameter(1,true) ) ;
-    return m_aTemplateMap;
+    return s_aTemplateMap;
 }
 void BubbleChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& /*rParameter*/ )
 {
diff --git a/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx b/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx
index 4663b70382d3..2a6e4097cf9c 100644
--- a/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx
+++ b/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx
@@ -101,11 +101,11 @@ XBitmapListRef   ViewElementListProvider::GetBitmapList() const
 //create chartspecific symbols for linecharts
 SdrObjList* ViewElementListProvider::GetSymbolList() const
 {
-    SdrObjList* m_pSymbolList = nullptr;
-    uno::Reference< drawing::XShapes > m_xSymbols(nullptr);//@todo this keeps the first drawinglayer alive ...
+    SdrObjList* pSymbolList = nullptr;
+    uno::Reference< drawing::XShapes > xSymbols(nullptr);//@todo this keeps the first drawinglayer alive ...
     try
     {
-        if(!m_pSymbolList || !m_pSymbolList->GetObjCount())
+        if(!pSymbolList || !pSymbolList->GetObjCount())
         {
             //@todo use mutex
 
@@ -117,18 +117,18 @@ SdrObjList* ViewElementListProvider::GetSymbolList() const
 
             //create symbols via uno and convert to native sdr objects
             drawing::Direction3D aSymbolSize(220,220,0); // should be 250, but 250 -> 280 ??
-            m_xSymbols =  DataPointSymbolSupplier::create2DSymbolList( xShapeFactory, xTarget, aSymbolSize );
+            xSymbols =  DataPointSymbolSupplier::create2DSymbolList( xShapeFactory, xTarget, aSymbolSize );
 
-            SdrObject* pSdrObject = DrawViewWrapper::getSdrObject( uno::Reference< drawing::XShape >( m_xSymbols, uno::UNO_QUERY ) );
+            SdrObject* pSdrObject = DrawViewWrapper::getSdrObject( uno::Reference< drawing::XShape >( xSymbols, uno::UNO_QUERY ) );
             if(pSdrObject)
-                m_pSymbolList = pSdrObject->GetSubList();
+                pSymbolList = pSdrObject->GetSubList();
         }
     }
     catch( const uno::Exception& e )
     {
         ASSERT_EXCEPTION( e );
     }
-    return m_pSymbolList;
+    return pSymbolList;
 }
 
 Graphic ViewElementListProvider::GetSymbolGraphic( sal_Int32 nStandardSymbol, const SfxItemSet* pSymbolShapeProperties ) const
diff --git a/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx b/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx
index 52451c938d2b..48ecfda6250e 100644
--- a/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx
@@ -101,19 +101,19 @@ SeriesOptionsItemConverter::SeriesOptionsItemConverter(
 
             sal_Int32 nAxisIndex = DataSeriesHelper::getAttachedAxisIndex(xDataSeries);
 
-            uno::Sequence< sal_Int32 > m_aBarPositionSequence;
+            uno::Sequence< sal_Int32 > aBarPositionSequence;
             uno::Reference< beans::XPropertySet > xChartTypeProps( xChartType, uno::UNO_QUERY );
             if( xChartTypeProps.is() )
             {
-                if( xChartTypeProps->getPropertyValue( "OverlapSequence" ) >>= m_aBarPositionSequence )
+                if( xChartTypeProps->getPropertyValue( "OverlapSequence" ) >>= aBarPositionSequence )
                 {
-                    if( nAxisIndex >= 0 && nAxisIndex < m_aBarPositionSequence.getLength() )
-                        m_nBarOverlap = m_aBarPositionSequence[nAxisIndex];
+                    if( nAxisIndex >= 0 && nAxisIndex < aBarPositionSequence.getLength() )
+                        m_nBarOverlap = aBarPositionSequence[nAxisIndex];
                 }
-                if( xChartTypeProps->getPropertyValue( "GapwidthSequence" ) >>= m_aBarPositionSequence )
+                if( xChartTypeProps->getPropertyValue( "GapwidthSequence" ) >>= aBarPositionSequence )
                 {
-                    if( nAxisIndex >= 0 && nAxisIndex < m_aBarPositionSequence.getLength() )
-                        m_nGapWidth = m_aBarPositionSequence[nAxisIndex];
+                    if( nAxisIndex >= 0 && nAxisIndex < aBarPositionSequence.getLength() )
+                        m_nGapWidth = aBarPositionSequence[nAxisIndex];
                 }
             }
         }
@@ -220,22 +220,22 @@ bool SeriesOptionsItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const Sf
                 if( xChartTypeProps.is() )
                 {
                     sal_Int32 nAxisIndex = DataSeriesHelper::getAttachedAxisIndex(xDataSeries);
-                    uno::Sequence< sal_Int32 > m_aBarPositionSequence;
+                    uno::Sequence< sal_Int32 > aBarPositionSequence;
                     if( xChartTypeProps.is() )
                     {
-                        if( xChartTypeProps->getPropertyValue( aPropName ) >>= m_aBarPositionSequence )
+                        if( xChartTypeProps->getPropertyValue( aPropName ) >>= aBarPositionSequence )
                         {
                             bool bGroupBarsPerAxis =  static_cast< const SfxBoolItem & >(rItemSet.Get( SCHATTR_GROUP_BARS_PER_AXIS )).GetValue();
                             if(!bGroupBarsPerAxis)
                             {
                                 //set the same value for all axes
-                                for( sal_Int32 nN = 0; nN < m_aBarPositionSequence.getLength(); nN++ )
-                                    m_aBarPositionSequence[nN] = rBarPosition;
+                                for( sal_Int32 nN = 0; nN < aBarPositionSequence.getLength(); nN++ )
+                                    aBarPositionSequence[nN] = rBarPosition;
                             }
-                            else if( nAxisIndex >= 0 && nAxisIndex < m_aBarPositionSequence.getLength() )
-                                m_aBarPositionSequence[nAxisIndex] = rBarPosition;
+                            else if( nAxisIndex >= 0 && nAxisIndex < aBarPositionSequence.getLength() )
+                                aBarPositionSequence[nAxisIndex] = rBarPosition;
 
-                            xChartTypeProps->setPropertyValue( aPropName, uno::makeAny(m_aBarPositionSequence) );
+                            xChartTypeProps->setPropertyValue( aPropName, uno::makeAny(aBarPositionSequence) );
                             bChanged = true;
                         }
                     }
diff --git a/chart2/source/controller/main/ChartController_Insert.cxx b/chart2/source/controller/main/ChartController_Insert.cxx
index 4b0102831fa5..3b00265b5957 100644
--- a/chart2/source/controller/main/ChartController_Insert.cxx
+++ b/chart2/source/controller/main/ChartController_Insert.cxx
@@ -108,11 +108,11 @@ void ChartController::executeDispatch_InsertAxes()
 
             InsertAxisOrGridDialogData aDialogOutput;
             aDlg->getResult( aDialogOutput );
-            std::unique_ptr< ReferenceSizeProvider > mpRefSizeProvider(
+            std::unique_ptr< ReferenceSizeProvider > pRefSizeProvider(
                 impl_createReferenceSizeProvider());
             bool bChanged = AxisHelper::changeVisibilityOfAxes( xDiagram
                 , aDialogInput.aExistenceList, aDialogOutput.aExistenceList, m_xCC
-                , mpRefSizeProvider.get() );
+                , pRefSizeProvider.get() );
             if( bChanged )
                 aUndoGuard.commit();
         }
diff --git a/chart2/source/tools/ObjectIdentifier.cxx b/chart2/source/tools/ObjectIdentifier.cxx
index 072e3a5c9aaf..198d49426f20 100644
--- a/chart2/source/tools/ObjectIdentifier.cxx
+++ b/chart2/source/tools/ObjectIdentifier.cxx
@@ -96,7 +96,7 @@ typedef ::comphelper::MakeMap< TitleHelper::eTitleType, OUString > tTitleMap;
 const tTitleMap& lcl_getTitleMap()
 {
     //maps the title type to the ParentParticle for that title
-    static tTitleMap m_aTitleMap = tTitleMap
+    static tTitleMap s_aTitleMap = tTitleMap
         ( TitleHelper::MAIN_TITLE, "" )
         ( TitleHelper::SUB_TITLE, "D=0" )
         ( TitleHelper::X_AXIS_TITLE, "D=0:CS=0:Axis=0,0" )
@@ -105,7 +105,7 @@ const tTitleMap& lcl_getTitleMap()
         ( TitleHelper::SECONDARY_X_AXIS_TITLE, "D=0:CS=0:Axis=0,1" )
         ( TitleHelper::SECONDARY_Y_AXIS_TITLE, "D=0:CS=0:Axis=1,1" )
         ;
-    return m_aTitleMap;
+    return s_aTitleMap;
 }
 
 OUString lcl_getTitleParentParticle( TitleHelper::eTitleType aTitleType )
diff --git a/chart2/source/tools/XMLRangeHelper.cxx b/chart2/source/tools/XMLRangeHelper.cxx
index 52db5ab2c7c4..3fade3573ece 100644
--- a/chart2/source/tools/XMLRangeHelper.cxx
+++ b/chart2/source/tools/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/chart2/source/view/charttypes/GL3DBarChart.cxx b/chart2/source/view/charttypes/GL3DBarChart.cxx
index 5339fcf5a5d1..424b502e276a 100644
--- a/chart2/source/view/charttypes/GL3DBarChart.cxx
+++ b/chart2/source/view/charttypes/GL3DBarChart.cxx
@@ -1103,8 +1103,8 @@ void GL3DBarChart::scroll(long nDelta)
         if ((maRenderEvent != EVENT_NONE) && (maRenderEvent != EVENT_SHOW_SCROLL) &&
             (maRenderEvent != EVENT_AUTO_FLY) && (maRenderEvent != EVENT_SHOW_SELECT))
             return;
-        glm::vec3 maDir = glm::normalize(maCameraPosition - maCameraDirection);
-        maCameraPosition -= ((float)nDelta/10) * maDir;
+        glm::vec3 aDir = glm::normalize(maCameraPosition - maCameraDirection);
+        maCameraPosition -= ((float)nDelta/10) * aDir;
         mpCamera->setPosition(maCameraPosition);
         if(mbBenchMarkMode)
         {
diff --git a/chart2/source/view/main/GL3DRenderer.cxx b/chart2/source/view/main/GL3DRenderer.cxx
index 1c2c635bd47a..1f6895977756 100644
--- a/chart2/source/view/main/GL3DRenderer.cxx
+++ b/chart2/source/view/main/GL3DRenderer.cxx
@@ -1006,13 +1006,13 @@ void OpenGL3DRenderer::RenderPolygon3D(const Polygon3DInfo& polygon)
             glUniform4fv(maPickingResources.m_2DColorID, 1, &polygon.id[0]);
         }
         CHECK_GL_ERROR();
-        GLint maVertexID = mbPickingMode ? maPickingResources.m_2DVertexID : maResources.m_3DVertexID;
+        GLint aVertexID = mbPickingMode ? maPickingResources.m_2DVertexID : maResources.m_3DVertexID;
         // 1rst attribute buffer : vertices
-        glEnableVertexAttribArray(maVertexID);
+        glEnableVertexAttribArray(aVertexID);
         CHECK_GL_ERROR();
         glBindBuffer(GL_ARRAY_BUFFER, m_VertexBuffer);
         CHECK_GL_ERROR();
-        glVertexAttribPointer(maVertexID, // attribute
+        glVertexAttribPointer(aVertexID, // attribute
                                 3,                  // size
                                 GL_FLOAT,           // type
                                 GL_FALSE,           // normalized?
@@ -1038,7 +1038,7 @@ void OpenGL3DRenderer::RenderPolygon3D(const Polygon3DInfo& polygon)
         CHECK_GL_ERROR();
         glDrawArrays(GL_POLYGON, 0, pointList->size());
         CHECK_GL_ERROR();
-        glDisableVertexAttribArray(maVertexID);
+        glDisableVertexAttribArray(aVertexID);
         CHECK_GL_ERROR();
         if(!mbPickingMode)
             glDisableVertexAttribArray(maResources.m_3DNormalID);
diff --git a/chart2/source/view/main/PropertyMapper.cxx b/chart2/source/view/main/PropertyMapper.cxx
index 828dbe9d3cbe..73ee2b964bea 100644
--- a/chart2/source/view/main/PropertyMapper.cxx
+++ b/chart2/source/view/main/PropertyMapper.cxx
@@ -187,7 +187,7 @@ uno::Any* PropertyMapper::getValuePointerForLimitedSpace( tAnySequence& rPropVal
 const tMakePropertyNameMap& PropertyMapper::getPropertyNameMapForCharacterProperties()
 {
     //shape property -- chart model object property
-    static tMakePropertyNameMap m_aShapePropertyMapForCharacterProperties =
+    static tMakePropertyNameMap s_aShapePropertyMapForCharacterProperties =
         tMakePropertyNameMap
         ( "CharColor",                "CharColor" )
         ( "CharContoured",            "CharContoured" )
@@ -237,13 +237,13 @@ const tMakePropertyNameMap& PropertyMapper::getPropertyNameMapForCharacterProper
 
         ( "ParaIsCharacterDistance",  "ParaIsCharacterDistance" )
         ;
-    return m_aShapePropertyMapForCharacterProperties;
+    return s_aShapePropertyMapForCharacterProperties;
 }
 
 const tMakePropertyNameMap& PropertyMapper::getPropertyNameMapForParagraphProperties()
 {
     //shape property -- chart model object property
-    static tMakePropertyNameMap m_aShapePropertyMapForParagraphProperties =
+    static tMakePropertyNameMap s_aShapePropertyMapForParagraphProperties =
         tMakePropertyNameMap
         ( "ParaAdjust",          "ParaAdjust" )
         ( "ParaBottomMargin",    "ParaBottomMargin" )
@@ -253,13 +253,13 @@ const tMakePropertyNameMap& PropertyMapper::getPropertyNameMapForParagraphProper
         ( "ParaRightMargin",     "ParaRightMargin" )
         ( "ParaTopMargin",       "ParaTopMargin" )
         ;
-    return m_aShapePropertyMapForParagraphProperties;
+    return s_aShapePropertyMapForParagraphProperties;
 }
 
 const tMakePropertyNameMap& PropertyMapper::getPropertyNameMapForFillProperties()
 {
     //shape property -- chart model object property
-    static tMakePropertyNameMap m_aShapePropertyMapForFillProperties =
+    static tMakePropertyNameMap s_aShapePropertyMapForFillProperties =
         tMakePropertyNameMap
         ( "FillBackground",               "FillBackground" )
         ( "FillBitmapName",               "FillBitmapName" )
@@ -281,13 +281,13 @@ const tMakePropertyNameMap& PropertyMapper::getPropertyNameMapForFillProperties(
         ( "FillBitmapPositionOffsetX",    "FillBitmapPositionOffsetX" )
         ( "FillBitmapPositionOffsetY",    "FillBitmapPositionOffsetY" )
         ;
-    return m_aShapePropertyMapForFillProperties;
+    return s_aShapePropertyMapForFillProperties;
 }
 
 const tMakePropertyNameMap& PropertyMapper::getPropertyNameMapForLineProperties()
 {
     //shape property -- chart model object property
-    static tMakePropertyNameMap m_aShapePropertyMapForLineProperties =
+    static tMakePropertyNameMap s_aShapePropertyMapForLineProperties =
         tMakePropertyNameMap
         ( "LineColor",              "LineColor" )
         ( "LineDashName",           "LineDashName" )
@@ -296,35 +296,35 @@ const tMakePropertyNameMap& PropertyMapper::getPropertyNameMapForLineProperties(
         ( "LineTransparence",       "LineTransparence" )
         ( "LineWidth",              "LineWidth" )
         ;
-    return m_aShapePropertyMapForLineProperties;
+    return s_aShapePropertyMapForLineProperties;
 }
 
 const tMakePropertyNameMap& PropertyMapper::getPropertyNameMapForFillAndLineProperties()
 {
-    static tMakePropertyNameMap m_aShapePropertyMapForFillAndLineProperties =
+    static tMakePropertyNameMap s_aShapePropertyMapForFillAndLineProperties =
         tMakePropertyNameMap
         ( PropertyMapper::getPropertyNameMapForFillProperties() )
         ( PropertyMapper::getPropertyNameMapForLineProperties() )
         ;
 
-    return m_aShapePropertyMapForFillAndLineProperties;
+    return s_aShapePropertyMapForFillAndLineProperties;
 }
 
 const tMakePropertyNameMap& PropertyMapper::getPropertyNameMapForTextShapeProperties()
 {
-    static tMakePropertyNameMap m_aShapePropertyMapForTextShapeProperties =
+    static tMakePropertyNameMap s_aShapePropertyMapForTextShapeProperties =
         tMakePropertyNameMap
         ( PropertyMapper::getPropertyNameMapForCharacterProperties() )
         ( PropertyMapper::getPropertyNameMapForFillProperties() )
         ( PropertyMapper::getPropertyNameMapForLineProperties() );
 
-    return m_aShapePropertyMapForTextShapeProperties;
+    return s_aShapePropertyMapForTextShapeProperties;
 }
 
 const tMakePropertyNameMap& PropertyMapper::getPropertyNameMapForLineSeriesProperties()
 {
     //shape property -- chart model object property
-    static tMakePropertyNameMap m_aShapePropertyMapForLineSeriesProperties =
+    static tMakePropertyNameMap s_aShapePropertyMapForLineSeriesProperties =
         tMakePropertyNameMap
         ( "LineColor",           "Color" )
         ( "LineDashName",        "LineDashName" )
@@ -333,7 +333,7 @@ const tMakePropertyNameMap& PropertyMapper::getPropertyNameMapForLineSeriesPrope
         ( "LineWidth",           "LineWidth" )
 
         ;
-    return m_aShapePropertyMapForLineSeriesProperties;
+    return s_aShapePropertyMapForLineSeriesProperties;
 }
 
 const tMakePropertyNameMap& PropertyMapper::getPropertyNameMapForTextLabelProperties()
@@ -352,7 +352,7 @@ const tMakePropertyNameMap& PropertyMapper::getPropertyNameMapForTextLabelProper
 const tMakePropertyNameMap& PropertyMapper::getPropertyNameMapForFilledSeriesProperties()
 {
     //shape property -- chart model object property
-    static tMakePropertyNameMap m_aShapePropertyMapForFilledSeriesProperties =
+    static tMakePropertyNameMap s_aShapePropertyMapForFilledSeriesProperties =
         tMakePropertyNameMap
         ( "FillBackground",               "FillBackground" )
         ( "FillBitmapName",               "FillBitmapName" )
@@ -380,7 +380,7 @@ const tMakePropertyNameMap& PropertyMapper::getPropertyNameMapForFilledSeriesPro
         ( "LineTransparence",             "BorderTransparency" )
         ( "LineWidth",                    "BorderWidth" )
         ;
-    return m_aShapePropertyMapForFilledSeriesProperties;
+    return s_aShapePropertyMapForFilledSeriesProperties;
 }
 
 void PropertyMapper::setMultiProperties(