accessibility/source/extended/accessibleiconchoicectrlentry.cxx | 6
accessibility/source/extended/accessiblelistboxentry.cxx | 6
accessibility/source/extended/textwindowaccessibility.cxx | 8 -
basic/source/basmgr/basmgr.cxx | 8 -
basic/source/classes/sb.cxx | 6
canvas/source/cairo/cairo_textlayout.cxx | 8 -
chart2/source/controller/dialogs/ChartTypeDialogController.cxx | 40
++---
chart2/source/controller/drawinglayer/ViewElementListProvider.cxx | 14 -
chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx | 28
+--
chart2/source/controller/main/ChartController_Insert.cxx | 4
chart2/source/tools/ObjectIdentifier.cxx | 4
chart2/source/tools/XMLRangeHelper.cxx | 14 -
chart2/source/view/charttypes/GL3DBarChart.cxx | 4
chart2/source/view/main/GL3DRenderer.cxx | 8 -
chart2/source/view/main/PropertyMapper.cxx | 32
++--
compilerplugins/clang/stylepolice.cxx | 80
++++++++++
connectivity/source/drivers/flat/ETable.cxx | 8 -
connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx | 48
+++---
cui/source/customize/cfg.cxx | 8 -
cui/source/dialogs/cuigaldlg.cxx | 24
+--
cui/source/options/optjava.cxx | 20
+-
desktop/source/deployment/dp_log.cxx | 6
desktop/source/deployment/registry/dp_registry.cxx | 4
desktop/source/splash/unxsplash.cxx | 4
drawinglayer/source/tools/converters.cxx | 24
+--
editeng/source/accessibility/AccessibleParaManager.cxx | 6
filter/source/graphicfilter/icgm/actimpr.cxx | 12 -
filter/source/msfilter/eschesdo.cxx | 12 -
filter/source/msfilter/msvbahelper.cxx | 10 -
filter/source/svg/svgreader.cxx | 6
filter/source/svg/svgwriter.cxx | 6
filter/source/t602/t602filter.cxx | 12 -
include/sfx2/doctempl.hxx | 4
io/source/TextInputStream/TextInputStream.cxx | 6
lingucomponent/source/spellcheck/spell/sspellimp.cxx | 22
+-
lotuswordpro/source/filter/lwpdoc.cxx | 14 -
lotuswordpro/source/filter/lwppagelayout.cxx | 26
+--
oox/source/drawingml/shape.cxx | 8 -
oox/source/drawingml/table/tablestylecellstylecontext.cxx | 6
reportdesign/source/filter/xml/xmlGroup.cxx | 4
sal/qa/osl/process/osl_Thread.cxx | 24
+--
sc/qa/extras/check_data_pilot_field.cxx | 4
sc/qa/extras/check_data_pilot_table.cxx | 4
sc/qa/extras/check_xcell_ranges_query.cxx | 10 -
sc/qa/unit/subsequent_export-test.cxx | 16
+-
sc/source/core/data/dpsave.cxx | 4
sc/source/filter/oox/workbookfragment.cxx | 8 -
sc/source/filter/xml/xmlexprt.cxx | 28
+--
sc/source/ui/Accessibility/AccessibleCellBase.cxx | 6
sc/source/ui/cctrl/checklistmenu.cxx | 6
sc/source/ui/condformat/condformatdlgentry.cxx | 4
sc/source/ui/miscdlgs/anyrefdg.cxx | 10 -
sc/source/ui/namedlg/namedlg.cxx | 4
sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx | 8 -
sc/source/ui/sidebar/CellBorderUpdater.cxx | 4
sc/source/ui/vba/vbaborders.cxx | 10 -
sc/source/ui/vba/vbachart.cxx | 18
+-
sc/source/ui/vba/vbawindows.cxx | 6
sc/source/ui/vba/vbaworksheets.cxx | 6
scripting/source/provider/BrowseNodeFactoryImpl.cxx | 12 -
sd/source/filter/eppt/pptx-epptooxml.cxx | 3
sd/source/filter/grf/sdgrffilter.cxx | 10 -
sd/source/filter/ppt/pptin.cxx | 4
sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx | 12 -
sd/source/ui/animations/CustomAnimationDialog.cxx | 14 -
sd/source/ui/annotations/annotationmanager.cxx | 12 -
sd/source/ui/framework/factories/BasicViewFactory.cxx | 10 -
sd/source/ui/func/undolayer.cxx | 12 -
sd/source/ui/slideshow/slideshowimpl.cxx | 8 -
sd/source/ui/unoidl/unomodel.cxx | 50
+++---
sd/source/ui/view/ViewShellBase.cxx | 4
sdext/source/minimizer/optimizerdialog.cxx | 6
sdext/source/presenter/PresenterSlideShowView.cxx | 12 -
sfx2/source/appl/imagemgr.cxx | 20
+-
sfx2/source/control/templateabstractview.cxx | 4
sfx2/source/dialog/dinfdlg.cxx | 28
+--
sfx2/source/dialog/dockwin.cxx | 12 -
sfx2/source/dialog/mgetempl.cxx | 4
sfx2/source/doc/doctempl.cxx | 24
+--
sfx2/source/doc/templatedlg.cxx | 6
sfx2/source/sidebar/SidebarController.cxx | 6
sfx2/source/sidebar/UnoPanel.cxx | 10 -
sfx2/source/sidebar/UnoSidebar.cxx | 6
sfx2/source/view/sfxbasecontroller.cxx | 8 -
slideshow/source/engine/shapes/viewappletshape.cxx | 8 -
svgio/source/svgreader/svgimagenode.cxx | 6
svgio/source/svgreader/svgstyleattributes.cxx | 14 -
svgio/source/svgreader/svgusenode.cxx | 10 -
svtools/source/control/headbar.cxx | 8 -
svx/source/dialog/dlgctrl.cxx | 12 -
svx/source/dialog/srchdlg.cxx | 6
svx/source/engine3d/obj3d.cxx | 32
++--
svx/source/sidebar/nbdtmg.cxx | 8 -
svx/source/unodraw/UnoNameItemTable.cxx | 6
svx/source/unodraw/unomtabl.cxx | 8 -
sw/source/core/access/accfrmobj.cxx | 6
sw/source/core/crsr/trvltbl.cxx | 4
sw/source/core/doc/docnew.cxx | 6
sw/source/core/edit/autofmt.cxx | 6
sw/source/core/layout/wsfrm.cxx | 12 -
sw/source/core/text/inftxt.cxx | 34
++--
sw/source/core/text/txtfrm.cxx | 4
sw/source/core/unocore/XMLRangeHelper.cxx | 14 -
sw/source/core/unocore/unocoll.cxx | 2
sw/source/core/unocore/unoframe.cxx | 6
sw/source/filter/ww8/wrtw8esh.cxx | 32
++--
sw/source/filter/ww8/ww8par.cxx | 18
+-
sw/source/ui/chrdlg/numpara.cxx | 4
sw/source/ui/misc/linenum.cxx | 4
sw/source/ui/vba/vbaaddins.cxx | 6
sw/source/ui/vba/vbavariables.cxx | 8 -
sw/source/uibase/uiview/viewport.cxx | 4
sw/source/uibase/utlui/content.cxx | 8 -
ucb/source/ucp/cmis/cmis_content.cxx | 20
+-
ucb/source/ucp/file/filglob.cxx | 4
ucb/source/ucp/file/filrset.cxx | 6
vbahelper/source/vbahelper/vbadocumentsbase.cxx | 6
vbahelper/source/vbahelper/vbashapes.cxx | 14 -
vcl/opengl/program.cxx | 10 -
vcl/source/app/help.cxx | 12 -
vcl/source/control/scrbar.cxx | 48
+++---
vcl/source/gdi/regionband.cxx | 20
+-
vcl/source/window/decoview.cxx | 16
+-
vcl/source/window/menuitemlist.cxx | 16
+-
vcl/source/window/toolbox.cxx | 24
+--
vcl/unx/generic/app/i18n_cb.cxx | 8 -
vcl/unx/generic/app/i18n_im.cxx | 10 -
vcl/unx/generic/print/printerjob.cxx | 6
vcl/workben/vcldemo.cxx | 10 -
xmloff/source/chart/SchXMLChartContext.cxx | 8 -
xmloff/source/core/xmlimp.cxx | 3
xmloff/source/draw/shapeexport.cxx | 6
xmloff/source/xforms/xformsapi.cxx | 10 -
133 files changed, 832 insertions(+), 768 deletions(-)
New commits:
commit 5abc669599001bf888b97c4d3c2715e1fb7523b9
Author: Noel Grandin <n...@peralex.com>
Date: Wed Apr 20 10:34:01 2016 +0200
new plugin stylepolice
check for local variables which follow our member field naming
convention, which is highly confusing
Change-Id: Idacedf7145d09843e96a584237b385f7662eea10
diff --git a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
index 11da75d..1a3c24c 100644
--- a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
+++ b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
@@ -138,11 +138,11 @@ throw(RuntimeException, std::exception)
bool AccessibleIconChoiceCtrlEntry::IsShowing_Impl() const
{
bool bShowing = false;
- Reference< XAccessibleContext > m_xParentContext =
+ Reference< XAccessibleContext > xParentContext =
m_xParent.is() ? m_xParent->getAccessibleContext() : Reference<
XAccessibleContext >();
- if( m_xParentContext.is() )
+ if( xParentContext.is() )
{
- Reference< XAccessibleComponent > xParentComp( m_xParentContext,
uno::UNO_QUERY );
+ Reference< XAccessibleComponent > xParentComp( xParentContext,
uno::UNO_QUERY );
if( xParentComp.is() )
bShowing = GetBoundingBox_Impl().IsOver( VCLRectangle(
xParentComp->getBounds() ) );
}
diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx
b/accessibility/source/extended/accessiblelistboxentry.cxx
index 7efc72e..9abe4c7 100644
--- a/accessibility/source/extended/accessiblelistboxentry.cxx
+++ b/accessibility/source/extended/accessiblelistboxentry.cxx
@@ -151,11 +151,11 @@ namespace accessibility
Reference< XAccessible > xParent = implGetParentAccessible( );
bool bShowing = false;
- Reference< XAccessibleContext > m_xParentContext =
+ Reference< XAccessibleContext > xParentContext =
xParent.is() ? xParent->getAccessibleContext() : Reference<
XAccessibleContext >();
- if( m_xParentContext.is() )
+ if( xParentContext.is() )
{
- Reference< XAccessibleComponent > xParentComp( m_xParentContext,
uno::UNO_QUERY );
+ Reference< XAccessibleComponent > xParentComp( xParentContext,
uno::UNO_QUERY );
if( xParentComp.is() )
bShowing = GetBoundingBox_Impl().IsOver( VCLRectangle(
xParentComp->getBounds() ) );
}
diff --git a/accessibility/source/extended/textwindowaccessibility.cxx
b/accessibility/source/extended/textwindowaccessibility.cxx
index 20b269f..33454e8 100644
--- a/accessibility/source/extended/textwindowaccessibility.cxx
+++ b/accessibility/source/extended/textwindowaccessibility.cxx
@@ -1664,8 +1664,8 @@ IMPL_LINK_TYPED(Document, WindowEventHandler,
::VclWindowEvent&, rEvent, void)
bool bEmpty = m_aFocused == m_aVisibleEnd && count == 1;
if ((m_aFocused >= m_aVisibleBegin && m_aFocused < m_aVisibleEnd)
|| bEmpty)
{
- Paragraphs::iterator m_aTemp = bEmpty ? m_aVisibleBegin :
m_aFocused;
- ::rtl::Reference< Paragraph >
xParagraph(getParagraph(m_aTemp));
+ Paragraphs::iterator aTemp = bEmpty ? m_aVisibleBegin :
m_aFocused;
+ ::rtl::Reference< Paragraph > xParagraph(getParagraph(aTemp));
if (xParagraph.is())
{
xParagraph->notifyEvent(
@@ -1701,8 +1701,8 @@ IMPL_LINK_TYPED(Document, WindowEventHandler,
::VclWindowEvent&, rEvent, void)
bool bEmpty = m_aFocused == m_aVisibleEnd && count == 1;
if ((m_aFocused >= m_aVisibleBegin && m_aFocused < m_aVisibleEnd)
|| bEmpty)
{
- Paragraphs::iterator m_aTemp = bEmpty ? m_aVisibleBegin :
m_aFocused;
- ::rtl::Reference< Paragraph >
xParagraph(getParagraph(m_aTemp));
+ Paragraphs::iterator aTemp = bEmpty ? m_aVisibleBegin :
m_aFocused;
+ ::rtl::Reference< Paragraph > xParagraph(getParagraph(aTemp));
if (xParagraph.is())
xParagraph->notifyEvent(
css::accessibility::AccessibleEventId::
diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index 65b836d..804230b 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -220,9 +220,9 @@ void BasMgrContainerListenerImpl::addLibraryModulesImpl(
BasicManager* pMgr,
uno::Reference< vba::XVBAModuleInfo > xVBAModuleInfo(
xLibNameAccess, uno::UNO_QUERY );
if ( xVBAModuleInfo.is() && xVBAModuleInfo->hasModuleInfo(
aModuleName ) )
{
- ModuleInfo mInfo = xVBAModuleInfo->getModuleInfo( aModuleName
);
+ ModuleInfo aInfo = xVBAModuleInfo->getModuleInfo( aModuleName
);
OSL_TRACE("#addLibraryModulesImpl - aMod");
- pLib->MakeModule( aModuleName, mInfo, aMod );
+ pLib->MakeModule( aModuleName, aInfo, aMod );
}
else
pLib->MakeModule( aModuleName, aMod );
@@ -279,8 +279,8 @@ void SAL_CALL BasMgrContainerListenerImpl::elementInserted(
const container::Con
uno::Reference< vba::XVBAModuleInfo > xVBAModuleInfo(
Event.Source, uno::UNO_QUERY );
if ( xVBAModuleInfo.is() && xVBAModuleInfo->hasModuleInfo(
aName ) )
{
- ModuleInfo mInfo = xVBAModuleInfo->getModuleInfo( aName );
- pLib->MakeModule( aName, mInfo, aMod );
+ ModuleInfo aInfo = xVBAModuleInfo->getModuleInfo( aName );
+ pLib->MakeModule( aName, aInfo, aMod );
}
else
pLib->MakeModule( aName, aMod );
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index 18cc990..db0acd9 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -1040,9 +1040,9 @@ void StarBASIC::implClearDependingVarsOnDelete(
StarBASIC* pDeletedBasic )
SbModule* StarBASIC::MakeModule( const OUString& rName, const OUString& rSrc )
{
- ModuleInfo mInfo;
- mInfo.ModuleType = ModuleType::NORMAL;
- return MakeModule( rName, mInfo, rSrc );
+ ModuleInfo aInfo;
+ aInfo.ModuleType = ModuleType::NORMAL;
+ return MakeModule( rName, aInfo, rSrc );
}
SbModule* StarBASIC::MakeModule( const OUString& rName, const ModuleInfo&
mInfo, const OUString& rSrc )
{
diff --git a/canvas/source/cairo/cairo_textlayout.cxx
b/canvas/source/cairo/cairo_textlayout.cxx
index 4b4b260..c787f02 100644
--- a/canvas/source/cairo/cairo_textlayout.cxx
+++ b/canvas/source/cairo/cairo_textlayout.cxx
@@ -462,11 +462,11 @@ namespace cairocanvas
cairo_set_font_options( pSCairo.get(), options);
// Font color
- Color mTextColor = rOutDev.GetTextColor();
+ Color aTextColor = rOutDev.GetTextColor();
cairo_set_source_rgb(pSCairo.get(),
- mTextColor.GetRed()/255.0,
- mTextColor.GetGreen()/255.0,
- mTextColor.GetBlue()/255.0);
+ aTextColor.GetRed()/255.0,
+ aTextColor.GetGreen()/255.0,
+ aTextColor.GetBlue()/255.0);
// Font rotation and scaling
cairo_matrix_t m;
diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
index 7b60554..6b58614 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 4663b70..2a6e409 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 52451c9..48ecfda 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 4b01028..3b00265 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 072e3a5..198d494 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 52db5ab..3fade35 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 5339fcf..424b502 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 1c2c635..1f68959 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 828dbe9..73ee2b9 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(
diff --git a/compilerplugins/clang/stylepolice.cxx
b/compilerplugins/clang/stylepolice.cxx
new file mode 100644
index 0000000..96b5f72
--- /dev/null
+++ b/compilerplugins/clang/stylepolice.cxx
@@ -0,0 +1,80 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include <regex>
+#include <string>
+#include <set>
+
+#include "compat.hxx"
+#include "plugin.hxx"
+
+// Check for some basic naming mismatches which make the code harder to read
+
+namespace {
+
+static const std::regex aMemberRegex("^m([abnprsx]?[A-Z]|[_][a-zA-Z])");
+
+class StylePolice :
+ public RecursiveASTVisitor<StylePolice>, public loplugin::Plugin
+{
+public:
+ explicit StylePolice(InstantiationData const & data): Plugin(data) {}
+
+ virtual void run() override {
TraverseDecl(compiler.getASTContext().getTranslationUnitDecl()); }
+
+ bool VisitVarDecl(const VarDecl *);
+private:
+ StringRef getFilename(SourceLocation loc);
+};
+
+StringRef StylePolice::getFilename(SourceLocation loc)
+{
+ SourceLocation spellingLocation =
compiler.getSourceManager().getSpellingLoc(loc);
+ StringRef name { compiler.getSourceManager().getFilename(spellingLocation)
};
+ return name;
+}
+
+bool StylePolice::VisitVarDecl(const VarDecl * varDecl)
+{
+ if (ignoreLocation(varDecl)) {
+ return true;
+ }
+ StringRef aFileName = getFilename(varDecl->getLocStart());
+ std::string name = varDecl->getName();
+
+ // these names appear to be taken from some scientific paper
+ if (aFileName == SRCDIR "/scaddins/source/analysis/bessel.cxx" ) {
+ return true;
+ }
+ // lots of places where we are storing a "method id" here
+ if (aFileName.startswith(SRCDIR "/connectivity/source/drivers/jdbc") &&
name.compare(0,3,"mID") == 0) {
+ return true;
+ }
+
+ if (!varDecl->isLocalVarDecl()) {
+ return true;
+ }
+
+ if (std::regex_search(name, aMemberRegex))
+ {
+ report(
+ DiagnosticsEngine::Warning,
+ "this local variable follows our member field naming convention,
which is confusing",
+ varDecl->getLocation())
+ << varDecl->getType() << varDecl->getSourceRange();
+ }
+ return true;
+}
+
+
+loplugin::Plugin::Registration< StylePolice > X("stylepolice");
+
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/flat/ETable.cxx
b/connectivity/source/drivers/flat/ETable.cxx
index 3cd005b..0626560 100644
--- a/connectivity/source/drivers/flat/ETable.cxx
+++ b/connectivity/source/drivers/flat/ETable.cxx
@@ -128,8 +128,8 @@ void OFlatTable::fillColumns(const
::com::sun::star::lang::Locale& _aLocale)
const sal_Unicode cThousandDelimiter = pConnection->getThousandDelimiter();
::comphelper::UStringMixEqual aCase(bCase);
vector<OUString> aColumnNames;
- vector<OUString> m_aTypeNames;
- m_aTypeNames.resize(nFieldCount);
+ vector<OUString> aTypeNames;
+ aTypeNames.resize(nFieldCount);
const sal_Int32 nMaxRowsToScan = pConnection->getMaxRowsToScan();
sal_Int32 nRowCount = 0;
@@ -156,7 +156,7 @@ void OFlatTable::fillColumns(const
::com::sun::star::lang::Locale& _aLocale)
if(bRead)
{
impl_fillColumnInfo_nothrow(m_aCurrentLine,
nStartPosFirstLine, nStartPosFirstLine2,
- m_aTypes[i], m_aPrecisions[i],
m_aScales[i], m_aTypeNames[i],
+ m_aTypes[i], m_aPrecisions[i],
m_aScales[i], aTypeNames[i],
cDecimalDelimiter,
cThousandDelimiter, aCharClass);
}
}
@@ -179,7 +179,7 @@ void OFlatTable::fillColumns(const
::com::sun::star::lang::Locale& _aLocale)
aFind =
connectivity::find(m_aColumns->get().begin(),m_aColumns->get().end(),aAlias,aCase);
}
- sdbcx::OColumn* pColumn = new
sdbcx::OColumn(aAlias,m_aTypeNames[i],OUString(),OUString(),
+ sdbcx::OColumn* pColumn = new
sdbcx::OColumn(aAlias,aTypeNames[i],OUString(),OUString(),
ColumnValue::NULLABLE,
m_aPrecisions[i],
m_aScales[i],
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx
b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx
index 0655e52..695564f 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx
@@ -65,15 +65,15 @@ namespace connectivity
sal_Int32 ProfileAccess::LoadXPToolkitProfiles(MozillaProductType
product)
{
sal_Int32 index=product;
- ProductStruct &m_Product = m_ProductProfileList[index];
+ ProductStruct &rProduct = m_ProductProfileList[index];
OUString regDir = getRegistryDir(product);
OUString profilesIni = regDir + "profiles.ini";
IniParser parser( profilesIni );
- IniSectionMap &mAllSection = parser.getAllSection();
+ IniSectionMap &rAllSection = parser.getAllSection();
- IniSectionMap::iterator iBegin = mAllSection.begin();
- IniSectionMap::const_iterator iEnd = mAllSection.end();
+ IniSectionMap::iterator iBegin = rAllSection.begin();
+ IniSectionMap::const_iterator iEnd = rAllSection.end();
for(;iBegin != iEnd;++iBegin)
{
ini_Section *aSection = &(*iBegin).second;
@@ -125,7 +125,7 @@ namespace connectivity
ProfileStruct* profileItem = new
ProfileStruct(product,profileName,
fullProfilePath
);
- m_Product.mProfileList[profileName] = profileItem;
+ rProduct.mProfileList[profileName] = profileItem;
sal_Int32 isDefault = 0;
if (!sIsDefault.isEmpty())
@@ -133,41 +133,41 @@ namespace connectivity
isDefault = sIsDefault.toInt32();
}
if (isDefault)
- m_Product.mCurrentProfileName = profileName;
+ rProduct.mCurrentProfileName = profileName;
}
}
- return static_cast< ::sal_Int32 >(m_Product.mProfileList.size());
+ return static_cast< ::sal_Int32 >(rProduct.mProfileList.size());
}
OUString ProfileAccess::getProfilePath(
::com::sun::star::mozilla::MozillaProductType product, const OUString&
profileName ) throw (::com::sun::star::uno::RuntimeException)
{
sal_Int32 index=product;
- ProductStruct &m_Product = m_ProductProfileList[index];
- if (m_Product.mProfileList.empty() ||
m_Product.mProfileList.find(profileName) == m_Product.mProfileList.end())
+ ProductStruct &rProduct = m_ProductProfileList[index];
+ if (rProduct.mProfileList.empty() ||
rProduct.mProfileList.find(profileName) == rProduct.mProfileList.end())
{
//Profile not found
return OUString();
}
else
- return m_Product.mProfileList[profileName]->getProfilePath();
+ return rProduct.mProfileList[profileName]->getProfilePath();
}
::sal_Int32 ProfileAccess::getProfileCount(
::com::sun::star::mozilla::MozillaProductType product) throw
(::com::sun::star::uno::RuntimeException)
{
sal_Int32 index=product;
- ProductStruct &m_Product = m_ProductProfileList[index];
- return static_cast< ::sal_Int32 >(m_Product.mProfileList.size());
+ ProductStruct &rProduct = m_ProductProfileList[index];
+ return static_cast< ::sal_Int32 >(rProduct.mProfileList.size());
}
::sal_Int32 ProfileAccess::getProfileList(
::com::sun::star::mozilla::MozillaProductType product,
::com::sun::star::uno::Sequence< OUString >& list ) throw
(::com::sun::star::uno::RuntimeException)
{
sal_Int32 index=product;
- ProductStruct &m_Product = m_ProductProfileList[index];
-
list.realloc(static_cast<sal_Int32>(m_Product.mProfileList.size()));
+ ProductStruct &rProduct = m_ProductProfileList[index];
+ list.realloc(static_cast<sal_Int32>(rProduct.mProfileList.size()));
sal_Int32 i=0;
- for(ProfileList::const_iterator
itor=m_Product.mProfileList.begin();
- itor != m_Product.mProfileList.end();
+ for(ProfileList::const_iterator itor=rProduct.mProfileList.begin();
+ itor != rProduct.mProfileList.end();
++itor)
{
ProfileStruct * aProfile = (*itor).second;
@@ -175,24 +175,24 @@ namespace connectivity
i++;
}
- return static_cast< ::sal_Int32 >(m_Product.mProfileList.size());
+ return static_cast< ::sal_Int32 >(rProduct.mProfileList.size());
}
OUString ProfileAccess::getDefaultProfile(
::com::sun::star::mozilla::MozillaProductType product ) throw
(::com::sun::star::uno::RuntimeException)
{
sal_Int32 index=product;
- ProductStruct &m_Product = m_ProductProfileList[index];
- if (!m_Product.mCurrentProfileName.isEmpty())
+ ProductStruct &rProduct = m_ProductProfileList[index];
+ if (!rProduct.mCurrentProfileName.isEmpty())
{
//default profile setted in mozilla registry
- return m_Product.mCurrentProfileName;
+ return rProduct.mCurrentProfileName;
}
- if (m_Product.mProfileList.empty())
+ if (rProduct.mProfileList.empty())
{
//there are not any profiles
return OUString();
}
- ProfileStruct * aProfile =
(*m_Product.mProfileList.begin()).second;
+ ProfileStruct * aProfile = (*rProduct.mProfileList.begin()).second;
return aProfile->getProfileName();
}
bool ProfileAccess::isProfileLocked(
::com::sun::star::mozilla::MozillaProductType product, const OUString&
profileName ) throw (::com::sun::star::uno::RuntimeException)
@@ -205,8 +205,8 @@ namespace connectivity
bool ProfileAccess::getProfileExists(
::com::sun::star::mozilla::MozillaProductType product, const OUString&
profileName ) throw (::com::sun::star::uno::RuntimeException)
{
sal_Int32 index=product;
- ProductStruct &m_Product = m_ProductProfileList[index];
- if (m_Product.mProfileList.empty() ||
m_Product.mProfileList.find(profileName) == m_Product.mProfileList.end())
+ ProductStruct &rProduct = m_ProductProfileList[index];
+ if (rProduct.mProfileList.empty() ||
rProduct.mProfileList.find(profileName) == rProduct.mProfileList.end())
{
return false;
}
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index c3c16d6..92f4761 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -5030,18 +5030,18 @@ SvxIconSelectorDialog::SvxIconSelectorDialog(
vcl::Window *pWindow,
m_xImportedImageManager = css::ui::ImageManager::create( xComponentContext
);
m_xImportedImageManager->initialize(aProp);
- ImageInfo mImageInfo;
+ ImageInfo aImageInfo1;
uno::Sequence< OUString > names;
if ( m_xImportedImageManager.is() )
{
names = m_xImportedImageManager->getAllImageNames( GetImageType() );
for ( sal_Int32 n = 0; n < names.getLength(); ++n )
- mImageInfo.insert( ImageInfo::value_type( names[n], false ));
+ aImageInfo1.insert( ImageInfo::value_type( names[n], false ));
}
sal_uInt16 nId = 1;
- ImageInfo::const_iterator pConstIter = mImageInfo.begin();
+ ImageInfo::const_iterator pConstIter = aImageInfo1.begin();
uno::Sequence< OUString > name( 1 );
- while ( pConstIter != mImageInfo.end() )
+ while ( pConstIter != aImageInfo1.end() )
{
name[ 0 ] = pConstIter->first;
uno::Sequence< uno::Reference< graphic::XGraphic> > graphics =
m_xImportedImageManager->getImages( GetImageType(), name );
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index 6175603..4a10d6f 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -365,14 +365,14 @@ IMPL_LINK_NOARG_TYPED(TakeProgress, CleanUpHdl, void*,
void)
if (maTakeThread.is())
maTakeThread->join();
- TPGalleryThemeProperties* mpBrowser =
static_cast<TPGalleryThemeProperties*>( GetParent() );
- ::std::vector<bool, std::allocator<bool> > aRemoveEntries(
mpBrowser->aFoundList.size(), false );
+ TPGalleryThemeProperties* pBrowser =
static_cast<TPGalleryThemeProperties*>( GetParent() );
+ ::std::vector<bool, std::allocator<bool> > aRemoveEntries(
pBrowser->aFoundList.size(), false );
::std::vector< OUString > aRemainingVector;
sal_uInt32 i, nCount;
GetParent()->EnterWait();
- mpBrowser->m_pLbxFound->SetUpdateMode( false );
- mpBrowser->m_pLbxFound->SetNoSelection();
+ pBrowser->m_pLbxFound->SetUpdateMode( false );
+ pBrowser->m_pLbxFound->SetNoSelection();
// mark all taken positions in aRemoveEntries
for( i = 0, nCount = maTakenList.size(); i < nCount; ++i )
@@ -382,29 +382,29 @@ IMPL_LINK_NOARG_TYPED(TakeProgress, CleanUpHdl, void*,
void)
// refill found list
for( i = 0, nCount = aRemoveEntries.size(); i < nCount; ++i )
if( !aRemoveEntries[ i ] )
- aRemainingVector.push_back( mpBrowser->aFoundList[i] );
+ aRemainingVector.push_back( pBrowser->aFoundList[i] );
- mpBrowser->aFoundList.clear();
+ pBrowser->aFoundList.clear();
for( i = 0, nCount = aRemainingVector.size(); i < nCount; ++i )
- mpBrowser->aFoundList.push_back( aRemainingVector[ i ] );
+ pBrowser->aFoundList.push_back( aRemainingVector[ i ] );
aRemainingVector.clear();
// refill list box
for( i = 0, nCount = aRemoveEntries.size(); i < nCount; ++i )
if( !aRemoveEntries[ i ] )
- aRemainingVector.push_back( mpBrowser->m_pLbxFound->GetEntry(
(sal_uInt16) i ) );
+ aRemainingVector.push_back( pBrowser->m_pLbxFound->GetEntry(
(sal_uInt16) i ) );
- mpBrowser->m_pLbxFound->Clear();
+ pBrowser->m_pLbxFound->Clear();
for( i = 0, nCount = aRemainingVector.size(); i < nCount; ++i )
- mpBrowser->m_pLbxFound->InsertEntry( aRemainingVector[ i ] );
+ pBrowser->m_pLbxFound->InsertEntry( aRemainingVector[ i ] );
aRemainingVector.clear();
- mpBrowser->m_pLbxFound->SetUpdateMode( true );
- mpBrowser->SelectFoundHdl( *mpBrowser->m_pLbxFound );
+ pBrowser->m_pLbxFound->SetUpdateMode( true );
+ pBrowser->SelectFoundHdl( *pBrowser->m_pLbxFound );
GetParent()->LeaveWait();
EndDialog( RET_OK );
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 14e750c..c995591 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -422,15 +422,15 @@ IMPL_LINK_TYPED( SvxJavaOptionsPage, DialogClosedHdl,
DialogClosedEvent*, pEvt,
IMPL_LINK_NOARG_TYPED( SvxJavaOptionsPage, ExpertConfigHdl_Impl, Button*, void
)
{
- ScopedVclPtrInstance< CuiAboutConfigTabPage > m_pExpertConfigDlg(this);
- m_pExpertConfigDlg->Reset();//initialize and reset function
+ ScopedVclPtrInstance< CuiAboutConfigTabPage > pExpertConfigDlg(this);
+ pExpertConfigDlg->Reset();//initialize and reset function
- if( RET_OK == m_pExpertConfigDlg->Execute() )
+ if( RET_OK == pExpertConfigDlg->Execute() )
{
- m_pExpertConfigDlg->FillItemSet();//save changes if there are any
+ pExpertConfigDlg->FillItemSet();//save changes if there are any
}
- m_pExpertConfigDlg.disposeAndClear();
+ pExpertConfigDlg.disposeAndClear();
}
@@ -890,14 +890,14 @@ void SvxJavaParameterDlg::EditParameter()
if ( nPos != LISTBOX_ENTRY_NOTFOUND )
{
- ScopedVclPtrInstance< InputDialog > m_pParamEditDlg( CUI_RES(
RID_SVXSTR_JAVA_START_PARAM ).toString(), this);
+ ScopedVclPtrInstance< InputDialog > pParamEditDlg( CUI_RES(
RID_SVXSTR_JAVA_START_PARAM ).toString(), this);
OUString editableClassPath = m_pAssignedList->GetSelectEntry();
- m_pParamEditDlg->SetEntryText( editableClassPath );
- m_pParamEditDlg->HideHelpBtn();
+ pParamEditDlg->SetEntryText( editableClassPath );
+ pParamEditDlg->HideHelpBtn();
- if(!m_pParamEditDlg->Execute())
+ if(!pParamEditDlg->Execute())
return;
- OUString editedClassPath = comphelper::string::strip(
m_pParamEditDlg->GetEntryText(), ' ');
+ OUString editedClassPath = comphelper::string::strip(
pParamEditDlg->GetEntryText(), ' ');
if ( !editedClassPath.isEmpty() && editableClassPath !=
editedClassPath )
{
diff --git a/desktop/source/deployment/dp_log.cxx
b/desktop/source/deployment/dp_log.cxx
index 4191403..a11b0d9 100644
--- a/desktop/source/deployment/dp_log.cxx
+++ b/desktop/source/deployment/dp_log.cxx
@@ -106,10 +106,10 @@ ProgressLogImpl::ProgressLogImpl(
// write log stamp
OStringBuffer buf;
buf.append( "###### Progress log entry " );
- 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[ 128 ];
diff --git a/desktop/source/deployment/registry/dp_registry.cxx
b/desktop/source/deployment/registry/dp_registry.cxx
index 8d02f77..0241947 100644
--- a/desktop/source/deployment/registry/dp_registry.cxx
+++ b/desktop/source/deployment/registry/dp_registry.cxx
@@ -201,10 +201,10 @@ void PackageRegistryImpl::insertBackend(
const OUString mediaType( normalizeMediaType(
xPackageType->getMediaType() ) );
- ::std::pair<t_string2registry::iterator, bool> mb_insertion(
+ ::std::pair<t_string2registry::iterator, bool> a_insertion(
m_mediaType2backend.insert( t_string2registry::value_type(
mediaType, xBackend ) ) );
- if (mb_insertion.second)
+ if (a_insertion.second)
{
// add parameterless media-type, too:
sal_Int32 semi = mediaType.indexOf( ';' );
diff --git a/desktop/source/splash/unxsplash.cxx
b/desktop/source/splash/unxsplash.cxx
index 7bc5f54..cd08acc 100644
--- a/desktop/source/splash/unxsplash.cxx
+++ b/desktop/source/splash/unxsplash.cxx
@@ -135,10 +135,10 @@ static uno::Reference< uno::XInterface > m_xINSTANCE;
uno::Reference< uno::XInterface > UnxSplash_createInstance(const
uno::Reference< uno::XComponentContext > & ) throw( uno::Exception )
{
- static osl::Mutex m_aMutex;
+ static osl::Mutex s_aMutex;
if ( !m_xINSTANCE.is() )
{
- osl::MutexGuard guard( m_aMutex );
+ osl::MutexGuard guard( s_aMutex );
if ( !m_xINSTANCE.is() )
m_xINSTANCE = static_cast<cppu::OWeakObject*>(new UnxSplashScreen);
}
diff --git a/drawinglayer/source/tools/converters.cxx
b/drawinglayer/source/tools/converters.cxx
index 635f37a..ac41e60 100644
--- a/drawinglayer/source/tools/converters.cxx
+++ b/drawinglayer/source/tools/converters.cxx
@@ -71,21 +71,21 @@ namespace drawinglayer
const Point aEmptyPoint;
const Size aSizePixel(nDiscreteWidth, nDiscreteHeight);
- ScopedVclPtrInstance< VirtualDevice > maContent;
+ ScopedVclPtrInstance< VirtualDevice > pContent;
// prepare vdev
- maContent->SetOutputSizePixel(aSizePixel, false);
- maContent->SetMapMode(aMapModePixel);
+ pContent->SetOutputSizePixel(aSizePixel, false);
+ pContent->SetMapMode(aMapModePixel);
// set to all white
- maContent->SetBackground(Wallpaper(Color(COL_WHITE)));
- maContent->Erase();
+ pContent->SetBackground(Wallpaper(Color(COL_WHITE)));
+ pContent->Erase();
// create pixel processor, also already takes care of AAing and
// checking the getOptionsDrawinglayer().IsAntiAliasing()
switch. If
// not wanted, change after this call as needed
processor2d::BaseProcessor2D* pContentProcessor =
processor2d::createPixelProcessor2DFromOutputDevice(
- *maContent.get(),
+ *pContent.get(),
rViewInformation2D);
if(pContentProcessor)
@@ -94,8 +94,8 @@ namespace drawinglayer
pContentProcessor->process(aSequence);
// get content
- maContent->EnableMapMode(false);
- const Bitmap aContent(maContent->GetBitmap(aEmptyPoint,
aSizePixel));
+ pContent->EnableMapMode(false);
+ const Bitmap aContent(pContent->GetBitmap(aEmptyPoint,
aSizePixel));
#ifdef DBG_UTIL
if(bDoSaveForVisualControl)
@@ -106,10 +106,10 @@ namespace drawinglayer
}
#endif
// prepare for mask creation
- maContent->SetMapMode(aMapModePixel);
+ pContent->SetMapMode(aMapModePixel);
// set alpha to all white (fully transparent)
- maContent->Erase();
+ pContent->Erase();
// embed primitives to paint them black
const primitive2d::Primitive2DReference xRef(
@@ -125,8 +125,8 @@ namespace drawinglayer
delete pContentProcessor;
// get alpha channel from vdev
- maContent->EnableMapMode(false);
- const Bitmap aAlpha(maContent->GetBitmap(aEmptyPoint,
aSizePixel));
+ pContent->EnableMapMode(false);
+ const Bitmap aAlpha(pContent->GetBitmap(aEmptyPoint,
aSizePixel));
#ifdef DBG_UTIL
if(bDoSaveForVisualControl)
{
diff --git a/editeng/source/accessibility/AccessibleParaManager.cxx
b/editeng/source/accessibility/AccessibleParaManager.cxx
index b2a031d..b3dd3d8 100644
--- a/editeng/source/accessibility/AccessibleParaManager.cxx
+++ b/editeng/source/accessibility/AccessibleParaManager.cxx
@@ -102,9 +102,9 @@ namespace accessibility
if( 0 <= nPara && maChildren.size() > static_cast<size_t>(nPara) )
{
- auto maChild( GetChild( nPara ).first.get() );
- if( maChild.is() )
- maChild->FireEvent( nEventId );
+ auto aChild( GetChild( nPara ).first.get() );
+ if( aChild.is() )
+ aChild->FireEvent( nEventId );
}
}
diff --git a/filter/source/graphicfilter/icgm/actimpr.cxx
b/filter/source/graphicfilter/icgm/actimpr.cxx
index 0fbfb40..3d05509 100644
--- a/filter/source/graphicfilter/icgm/actimpr.cxx
+++ b/filter/source/graphicfilter/icgm/actimpr.cxx
@@ -407,18 +407,18 @@ void CGMImpressOutAct::EndGroup()
mnGroupLevel--;
if ( mnGroupLevel < CGM_OUTACT_MAX_GROUP_LEVEL )
{
- sal_uInt32 mnFirstIndex = mpGroupLevel[ mnGroupLevel ];
- if ( mnFirstIndex == 0xffffffff )
- mnFirstIndex = 0;
- sal_uInt32 mnCurrentCount = maXShapes->getCount();
- if ( ( mnCurrentCount - mnFirstIndex ) > 1 )
+ sal_uInt32 nFirstIndex = mpGroupLevel[ mnGroupLevel ];
+ if ( nFirstIndex == 0xffffffff )
+ nFirstIndex = 0;
+ sal_uInt32 nCurrentCount = maXShapes->getCount();
+ if ( ( nCurrentCount - nFirstIndex ) > 1 )
{
uno::Reference< drawing::XShapeGrouper > aXShapeGrouper;
aXShapeGrouper.set( maXDrawPage, uno::UNO_QUERY );
if( aXShapeGrouper.is() )
{
uno::Reference< drawing::XShapes > aXShapes =
drawing::ShapeCollection::create(comphelper::getProcessComponentContext());
- for ( sal_uInt32 i = mnFirstIndex; i < mnCurrentCount; i++ )
+ for ( sal_uInt32 i = nFirstIndex; i < nCurrentCount; i++ )
{
uno::Reference< drawing::XShape > aXShape =
*static_cast<uno::Reference< drawing::XShape > const *>(maXShapes->getByIndex(
i ).getValue());
if (aXShape.is() )
diff --git a/filter/source/msfilter/eschesdo.cxx
b/filter/source/msfilter/eschesdo.cxx
index 7ba2f6a..1a3e62a 100644
--- a/filter/source/msfilter/eschesdo.cxx
+++ b/filter/source/msfilter/eschesdo.cxx
@@ -172,10 +172,10 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape(
ImplEESdrObject& rObj,
if( const SdrObject* pSdrObj = rObj.GetSdrObject() )
if (!pSdrObj->GetName().isEmpty())
aShapeName = pSdrObj->GetName();
- uno::Reference< drawing::XShape> mXShape(rObj.GetShapeRef(),
uno::UNO_QUERY);
- if (mXShape.is())
+ uno::Reference< drawing::XShape> xShape(rObj.GetShapeRef(),
uno::UNO_QUERY);
+ if (xShape.is())
{
- uno::Reference<beans::XPropertySet> xPropertySet(mXShape,
uno::UNO_QUERY);
+ uno::Reference<beans::XPropertySet> xPropertySet(xShape,
uno::UNO_QUERY);
if (xPropertySet.is())
{
uno::Sequence<beans::PropertyValue> aGrabBag;
@@ -1082,11 +1082,11 @@ basegfx::B2DRange getUnrotatedGroupBoundRange(const
Reference< XShape >& rxShape
else
{
// iT#s a xShape, get its transformation
- const Reference< XPropertySet > mXPropSet(rxShape, UNO_QUERY);
+ const Reference< XPropertySet > xPropSet(rxShape, UNO_QUERY);
- if(mXPropSet.is())
+ if(xPropSet.is())
{
- const Any aAny =
mXPropSet->getPropertyValue("Transformation");
+ const Any aAny =
xPropSet->getPropertyValue("Transformation");
if(aAny.hasValue())
{
diff --git a/filter/source/msfilter/msvbahelper.cxx
b/filter/source/msfilter/msvbahelper.cxx
index 744fdc2..c43638a 100644
--- a/filter/source/msfilter/msvbahelper.cxx
+++ b/filter/source/msfilter/msvbahelper.cxx
@@ -692,12 +692,12 @@ KeyCodeEntry aMSKeyCodesData[] = {
awt::KeyEvent parseKeyEvent( const OUString& Key ) throw (
uno::RuntimeException )
{
- static MSKeyCodeMap msKeyCodes;
- if ( msKeyCodes.empty() )
+ static MSKeyCodeMap s_KeyCodes;
+ if ( s_KeyCodes.empty() )
{
for ( unsigned int i = 0; i < SAL_N_ELEMENTS( aMSKeyCodesData ); ++i )
{
- msKeyCodes[ OUString::createFromAscii( aMSKeyCodesData[ i ].sName
) ] = aMSKeyCodesData[ i ].nCode;
+ s_KeyCodes[ OUString::createFromAscii( aMSKeyCodesData[ i ].sName
) ] = aMSKeyCodesData[ i ].nCode;
}
}
OUString sKeyCode;
@@ -731,8 +731,8 @@ awt::KeyEvent parseKeyEvent( const OUString& Key ) throw (
uno::RuntimeException
nVclKey |= parseChar( (char)( sKeyCode[ 0 ] ) );
else
{
- MSKeyCodeMap::iterator it = msKeyCodes.find( sKeyCode );
- if ( it == msKeyCodes.end() ) // unknown or unsupported
+ MSKeyCodeMap::iterator it = s_KeyCodes.find( sKeyCode );
+ if ( it == s_KeyCodes.end() ) // unknown or unsupported
throw uno::RuntimeException();
nVclKey |= it->second;
}
diff --git a/filter/source/svg/svgreader.cxx b/filter/source/svg/svgreader.cxx
index 33a8d33..fe2912c 100644
--- a/filter/source/svg/svgreader.cxx
+++ b/filter/source/svg/svgreader.cxx
@@ -2277,10 +2277,10 @@ bool SVGReader::parseAndConvert()
StatePool aStatePool;
StateMap aStateMap;
- std::vector< uno::Reference<xml::dom::XElement> > maUseElementVector;
+ std::vector< uno::Reference<xml::dom::XElement> > aUseElementVector;
annotateStyles(aStatePool,aStateMap,aInitialState,
- xDocElem,m_xDocumentHandler,maUseElementVector);
+ xDocElem,m_xDocumentHandler,aUseElementVector);
#ifdef DEBUG_FILTER_SVGREADER
dumpTree(xDocElem);
@@ -2321,7 +2321,7 @@ bool SVGReader::parseAndConvert()
aStateMap,
xDocElem,
m_xDocumentHandler,
- maUseElementVector);
+ aUseElementVector);
m_xDocumentHandler->endElement( "draw:page" );
m_xDocumentHandler->endElement( "office:drawing" );
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index 3730b53..48787bb 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -946,10 +946,10 @@ bool SVGTextWriter::nextParagraph()
if( xNumRules.is() && ( nListLevel <
xNumRules->getCount() ) )
{
bool bIsNumbered = true;
- OUString
msNumberingIsNumber("NumberingIsNumber");
- if( xPropSetInfo->hasPropertyByName(
msNumberingIsNumber ) )
+ OUString
sNumberingIsNumber("NumberingIsNumber");
+ if( xPropSetInfo->hasPropertyByName(
sNumberingIsNumber ) )
{
- if( !(xPropSet->getPropertyValue(
msNumberingIsNumber ) >>= bIsNumbered ) )
+ if( !(xPropSet->getPropertyValue(
sNumberingIsNumber ) >>= bIsNumbered ) )
{
OSL_FAIL( "numbered paragraph without
number info" );
bIsNumbered = false;
diff --git a/filter/source/t602/t602filter.cxx
b/filter/source/t602/t602filter.cxx
index cfb1f29..f30a9ed 100644
--- a/filter/source/t602/t602filter.cxx
+++ b/filter/source/t602/t602filter.cxx
@@ -119,7 +119,7 @@ namespace T602ImportFilter {
#define Start_(_nam) \
if (mxHandler.is()) \
{ \
- mxHandler->startElement(_nam, mAttrList); \
+ mxHandler->startElement(_nam, xAttrList); \
if (mpAttrList) \
mpAttrList->Clear(); \
}
@@ -218,7 +218,7 @@ void SAL_CALL T602ImportFilter::initialize( const Sequence<
Any >& aArguments )
void T602ImportFilter::inschr(unsigned char ch)
{
- Reference < XAttributeList > mAttrList ( mpAttrList );
+ Reference < XAttributeList > xAttrList ( mpAttrList );
if(!ini.showcomm&&pst.comment) return;
@@ -282,7 +282,7 @@ bool SAL_CALL T602ImportFilter::importImpl( const Sequence<
css::beans::Property
mpAttrList = new SvXMLAttributeList;
- Reference < XAttributeList > mAttrList ( mpAttrList );
+ Reference < XAttributeList > xAttrList ( mpAttrList );
mxHandler->startDocument();
@@ -527,7 +527,7 @@ void T602ImportFilter::inschrdef(unsigned char ch)
void T602ImportFilter::wrtfnt()
{
- Reference < XAttributeList > mAttrList ( mpAttrList );
+ Reference < XAttributeList > xAttrList ( mpAttrList );
const sal_Char *style = "P1";
switch(fst.nowfnt) {
@@ -575,7 +575,7 @@ unsigned char T602ImportFilter::Readchar602()
void T602ImportFilter::par602(bool endofpage)
{
sal_Int16 endp;
- Reference < XAttributeList > mAttrList ( mpAttrList );
+ Reference < XAttributeList > xAttrList ( mpAttrList );
if(!endofpage || !pst.waspar) {
if(ini.showcomm||!pst.comment) {
@@ -713,7 +713,7 @@ void T602ImportFilter::Read602()
unsigned char ch=0;
char cmd602[3] = {0};
- Reference < XAttributeList > mAttrList ( mpAttrList );
+ Reference < XAttributeList > xAttrList ( mpAttrList );
if (node==QUIT) return;
diff --git a/include/sfx2/doctempl.hxx b/include/sfx2/doctempl.hxx
index 66b1dce..70b3436 100644
--- a/include/sfx2/doctempl.hxx
+++ b/include/sfx2/doctempl.hxx
@@ -50,11 +50,11 @@ public:
void ReInitFromComponent();
sal_uInt16 GetRegionCount() const;
- const OUString& GetRegionName(sal_uInt16 nIdx) const;
//dv!
+ OUString GetRegionName(sal_uInt16 nIdx) const;
//dv!
OUString GetFullRegionName(sal_uInt16 nIdx) const;
sal_uInt16 GetCount(sal_uInt16 nRegion) const;
- const OUString& GetName(sal_uInt16 nRegion, sal_uInt16 nIdx) const;
//dv!
+ OUString GetName(sal_uInt16 nRegion, sal_uInt16 nIdx) const;
//dv!
OUString GetPath(sal_uInt16 nRegion, sal_uInt16 nIdx) const;
// Allows to retrieve the target template URL from the UCB
diff --git a/io/source/TextInputStream/TextInputStream.cxx
b/io/source/TextInputStream/TextInputStream.cxx
index a82bd4c..1852ed8 100644
--- a/io/source/TextInputStream/TextInputStream.cxx
+++ b/io/source/TextInputStream/TextInputStream.cxx
@@ -138,12 +138,12 @@ OTextInputStream::~OTextInputStream()
void OTextInputStream::implResizeBuffer()
{
- sal_Int32 mnNewBufferSize = mnBufferSize * 2;
- sal_Unicode* pNewBuffer = new sal_Unicode[ mnNewBufferSize ];
+ sal_Int32 nNewBufferSize = mnBufferSize * 2;
+ sal_Unicode* pNewBuffer = new sal_Unicode[ nNewBufferSize ];
memcpy( pNewBuffer, mpBuffer, mnCharsInBuffer * sizeof( sal_Unicode ) );
delete[] mpBuffer;
mpBuffer = pNewBuffer;
- mnBufferSize = mnNewBufferSize;
+ mnBufferSize = nNewBufferSize;
}
diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.cxx
b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
index 6fb33cf..69836bc 100644
--- a/lingucomponent/source/spellcheck/spell/sspellimp.cxx
+++ b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
@@ -356,22 +356,22 @@ sal_Int16 SpellChecker::GetSpellFailure( const OUString
&rWord, const Locale &rL
int rVal = pMS->spell(aWrd.getStr());
if (rVal != 1) {
if (extrachar && (eEnc != RTL_TEXTENCODING_UTF8)) {
- OUStringBuffer mBuf(nWord);
- n = mBuf.getLength();
+ OUStringBuffer aBuf(nWord);
+ n = aBuf.getLength();
for (sal_Int32 ix=n-1; ix >= 0; ix--)
{
- switch (mBuf[ix]) {
- case 0xFB00: mBuf.remove(ix, 1); mBuf.insert(ix,
"ff"); break;
- case 0xFB01: mBuf.remove(ix, 1); mBuf.insert(ix,
"fi"); break;
- case 0xFB02: mBuf.remove(ix, 1); mBuf.insert(ix,
"fl"); break;
- case 0xFB03: mBuf.remove(ix, 1); mBuf.insert(ix,
"ffi"); break;
- case 0xFB04: mBuf.remove(ix, 1); mBuf.insert(ix,
"ffl"); break;
+ switch (aBuf[ix]) {
+ case 0xFB00: aBuf.remove(ix, 1); aBuf.insert(ix,
"ff"); break;
+ case 0xFB01: aBuf.remove(ix, 1); aBuf.insert(ix,
"fi"); break;
+ case 0xFB02: aBuf.remove(ix, 1); aBuf.insert(ix,
"fl"); break;
+ case 0xFB03: aBuf.remove(ix, 1); aBuf.insert(ix,
"ffi"); break;
+ case 0xFB04: aBuf.remove(ix, 1); aBuf.insert(ix,
"ffl"); break;
case 0x200C:
- case 0x200D: mBuf.remove(ix, 1); break;
+ case 0x200D: aBuf.remove(ix, 1); break;
}
}
- OUString mWord(mBuf.makeStringAndClear());
- OString bWrd(OU2ENC(mWord, eEnc));
+ OUString aWord(aBuf.makeStringAndClear());
+ OString bWrd(OU2ENC(aWord, eEnc));
rVal = pMS->spell(bWrd.getStr());
if (rVal == 1) return -1;
}
diff --git a/lotuswordpro/source/filter/lwpdoc.cxx
b/lotuswordpro/source/filter/lwpdoc.cxx
index 9cc5f68..540f978 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*>
+ LwpDLVListHeadHolder* pBulletHead = dynamic_cast<LwpDLVListHeadHolder*>
(m_pFoundry->GetBulletManagerID().obj(VO_HEADHOLDER).get());
- if (!mBulletHead)
+ if (!pBulletHead)
return;
LwpSilverBullet* pBullet = dynamic_cast<LwpSilverBullet*>
- (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 d57eadc..3a0fd64 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<XFMasterPage*>(pXFStyleManager->AddStyle(mp1).m_pStyle);
- m_StyleName = mp1->GetStyleName();
+ XFMasterPage* p1 = new XFMasterPage();
+ p1->SetStyleName(GetName().str());
+ p1->SetPageMaster(pmname);
+ p1 = static_cast<XFMasterPage*>(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
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 5cb9e8c..29e4399 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -1221,8 +1221,8 @@ Reference < XShape > Shape::renderDiagramToGraphic(
XmlFilterBase& rFilterBase )
return xShape;
// Stream in which to place the rendered shape
- SvMemoryStream mpTempStream;
- Reference < io::XStream > xStream( new utl::OStreamWrapper(
mpTempStream ) );
+ SvMemoryStream pTempStream;
+ Reference < io::XStream > xStream( new utl::OStreamWrapper(
pTempStream ) );
Reference < io::XOutputStream > xOutputStream(
xStream->getOutputStream() );
// Rendering format
@@ -1258,11 +1258,11 @@ Reference < XShape > Shape::renderDiagramToGraphic(
XmlFilterBase& rFilterBase )
xGraphicExporter->setSourceDocument( xSourceDoc );
xGraphicExporter->filter( aDescriptor );
- mpTempStream.Seek( STREAM_SEEK_TO_BEGIN );
+ pTempStream.Seek( STREAM_SEEK_TO_BEGIN );
Graphic aGraphic;
GraphicFilter aFilter( false );
- if ( aFilter.ImportGraphic( aGraphic, "", mpTempStream,
GRFILTER_FORMAT_NOTFOUND, nullptr, GraphicFilterImportFlags::NONE, static_cast
< Sequence < PropertyValue >* > ( nullptr ) ) != GRFILTER_OK )
+ if ( aFilter.ImportGraphic( aGraphic, "", pTempStream,
GRFILTER_FORMAT_NOTFOUND, nullptr, GraphicFilterImportFlags::NONE, static_cast
< Sequence < PropertyValue >* > ( nullptr ) ) != GRFILTER_OK )
{
SAL_WARN( "oox.drawingml", OSL_THIS_FUNC
<< "Unable to import rendered stream into graphic
object" );
diff --git a/oox/source/drawingml/table/tablestylecellstylecontext.cxx
b/oox/source/drawingml/table/tablestylecellstylecontext.cxx
index ef9be24..6f6f235 100644
--- a/oox/source/drawingml/table/tablestylecellstylecontext.cxx
+++ b/oox/source/drawingml/table/tablestylecellstylecontext.cxx
@@ -66,9 +66,9 @@ TableStyleCellStyleContext::onCreateContext( ::sal_Int32
aElementToken, const At
if ( mnLineType != XML_none )
{
std::map < sal_Int32, ::oox::drawingml::LinePropertiesPtr
>& rLineBorders = mrTableStylePart.getLineBorders();
- ::oox::drawingml::LinePropertiesPtr mpLineProperties( new
oox::drawingml::LineProperties );
- rLineBorders[ mnLineType ] = mpLineProperties;
- return new LinePropertiesContext( *this, rAttribs,
*mpLineProperties );
+ ::oox::drawingml::LinePropertiesPtr pLineProperties( new
oox::drawingml::LineProperties );
+ rLineBorders[ mnLineType ] = pLineProperties;
+ return new LinePropertiesContext( *this, rAttribs,
*pLineProperties );
}
}
break;
diff --git a/reportdesign/source/filter/xml/xmlGroup.cxx
b/reportdesign/source/filter/xml/xmlGroup.cxx
index eb99c84..1a29e22 100644
--- a/reportdesign/source/filter/xml/xmlGroup.cxx
+++ b/reportdesign/source/filter/xml/xmlGroup.cxx
@@ -223,8 +223,8 @@ SvXMLImportContext* OXMLGroup::CreateChildContext(
case XML_TOK_GROUP_DETAIL:
{
rImport.GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP );
- Reference<XReportDefinition> m_xComponent =
rImport.getReportDefinition();
- pContext = new OXMLSection( rImport, nPrefix,
rLocalName,xAttrList ,m_xComponent->getDetail());
+ Reference<XReportDefinition> xComponent =
rImport.getReportDefinition();
+ pContext = new OXMLSection( rImport, nPrefix,
rLocalName,xAttrList, xComponent->getDetail());
}
break;
diff --git a/sal/qa/osl/process/osl_Thread.cxx
b/sal/qa/osl/process/osl_Thread.cxx
index 653f144..1e3c12c 100644
--- a/sal/qa/osl/process/osl_Thread.cxx
+++ b/sal/qa/osl/process/osl_Thread.cxx
@@ -1762,8 +1762,8 @@ namespace osl_ThreadData
{
// at first, set the data a value
char* pc = new char[2];
- char m_nData = 'm';
- pc[0] = m_nData;
+ char nData = 'm';
+ pc[0] = nData;
pc[1] = '\0';
myThreadData.setData(pc);
@@ -1795,8 +1795,8 @@ namespace osl_ThreadData
{
// at first, set the data a value
char* pc = new char[2];
- char m_nData = 'm';
- memcpy(pc, &m_nData, 1);
+ char nData = 'm';
+ memcpy(pc, &nData, 1);
pc[1] = '\0';
myThreadData.setData(pc);
@@ -1807,8 +1807,8 @@ namespace osl_ThreadData
// aThread1 and aThread2 should have not terminated yet
// setData the second time
char* pc2 = new char[2];
- m_nData = 'o';
- memcpy(pc2, &m_nData, 1);
+ nData = 'o';
+ memcpy(pc2, &nData, 1);
pc2[1] = '\0';
myThreadData.setData(pc2);
@@ -1843,8 +1843,8 @@ namespace osl_ThreadData
void getData_001()
{
char* pc = new char[2];
- char m_nData[] = "i";
- strcpy(pc, m_nData);
+ char nData[] = "i";
+ strcpy(pc, nData);
myThreadData.setData(pc);
myKeyThread aThread1('c');
@@ -1872,8 +1872,8 @@ namespace osl_ThreadData
void getData_002()
{
char* pc = new char[2];
- char m_nData = 'i';
- memcpy(pc, &m_nData, 1);
+ char nData = 'i';
+ memcpy(pc, &nData, 1);
pc[1] = '\0';
myThreadData.setData(pc);
@@ -1884,8 +1884,8 @@ namespace osl_ThreadData
aThread2.create();
// change the value which pc points
- char m_nData2 = 'j';
- memcpy(pc, &m_nData2, 1);
+ char nData2 = 'j';
+ memcpy(pc, &nData2, 1);
pc[1] = '\0';
void* pChar = myThreadData.getData();
diff --git a/sc/qa/extras/check_data_pilot_field.cxx
b/sc/qa/extras/check_data_pilot_field.cxx
index 3ff8c65..24c7ffb 100644
--- a/sc/qa/extras/check_data_pilot_field.cxx
+++ b/sc/qa/extras/check_data_pilot_field.cxx
@@ -168,8 +168,8 @@ uno::Reference< uno::XInterface >
CheckDataPilotField::init()
uno::Reference< container::XIndexAccess > IA = DPDsc->getDataPilotFields();
uno::Reference<uno::XInterface> xDataPilotFieldObject;
- uno::Any mAny = IA->getByIndex(0);
- CPPUNIT_ASSERT(mAny >>= xDataPilotFieldObject);
+ data = IA->getByIndex(0);
+ CPPUNIT_ASSERT(data >>= xDataPilotFieldObject);
mxObject = xDataPilotFieldObject;
return xDataPilotFieldObject;
diff --git a/sc/qa/extras/check_data_pilot_table.cxx
b/sc/qa/extras/check_data_pilot_table.cxx
index b5e786b..11c3ee3 100644
--- a/sc/qa/extras/check_data_pilot_table.cxx
+++ b/sc/qa/extras/check_data_pilot_table.cxx
@@ -166,8 +166,8 @@ uno::Reference< uno::XInterface >
CheckDataPilotTable::init()
DPT->insertNewByName("DataPilotTable", sCellAdress, DPDsc);
uno::Reference<uno::XInterface> xDataPilotTableObject;
- uno::Any mAny = DPT->getByName( DPT->getElementNames()[0] );
- CPPUNIT_ASSERT(mAny >>= xDataPilotTableObject);
+ data = DPT->getByName( DPT->getElementNames()[0] );
+ CPPUNIT_ASSERT(data >>= xDataPilotTableObject);
mxObject = xDataPilotTableObject;
return xDataPilotTableObject;
diff --git a/sc/qa/extras/check_xcell_ranges_query.cxx
b/sc/qa/extras/check_xcell_ranges_query.cxx
index 77c0bb6..ad8f0b0 100644
--- a/sc/qa/extras/check_xcell_ranges_query.cxx
+++ b/sc/qa/extras/check_xcell_ranges_query.cxx
@@ -64,11 +64,11 @@ uno::Reference< uno::XInterface >
CheckXCellRangesQuery::init()
// Load an empty document.
mxComponent = loadFromDesktop("private:factory/scalc");
- uno::Reference< sheet::XSpreadsheetDocument > m_xSheetDoc(mxComponent,
uno::UNO_QUERY_THROW);
- CPPUNIT_ASSERT_MESSAGE("no calc document!", m_xSheetDoc.is());
+ uno::Reference< sheet::XSpreadsheetDocument > xSheetDoc(mxComponent,
uno::UNO_QUERY_THROW);
+ CPPUNIT_ASSERT_MESSAGE("no calc document!", xSheetDoc.is());
// Getting spreadsheet
- uno::Reference< sheet::XSpreadsheets > oSheets =
m_xSheetDoc->getSheets();
+ uno::Reference< sheet::XSpreadsheets > oSheets =
xSheetDoc->getSheets();
uno::Reference< container::XIndexAccess > oIndexSheets(oSheets,
uno::UNO_QUERY_THROW);
uno::Any aAny = oIndexSheets->getByIndex(0);
uno::Reference<container::XNamed> xNamed;
@@ -118,9 +118,9 @@ void CheckXCellRangesQuery::checkEmptyCell()
void CheckXCellRangesQuery::checkFilledCell()
{
- uno::Reference< sheet::XSpreadsheet > m_xSpreadSheet(init(),
uno::UNO_QUERY_THROW);
+ uno::Reference< sheet::XSpreadsheet > xSpreadSheet(init(),
uno::UNO_QUERY_THROW);
// fill the cell with a value
- m_xSpreadSheet->getCellByPosition(2, 3)->setValue(15);
+ xSpreadSheet->getCellByPosition(2, 3)->setValue(15);
// compare an cell with value 5 with a cell with value 15
_queryColumnDifferences(sSheetName + ".C4");
diff --git a/sc/qa/unit/subsequent_export-test.cxx
b/sc/qa/unit/subsequent_export-test.cxx
index cf75d87..7b2e78f 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -1586,14 +1586,14 @@ void ScExportTest::testBordersExchangeXLSX()
CPPUNIT_ASSERT(xDocSh.Is());
ScDocument& rDoc = xDocSh->GetDocument();
- for (size_t mnCol = 0; mnCol < nMaxCol; ++mnCol)
+ for (size_t nCol = 0; nCol < nMaxCol; ++nCol)
{
- for (size_t mnRow = 0; mnRow < nMaxRow; ++mnRow)
+ for (size_t nRow = 0; nRow < nMaxRow; ++nRow)
{
const editeng::SvxBorderLine* pLineTop = nullptr;
const editeng::SvxBorderLine* pLineBottom = nullptr;
- rDoc.GetBorderLines(mnCol + 2, (mnRow * 2) + 8, 0, nullptr,
&pLineTop, nullptr, &pLineBottom);
- if((mnCol < 5) && (mnRow == 6))
+ rDoc.GetBorderLines(nCol + 2, (nRow * 2) + 8, 0, nullptr,
&pLineTop, nullptr, &pLineBottom);
+ if((nCol < 5) && (nRow == 6))
{ // in this range no lines
CPPUNIT_ASSERT(pLineTop == nullptr);
CPPUNIT_ASSERT(pLineBottom == nullptr);
@@ -1605,13 +1605,13 @@ void ScExportTest::testBordersExchangeXLSX()
CPPUNIT_ASSERT(pLineBottom);
}
- CPPUNIT_ASSERT_EQUAL_MESSAGE("Top Border-Line-Style wrong",
aCheckBorderWidth[mnCol][mnRow].BorderStyleTop,
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("Top Border-Line-Style wrong",
aCheckBorderWidth[nCol][nRow].BorderStyleTop,
pLineTop->GetBorderLineStyle());
- CPPUNIT_ASSERT_EQUAL_MESSAGE("Bottom Border-Line-Style wrong",
aCheckBorderWidth[mnCol][mnRow].BorderStyleBottom,
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("Bottom Border-Line-Style wrong",
aCheckBorderWidth[nCol][nRow].BorderStyleBottom,
pLineBottom->GetBorderLineStyle());
- CPPUNIT_ASSERT_EQUAL_MESSAGE("Top Width-Line wrong",
aCheckBorderWidth[mnCol][mnRow].WidthTop,
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("Top Width-Line wrong",
aCheckBorderWidth[nCol][nRow].WidthTop,
pLineTop->GetWidth());
- CPPUNIT_ASSERT_EQUAL_MESSAGE("Bottom Width-Line wrong",
aCheckBorderWidth[mnCol][mnRow].WidthBottom,
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("Bottom Width-Line wrong",
aCheckBorderWidth[nCol][nRow].WidthBottom,
pLineBottom->GetWidth());
}
}
diff --git a/sc/source/core/data/dpsave.cxx b/sc/source/core/data/dpsave.cxx
index 22dcb6b..20c3488 100644
--- a/sc/source/core/data/dpsave.cxx
+++ b/sc/source/core/data/dpsave.cxx
@@ -1366,8 +1366,8 @@ void
ScDPSaveData::BuildAllDimensionMembers(ScDPTableData* pData)
long nDimIndex = itr->second;
const std::vector<SCROW>& rMembers =
pData->GetColumnEntries(nDimIndex);
- size_t mMemberCount = rMembers.size();
- for (size_t j = 0; j < mMemberCount; ++j)
+ size_t nMemberCount = rMembers.size();
+ for (size_t j = 0; j < nMemberCount; ++j)
{
const ScDPItemData* pMemberData = pData->GetMemberById( nDimIndex,
rMembers[j] );
OUString aMemName = pData->GetFormattedString(nDimIndex,
*pMemberData);
diff --git a/sc/source/filter/oox/workbookfragment.cxx
b/sc/source/filter/oox/workbookfragment.cxx
index 5ef4b54..82980ab 100644
--- a/sc/source/filter/oox/workbookfragment.cxx
+++ b/sc/source/filter/oox/workbookfragment.cxx
@@ -237,7 +237,7 @@ public:
// the small safe section of the inner loop in
// sheetdatacontext.cxx
SAL_INFO( "sc.filter", "start wait on solar\n" );
- SolarMutexGuard maGuard;
+ SolarMutexGuard aGuard;
SAL_INFO( "sc.filter", "got solar\n" );
std::unique_ptr<oox::core::FastParser> xParser(
@@ -393,7 +393,7 @@ void WorkbookFragment::finalizeImport()
loaded. Additionally, the instances of the WorkbookGlobals structures
have to be stored for every sheet. */
SheetFragmentVector aSheetFragments;
- std::vector<WorksheetHelper*> maHelpers;
+ std::vector<WorksheetHelper*> aHelpers;
WorksheetBuffer& rWorksheets = getWorksheets();
sal_Int32 nWorksheetCount = rWorksheets.getWorksheetCount();
for( sal_Int32 nWorksheet = 0; nWorksheet < nWorksheetCount; ++nWorksheet )
@@ -456,7 +456,7 @@ void WorkbookFragment::finalizeImport()
if( xFragment.is() )
{
aSheetFragments.push_back( SheetFragmentHandler(
xSheetGlob, xFragment.get() ) );
- maHelpers.push_back(xFragment.get());
+ aHelpers.push_back(xFragment.get());
}
}
}
@@ -500,7 +500,7 @@ void WorkbookFragment::finalizeImport()
recalcFormulaCells();
- for( std::vector<WorksheetHelper*>::iterator aIt = maHelpers.begin(), aEnd
= maHelpers.end(); aIt != aEnd; ++aIt )
+ for( std::vector<WorksheetHelper*>::iterator aIt = aHelpers.begin(), aEnd
= aHelpers.end(); aIt != aEnd; ++aIt )
{
(*aIt)->finalizeDrawingImport();
}
diff --git a/sc/source/filter/xml/xmlexprt.cxx
b/sc/source/filter/xml/xmlexprt.cxx
index bf7d87f..b38de69 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -4327,9 +4327,9 @@ void ScXMLExport::ExportConditionalFormat(SCTAB nTab)
else if(pFormatEntry->GetType() == condformat::COLORSCALE)
{
SvXMLElementExport aElementColorScale(*this,
XML_NAMESPACE_CALC_EXT, XML_COLOR_SCALE, true, true);
- const ScColorScaleFormat& mrColorScale =
static_cast<const ScColorScaleFormat&>(*pFormatEntry);
- for(ScColorScaleEntries::const_iterator it =
mrColorScale.begin();
- it != mrColorScale.end(); ++it)
+ const ScColorScaleFormat& rColorScale =
static_cast<const ScColorScaleFormat&>(*pFormatEntry);
+ for(ScColorScaleEntries::const_iterator it =
rColorScale.begin();
+ it != rColorScale.end(); ++it)
{
if(it[0]->GetType() == COLORSCALE_FORMULA)
{
@@ -4423,19 +4423,19 @@ void ScXMLExport::ExportConditionalFormat(SCTAB nTab)
}
else if(pFormatEntry->GetType() == condformat::ICONSET)
{
- const ScIconSetFormat& mrIconSet = static_cast<const
ScIconSetFormat&>(*pFormatEntry);
- OUString aIconSetName =
getIconSetName(mrIconSet.GetIconSetData()->eIconSetType);
+ const ScIconSetFormat& rIconSet = static_cast<const
ScIconSetFormat&>(*pFormatEntry);
+ OUString aIconSetName =
getIconSetName(rIconSet.GetIconSetData()->eIconSetType);
AddAttribute( XML_NAMESPACE_CALC_EXT,
XML_ICON_SET_TYPE, aIconSetName );
- if (mrIconSet.GetIconSetData()->mbCustom)
+ if (rIconSet.GetIconSetData()->mbCustom)
AddAttribute(XML_NAMESPACE_CALC_EXT, XML_CUSTOM,
OUString::boolean(true));
SvXMLElementExport aElementColorScale(*this,
XML_NAMESPACE_CALC_EXT, XML_ICON_SET, true, true);
- if (mrIconSet.GetIconSetData()->mbCustom)
+ if (rIconSet.GetIconSetData()->mbCustom)
{
for (std::vector<std::pair<ScIconSetType,
sal_Int32> >::const_iterator
- it =
mrIconSet.GetIconSetData()->maCustomVector.begin();
- it !=
mrIconSet.GetIconSetData()->maCustomVector.end(); ++it)
+ it =
rIconSet.GetIconSetData()->maCustomVector.begin();
+ it !=
rIconSet.GetIconSetData()->maCustomVector.end(); ++it)
{
AddAttribute(XML_NAMESPACE_CALC_EXT,
XML_CUSTOM_ICONSET_NAME, getIconSetName(it->first));
AddAttribute(XML_NAMESPACE_CALC_EXT,
XML_CUSTOM_ICONSET_INDEX, OUString::number(it->second));
@@ -4444,9 +4444,9 @@ void ScXMLExport::ExportConditionalFormat(SCTAB nTab)
}
- if(!mrIconSet.GetIconSetData()->mbShowValue)
+ if(!rIconSet.GetIconSetData()->mbShowValue)
AddAttribute(XML_NAMESPACE_CALC_EXT,
XML_SHOW_VALUE, XML_FALSE);
- for (auto const& it : mrIconSet)
+ for (auto const& it : rIconSet)
{
if(it->GetType() == COLORSCALE_FORMULA)
{
@@ -4462,9 +4462,9 @@ void ScXMLExport::ExportConditionalFormat(SCTAB nTab)
}
else if(pFormatEntry->GetType() == condformat::DATE)
{
- const ScCondDateFormatEntry& mrDateFormat =
static_cast<const ScCondDateFormatEntry&>(*pFormatEntry);
- OUString aDateType =
getDateStringForType(mrDateFormat.GetDateType());
- OUString aStyleName =
ScStyleNameConversion::DisplayToProgrammaticName(mrDateFormat.GetStyleName(),
SFX_STYLE_FAMILY_PARA );
+ const ScCondDateFormatEntry& rDateFormat =
static_cast<const ScCondDateFormatEntry&>(*pFormatEntry);
+ OUString aDateType =
getDateStringForType(rDateFormat.GetDateType());
+ OUString aStyleName =
ScStyleNameConversion::DisplayToProgrammaticName(rDateFormat.GetStyleName(),
SFX_STYLE_FAMILY_PARA );
AddAttribute( XML_NAMESPACE_CALC_EXT, XML_STYLE,
aStyleName);
AddAttribute( XML_NAMESPACE_CALC_EXT, XML_DATE,
aDateType);
SvXMLElementExport aElementDateFormat(*this,
XML_NAMESPACE_CALC_EXT, XML_DATE_IS, true, true);
diff --git a/sc/source/ui/Accessibility/AccessibleCellBase.cxx
b/sc/source/ui/Accessibility/AccessibleCellBase.cxx
index 3c3a218..436e0d6 100644
--- a/sc/source/ui/Accessibility/AccessibleCellBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCellBase.cxx
@@ -320,7 +320,7 @@ OUString SAL_CALL ScAccessibleCellBase::GetNote()
{
SolarMutexGuard aGuard;
IsObjectValid();
- OUString msNote;
+ OUString sNote;
if (mpDoc)
{
SfxObjectShell* pObjSh = mpDoc->GetDocumentShell();
@@ -349,7 +349,7 @@ OUString SAL_CALL ScAccessibleCellBase::GetNote()
uno::Reference <text::XSimpleText> xText
(xSheetAnnotation, uno::UNO_QUERY);
if (xText.is())
{
- msNote = xText->getString();
+ sNote = xText->getString();
}
}
}
@@ -359,7 +359,7 @@ OUString SAL_CALL ScAccessibleCellBase::GetNote()
}
}
}
- return msNote;
+ return sNote;
}
#include <com/sun/star/table/ShadowFormat.hpp>
diff --git a/sc/source/ui/cctrl/checklistmenu.cxx
b/sc/source/ui/cctrl/checklistmenu.cxx
index fa943fc..e8cb32d 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -1133,12 +1133,12 @@ void ScCheckListMenuWindow::packWindow()
void ScCheckListMenuWindow::setAllMemberState(bool bSet)
{
size_t n = maMembers.size();
- std::set<SvTreeListEntry*> maParents;
+ std::set<SvTreeListEntry*> aParents;
for (size_t i = 0; i < n; ++i)
{
- maParents.insert(maMembers[i].mpParent);
+ aParents.insert(maMembers[i].mpParent);
}
- for (auto itr = maParents.begin(), itrEnd = maParents.end(); itr !=
itrEnd; ++itr)
+ for (auto itr = aParents.begin(), itrEnd = aParents.end(); itr != itrEnd;
++itr)
{
if (!(*itr))
{
diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx
b/sc/source/ui/condformat/condformatdlgentry.cxx
index 795467c..7ca4a18 100644
--- a/sc/source/ui/condformat/condformatdlgentry.cxx
+++ b/sc/source/ui/condformat/condformatdlgentry.cxx
@@ -127,8 +127,8 @@ void ScCondFrmtEntry::Select()
void ScCondFrmtEntry::Deselect()
{
- OUString maCondText = GetExpressionString();
- maFtCondition->SetText(maCondText);
+ OUString aCondText = GetExpressionString();
+ maFtCondition->SetText(aCondText);
maFtCondition->Show();
maLbType->Hide();
mbActive = false;
diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx
b/sc/source/ui/miscdlgs/anyrefdg.cxx
index e0818fb..c0e292e 100644
... etc. - the rest is truncated
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
