diff options
author | Noel Grandin <noel@peralex.com> | 2016-04-20 10:34:01 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2016-04-21 08:32:47 +0200 |
commit | 5abc669599001bf888b97c4d3c2715e1fb7523b9 (patch) | |
tree | 2407c6fc040a795e6ffc69de02ba940285c04c7f | |
parent | Revert partly some of my previous patches (diff) | |
download | core-5abc669599001bf888b97c4d3c2715e1fb7523b9.tar.gz core-5abc669599001bf888b97c4d3c2715e1fb7523b9.zip |
new plugin stylepolice
check for local variables which follow our member field naming
convention, which is highly confusing
Change-Id: Idacedf7145d09843e96a584237b385f7662eea10
133 files changed, 832 insertions, 768 deletions
diff --git a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx index 11da75d3c357..1a3c24c322f8 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 7efc72ed9ec8..9abe4c779ff4 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 20b269fcc3ea..33454e83d6ab 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 65b836d4fa13..804230b3b002 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 18cc9906fbbb..db0acd917875 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 4b4b26042870..c787f02a9510 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 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( diff --git a/compilerplugins/clang/stylepolice.cxx b/compilerplugins/clang/stylepolice.cxx new file mode 100644 index 000000000000..96b5f72c00a7 --- /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 3cd005bd3fe2..0626560da9ca 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 0655e528bd4d..695564f91b96 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 c3c16d6f3157..92f4761933e4 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 6175603eccdc..4a10d6f6c434 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 14e750c21a04..c9955912d3ef 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 4191403b54f5..a11b0d9560e8 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 8d02f77504dd..02419477b926 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 7bc5f549047a..cd08acc23a27 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 635f37aa71ec..ac41e60fbc77 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 b2a031d2831c..b3dd3d8e0f33 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 0fbfb402f3bd..3d055095fa7d 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 7ba2f6a335ed..1a3e62a54220 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 744fdc2591fa..c43638abbd19 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 33a8d33cd7b1..fe2912c9d618 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 3730b5350b17..48787bbab49d 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 cfb1f2909315..f30a9edd867e 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 66b1dcee6bb6..70b34362f64c 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 a82bd4c1c9ff..1852ed855939 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 6fb33cf520b6..69836bc22cb4 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 9cc5f686bfa9..540f978c1e72 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 d57eadcd1030..3a0fd641a92f 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 5cb9e8c5a534..29e439958349 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 ef9be244dfe0..6f6f2354203a 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 eb99c842ae56..1a29e2263a01 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 653f14486e47..1e3c12ca1f14 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 3ff8c65e9bf7..24c7ffb90f9a 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 b5e786b8cfbc..11c3ee336eff 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 77c0bb63e5f4..ad8f0b0cc31f 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 cf75d8766fc7..7b2e78ff7533 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 22dcb6b93077..20c3488f524e 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 5ef4b544b9cb..82980ab646a2 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 bf7d87f22795..b38de6979951 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 3c3a218d3936..436e0d63b3b2 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 fa943fc85ddb..e8cb32d2b13f 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 795467cadc83..7ca4a1838d06 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 e0818fb5aa63..c0e292ee1576 100644 --- a/sc/source/ui/miscdlgs/anyrefdg.cxx +++ b/sc/source/ui/miscdlgs/anyrefdg.cxx @@ -514,14 +514,14 @@ void ScFormulaReferenceHelper::RefInputStart( formula::RefEdit* pEdit, formula:: //We want just pRefBtn and pRefEdit to be shown //mark widgets we want to be visible, starting with pRefEdit //and all its direct parents. - winset m_aVisibleWidgets; + winset aVisibleWidgets; pResizeDialog = pRefEdit->GetParentDialog(); vcl::Window *pContentArea = pResizeDialog->get_content_area(); for (vcl::Window *pCandidate = pRefEdit; pCandidate && (pCandidate != pContentArea && pCandidate->IsVisible()); pCandidate = pCandidate->GetWindow(GetWindowType::RealParent)) { - m_aVisibleWidgets.insert(pCandidate); + aVisibleWidgets.insert(pCandidate); } //same again with pRefBtn, except stop if there's a //shared parent in the existing widgets @@ -529,12 +529,12 @@ void ScFormulaReferenceHelper::RefInputStart( formula::RefEdit* pEdit, formula:: pCandidate && (pCandidate != pContentArea && pCandidate->IsVisible()); pCandidate = pCandidate->GetWindow(GetWindowType::RealParent)) { - if (m_aVisibleWidgets.insert(pCandidate).second) + if (aVisibleWidgets.insert(pCandidate).second) break; } - //hide everything except the m_aVisibleWidgets - hideUnless(pContentArea, m_aVisibleWidgets, m_aHiddenWidgets); + //hide everything except the aVisibleWidgets + hideUnless(pContentArea, aVisibleWidgets, m_aHiddenWidgets); } if (!mbOldDlgLayoutEnabled) diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx index 3be4af38a7f6..4f0164ef724c 100644 --- a/sc/source/ui/namedlg/namedlg.cxx +++ b/sc/source/ui/namedlg/namedlg.cxx @@ -351,9 +351,9 @@ void ScNameDlg::SetEntry(const OUString& rName, const OUString& rScope) void ScNameDlg::RemovePushed() { - std::vector<ScRangeNameLine> maEntries = m_pRangeManagerTable->GetSelectedEntries(); + std::vector<ScRangeNameLine> aEntries = m_pRangeManagerTable->GetSelectedEntries(); m_pRangeManagerTable->DeleteSelectedEntries(); - for (std::vector<ScRangeNameLine>::iterator itr = maEntries.begin(); itr != maEntries.end(); ++itr) + for (std::vector<ScRangeNameLine>::iterator itr = aEntries.begin(); itr != aEntries.end(); ++itr) { ScRangeName* pRangeName = GetRangeName(itr->aScope); ScRangeData* pData = pRangeName->findByUpperName(ScGlobal::pCharClass->uppercase(itr->aName)); diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx index 670c55ac9292..5f39d8eb35bc 100644 --- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx +++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx @@ -286,10 +286,10 @@ void CellAppearancePropertyPanel::NotifyItemUpdate( if(pSvxLineItem) { - const editeng::SvxBorderLine* mbLineItem = pSvxLineItem->GetLine(); - mnIn = mbLineItem->GetInWidth(); - mnOut = mbLineItem->GetOutWidth(); - mnDis = mbLineItem->GetDistance(); + const editeng::SvxBorderLine* pLineItem = pSvxLineItem->GetLine(); + mnIn = pLineItem->GetInWidth(); + mnOut = pLineItem->GetOutWidth(); + mnDis = pLineItem->GetDistance(); if(mnIn == 0 && mnOut == 0 && mnDis == 0) mbBorderStyleAvailable = false; diff --git a/sc/source/ui/sidebar/CellBorderUpdater.cxx b/sc/source/ui/sidebar/CellBorderUpdater.cxx index 80fb3461f4a8..12a87773182e 100644 --- a/sc/source/ui/sidebar/CellBorderUpdater.cxx +++ b/sc/source/ui/sidebar/CellBorderUpdater.cxx @@ -41,7 +41,7 @@ void CellBorderUpdater::UpdateCellBorder(bool bTop, bool bBot, bool bLeft, bool BitmapEx aBmpEx( aImg.GetBitmapEx() ); Bitmap aBmp( aBmpEx.GetBitmap() ); BitmapWriteAccess* pBmpAcc = aBmp.AcquireWriteAccess(); - const Size maBmpSize = aBmp.GetSizePixel(); + const Size aBmpSize = aBmp.GetSizePixel(); if( pBmpAcc ) { @@ -58,7 +58,7 @@ void CellBorderUpdater::UpdateCellBorder(bool bTop, bool bBot, bool bLeft, bool pBmpAcc->SetLineColor( ::Application::GetSettings().GetStyleSettings().GetFieldTextColor() ) ; pBmpAcc->SetFillColor( COL_BLACK); - if(maBmpSize.Width() == 43 && maBmpSize.Height() == 43) + if(aBmpSize.Width() == 43 && aBmpSize.Height() == 43) { Point aTL(2, 1), aTR(42,1), aBL(2, 41), aBR(42, 41), aHL(2,21), aHR(42, 21), aVT(22,1), aVB(22, 41); if( pMskAcc ) diff --git a/sc/source/ui/vba/vbaborders.cxx b/sc/source/ui/vba/vbaborders.cxx index ab6c80f83ec1..c761f43dc993 100644 --- a/sc/source/ui/vba/vbaborders.cxx +++ b/sc/source/ui/vba/vbaborders.cxx @@ -485,18 +485,18 @@ lcl_areAllLineWidthsSame( const table::TableBorder& maTableBorder, bool bIsCell uno::Any SAL_CALL ScVbaBorders::getLineStyle() throw (uno::RuntimeException, std::exception) { - table::TableBorder maTableBorder; - m_xProps->getPropertyValue( sTableBorder ) >>= maTableBorder; + table::TableBorder aTableBorder; + m_xProps->getPropertyValue( sTableBorder ) >>= aTableBorder; sal_Int32 aLinestyle = XlLineStyle::xlLineStyleNone; - if ( lcl_areAllLineWidthsSame( maTableBorder, bRangeIsSingleCell )) + if ( lcl_areAllLineWidthsSame( aTableBorder, bRangeIsSingleCell )) { - if (maTableBorder.TopLine.LineDistance != 0) + if (aTableBorder.TopLine.LineDistance != 0) { aLinestyle = XlLineStyle::xlDouble; } - else if ( maTableBorder.TopLine.OuterLineWidth != 0 ) + else if ( aTableBorder.TopLine.OuterLineWidth != 0 ) { aLinestyle = XlLineStyle::xlContinuous; } diff --git a/sc/source/ui/vba/vbachart.cxx b/sc/source/ui/vba/vbachart.cxx index 4e2ef575aaa2..3919969749d9 100644 --- a/sc/source/ui/vba/vbachart.cxx +++ b/sc/source/ui/vba/vbachart.cxx @@ -562,15 +562,15 @@ ScVbaChart::setSourceData( const css::uno::Reference< ::ooo::vba::excel::XRange { try { - uno::Sequence< table::CellRangeAddress > mRangeAddresses(1); - table::CellRangeAddress mSingleRangeAddress; + uno::Sequence< table::CellRangeAddress > aRangeAddresses(1); + table::CellRangeAddress aSingleRangeAddress; uno::Reference< sheet::XCellRangeAddressable > xAddressable( _xCalcRange->getCellRange(), uno::UNO_QUERY_THROW ); - mSingleRangeAddress = xAddressable->getRangeAddress(); + aSingleRangeAddress = xAddressable->getRangeAddress(); - mRangeAddresses[0] = mSingleRangeAddress; + aRangeAddresses[0] = aSingleRangeAddress; - mxTableChart->setRanges(mRangeAddresses); + mxTableChart->setRanges(aRangeAddresses); bool bsetRowHeaders = false; bool bsetColumnHeaders = false; @@ -579,8 +579,8 @@ ScVbaChart::setSourceData( const css::uno::Reference< ::ooo::vba::excel::XRange if ( pRange ) { ScDocument& rDoc = pRange->getScDocument(); - bsetRowHeaders = rDoc.HasRowHeader( static_cast< SCCOL >( mSingleRangeAddress.StartColumn ), static_cast< SCROW >( mSingleRangeAddress.StartRow ), static_cast< SCCOL >( mSingleRangeAddress.EndColumn ), static_cast< SCROW >( mSingleRangeAddress.EndRow ), static_cast< SCTAB >( mSingleRangeAddress.Sheet ) ); - bsetColumnHeaders = rDoc.HasColHeader( static_cast< SCCOL >( mSingleRangeAddress.StartColumn ), static_cast< SCROW >( mSingleRangeAddress.StartRow ), static_cast< SCCOL >( mSingleRangeAddress.EndColumn ), static_cast< SCROW >( mSingleRangeAddress.EndRow ), static_cast< SCTAB >( mSingleRangeAddress.Sheet )); + bsetRowHeaders = rDoc.HasRowHeader( static_cast< SCCOL >( aSingleRangeAddress.StartColumn ), static_cast< SCROW >( aSingleRangeAddress.StartRow ), static_cast< SCCOL >( aSingleRangeAddress.EndColumn ), static_cast< SCROW >( aSingleRangeAddress.EndRow ), static_cast< SCTAB >( aSingleRangeAddress.Sheet ) ); + bsetColumnHeaders = rDoc.HasColHeader( static_cast< SCCOL >( aSingleRangeAddress.StartColumn ), static_cast< SCROW >( aSingleRangeAddress.StartRow ), static_cast< SCCOL >( aSingleRangeAddress.EndColumn ), static_cast< SCROW >( aSingleRangeAddress.EndRow ), static_cast< SCTAB >( aSingleRangeAddress.Sheet )); } mxTableChart->setHasRowHeaders(bsetRowHeaders); mxTableChart->setHasColumnHeaders(bsetColumnHeaders); @@ -606,8 +606,8 @@ ScVbaChart::setSourceData( const css::uno::Reference< ::ooo::vba::excel::XRange } else { - sal_Int32 nRows = mSingleRangeAddress.EndRow - mSingleRangeAddress.StartRow; - sal_Int32 nCols = mSingleRangeAddress.EndColumn - mSingleRangeAddress.StartColumn; + sal_Int32 nRows = aSingleRangeAddress.EndRow - aSingleRangeAddress.StartRow; + sal_Int32 nCols = aSingleRangeAddress.EndColumn - aSingleRangeAddress.StartColumn; // AutoDetect emulation if ( nRows > nCols ) setPlotBy( xlColumns ); diff --git a/sc/source/ui/vba/vbawindows.cxx b/sc/source/ui/vba/vbawindows.cxx index 0b0b54a1ecf6..230aaf51fc13 100644 --- a/sc/source/ui/vba/vbawindows.cxx +++ b/sc/source/ui/vba/vbawindows.cxx @@ -67,10 +67,10 @@ public: explicit WindowComponentEnumImpl( const uno::Reference< uno::XComponentContext >& xContext ) throw ( uno::RuntimeException ) : m_xContext( xContext ) { uno::Reference< frame::XDesktop2 > xDesktop = frame::Desktop::create(m_xContext); - uno::Reference< container::XEnumeration > mxComponents = xDesktop->getComponents()->createEnumeration(); - while( mxComponents->hasMoreElements() ) + uno::Reference< container::XEnumeration > xComponents = xDesktop->getComponents()->createEnumeration(); + while( xComponents->hasMoreElements() ) { - uno::Reference< sheet::XSpreadsheetDocument > xNext( mxComponents->nextElement(), uno::UNO_QUERY ); + uno::Reference< sheet::XSpreadsheetDocument > xNext( xComponents->nextElement(), uno::UNO_QUERY ); if ( xNext.is() ) m_components.push_back( xNext ); } diff --git a/sc/source/ui/vba/vbaworksheets.cxx b/sc/source/ui/vba/vbaworksheets.cxx index 221ec7e40c0d..d7d84355fc75 100644 --- a/sc/source/ui/vba/vbaworksheets.cxx +++ b/sc/source/ui/vba/vbaworksheets.cxx @@ -442,7 +442,7 @@ ScVbaWorksheets::Item(const uno::Any& Index, const uno::Any& Index2) uno::Reference< script::XTypeConverter > xConverter = getTypeConverter(mxContext); uno::Any aConverted; aConverted = xConverter->convertTo( Index, cppu::UnoType<uno::Sequence< uno::Any >>::get() ); - SheetMap mSheets; + SheetMap aSheets; uno::Sequence< uno::Any > sIndices; aConverted >>= sIndices; sal_Int32 nElems = sIndices.getLength(); @@ -452,9 +452,9 @@ ScVbaWorksheets::Item(const uno::Any& Index, const uno::Any& Index2) ScVbaWorksheet* pWorkSheet = excel::getImplFromDocModuleWrapper<ScVbaWorksheet>( xWorkSheet ); uno::Reference< sheet::XSpreadsheet > xSheet( pWorkSheet->getSheet() , uno::UNO_QUERY_THROW ); uno::Reference< container::XNamed > xName( xSheet, uno::UNO_QUERY_THROW ); - mSheets.push_back( xSheet ); + aSheets.push_back( xSheet ); } - uno::Reference< container::XIndexAccess > xIndexAccess = new SheetCollectionHelper( mSheets ); + uno::Reference< container::XIndexAccess > xIndexAccess = new SheetCollectionHelper( aSheets ); uno::Reference< XCollection > xSelectedSheets( new ScVbaWorksheets( this->getParent(), mxContext, xIndexAccess, mxModel ) ); return uno::makeAny( xSelectedSheets ); } diff --git a/scripting/source/provider/BrowseNodeFactoryImpl.cxx b/scripting/source/provider/BrowseNodeFactoryImpl.cxx index e8d61bdb3198..cc63505399fd 100644 --- a/scripting/source/provider/BrowseNodeFactoryImpl.cxx +++ b/scripting/source/provider/BrowseNodeFactoryImpl.cxx @@ -428,7 +428,7 @@ public: { if ( hasChildNodes() ) { - vXBrowseNodes m_vNodes; + vXBrowseNodes aVNodes; Sequence < Reference< browse::XBrowseNode > > nodes = m_xWrappedBrowseNode->getChildNodes(); for ( sal_Int32 i=0; i<nodes.getLength(); i++ ) @@ -436,13 +436,13 @@ public: Reference< browse::XBrowseNode > xBrowseNode = nodes[ i ]; OSL_ENSURE( xBrowseNode.is(), "DefaultBrowseNode::getChildNodes(): Invalid BrowseNode" ); if( xBrowseNode.is() ) - m_vNodes.push_back( new DefaultBrowseNode( m_xCtx, xBrowseNode ) ); + aVNodes.push_back( new DefaultBrowseNode( m_xCtx, xBrowseNode ) ); } - ::std::sort( m_vNodes.begin(), m_vNodes.end(), alphaSortForBNodes() ); - Sequence < Reference< browse::XBrowseNode > > children( m_vNodes.size() ); - vXBrowseNodes::const_iterator it = m_vNodes.begin(); - for ( sal_Int32 i=0; it != m_vNodes.end() && i<children.getLength(); i++, ++it ) + ::std::sort( aVNodes.begin(), aVNodes.end(), alphaSortForBNodes() ); + Sequence < Reference< browse::XBrowseNode > > children( aVNodes.size() ); + vXBrowseNodes::const_iterator it = aVNodes.begin(); + for ( sal_Int32 i=0; it != aVNodes.end() && i<children.getLength(); i++, ++it ) { children[ i ].set( *it ); } diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx index 0132e62245ea..df82afde30d3 100644 --- a/sd/source/filter/eppt/pptx-epptooxml.cxx +++ b/sd/source/filter/eppt/pptx-epptooxml.cxx @@ -341,8 +341,7 @@ void PowerPointExport::writeDocumentProperties() if (xDocProps.is()) { - PowerPointExport& mrExport(*this); - mrExport.exportDocumentProperties( xDocProps ); + exportDocumentProperties( xDocProps ); } } diff --git a/sd/source/filter/grf/sdgrffilter.cxx b/sd/source/filter/grf/sdgrffilter.cxx index f2b229b6f721..08e82b553d74 100644 --- a/sd/source/filter/grf/sdgrffilter.cxx +++ b/sd/source/filter/grf/sdgrffilter.cxx @@ -268,7 +268,7 @@ bool SdGRFFilter::Export() const sal_uInt16 nFilter = rGraphicFilter.GetExportFormatNumberForTypeName( aTypeName ); if ( nFilter != GRFILTER_FORMAT_NOTFOUND ) { - uno::Reference< task::XInteractionHandler > mXInteractionHandler; + uno::Reference< task::XInteractionHandler > xInteractionHandler; beans::PropertyValues aArgs; TransformItems( SID_SAVEASDOC, *pSet, aArgs ); @@ -293,8 +293,8 @@ bool SdGRFFilter::Export() uno::Reference< task::XInteractionHandler > xHdl; if ( aArgs[ i ].Value >>= xHdl ) { - mXInteractionHandler = new SdGRFFilter_ImplInteractionHdl( xHdl ); - aArgs[ i ].Value <<= mXInteractionHandler; + xInteractionHandler = new SdGRFFilter_ImplInteractionHdl( xHdl ); + aArgs[ i ].Value <<= xInteractionHandler; } } } @@ -322,9 +322,9 @@ bool SdGRFFilter::Export() } xExporter->setSourceDocument( xSource ); bRet = xExporter->filter( aArgs ); - if ( !bRet && mXInteractionHandler.is() ) + if ( !bRet && xInteractionHandler.is() ) SdGRFFilter::HandleGraphicFilterError( - static_cast< SdGRFFilter_ImplInteractionHdl* >( mXInteractionHandler.get() )->GetErrorCode(), + static_cast< SdGRFFilter_ImplInteractionHdl* >( xInteractionHandler.get() )->GetErrorCode(), rGraphicFilter.GetLastError().nStreamError ); } } diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index fc5c89b68dd5..e94ac242ae6b 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -2734,8 +2734,8 @@ ImplSdPPTImport::ReadFormControl( tools::SvRef<SotStorage>& rSrc1, css::uno::Ref if ( mpDoc->GetDocSh() ) { xModel = mpDoc->GetDocSh()->GetModel(); - oox::ole::MSConvertOCXControls mCtrlImporter( xModel ); - return mCtrlImporter.ReadOCXStorage( rSrc1, rFormComp ); + oox::ole::MSConvertOCXControls aCtrlImporter( xModel ); + return aCtrlImporter.ReadOCXStorage( rSrc1, rFormComp ); } return false; } diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx index 28c606216431..0af20497d857 100644 --- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx +++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx @@ -192,13 +192,13 @@ sal_Int32 SAL_CALL { ThrowIfDisposed (); - long mpChildCount = AccessibleDocumentViewBase::getAccessibleChildCount(); + long nChildCount = AccessibleDocumentViewBase::getAccessibleChildCount(); // Forward request to children manager. if (mpChildrenManager != nullptr) - mpChildCount += mpChildrenManager->GetChildCount (); + nChildCount += mpChildrenManager->GetChildCount(); - return mpChildCount; + return nChildCount; } uno::Reference<XAccessible> SAL_CALL @@ -363,10 +363,10 @@ void SAL_CALL css::uno::Reference< drawing::XDrawPage > xSlide; // MT IA2: Not used... // sal_Int32 currentPageIndex = xSlideshow->getCurrentPageIndex(); - css::uno::Reference< css::presentation::XSlideShowController > mpSlideController = xSlideshow->getController(); - if( mpSlideController.is() ) + css::uno::Reference< css::presentation::XSlideShowController > xSlideController = xSlideshow->getController(); + if( xSlideController.is() ) { - xSlide = mpSlideController->getCurrentSlide(); + xSlide = xSlideController->getCurrentSlide(); if (xSlide.is()) { mpChildrenManager->SetShapeList (uno::Reference<drawing::XShapes> ( diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx index 7a9f50f69665..b3537296a5e2 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationDialog.cxx @@ -2207,14 +2207,14 @@ CustomAnimationDialog::CustomAnimationDialog(vcl::Window* pParent, STLPropertySe { get(mpTabControl, "tabs"); - sal_uInt16 mnEffectId = mpTabControl->GetPageId("effect"); - sal_uInt16 mnTimingId = mpTabControl->GetPageId("timing"); - sal_uInt16 mnTextAnimId = mpTabControl->GetPageId("textanim"); + sal_uInt16 nEffectId = mpTabControl->GetPageId("effect"); + sal_uInt16 nTimingId = mpTabControl->GetPageId("timing"); + sal_uInt16 nTextAnimId = mpTabControl->GetPageId("textanim"); mpEffectTabPage = VclPtr<CustomAnimationEffectTabPage>::Create( mpTabControl, mpSet ); - mpTabControl->SetTabPage( mnEffectId, mpEffectTabPage ); + mpTabControl->SetTabPage( nEffectId, mpEffectTabPage ); mpDurationTabPage = VclPtr<CustomAnimationDurationTabPage>::Create( mpTabControl, mpSet ); - mpTabControl->SetTabPage( mnTimingId, mpDurationTabPage ); + mpTabControl->SetTabPage( nTimingId, mpDurationTabPage ); bool bHasText = false; if( pSet->getPropertyState( nHandleHasText ) != STLPropertyState_AMBIGUOUS ) @@ -2223,12 +2223,12 @@ CustomAnimationDialog::CustomAnimationDialog(vcl::Window* pParent, STLPropertySe if( bHasText ) { mpTextAnimTabPage = VclPtr<CustomAnimationTextAnimTabPage>::Create( mpTabControl, mpSet ); - mpTabControl->SetTabPage( mnTextAnimId, mpTextAnimTabPage ); + mpTabControl->SetTabPage( nTextAnimId, mpTextAnimTabPage ); } else { mpTextAnimTabPage = nullptr; - mpTabControl->RemovePage( mnTextAnimId ); + mpTabControl->RemovePage( nTextAnimId ); } if (!sPage.isEmpty()) diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx index 20e565669b1a..154f694687de 100644 --- a/sd/source/ui/annotations/annotationmanager.cxx +++ b/sd/source/ui/annotations/annotationmanager.cxx @@ -103,17 +103,17 @@ namespace sd { SfxItemPool* GetAnnotationPool() { - static SfxItemPool* mpAnnotationPool = nullptr; - if( mpAnnotationPool == nullptr ) + static SfxItemPool* s_pAnnotationPool = nullptr; + if( s_pAnnotationPool == nullptr ) { - mpAnnotationPool = EditEngine::CreatePool( false ); - mpAnnotationPool->SetPoolDefaultItem(SvxFontHeightItem(423,100,EE_CHAR_FONTHEIGHT)); + s_pAnnotationPool = EditEngine::CreatePool( false ); + s_pAnnotationPool->SetPoolDefaultItem(SvxFontHeightItem(423,100,EE_CHAR_FONTHEIGHT)); vcl::Font aAppFont( Application::GetSettings().GetStyleSettings().GetAppFont() ); - mpAnnotationPool->SetPoolDefaultItem(SvxFontItem(aAppFont.GetFamilyType(),aAppFont.GetFamilyName(),"",PITCH_DONTKNOW,RTL_TEXTENCODING_DONTKNOW,EE_CHAR_FONTINFO)); + s_pAnnotationPool->SetPoolDefaultItem(SvxFontItem(aAppFont.GetFamilyType(),aAppFont.GetFamilyName(),"",PITCH_DONTKNOW,RTL_TEXTENCODING_DONTKNOW,EE_CHAR_FONTINFO)); } - return mpAnnotationPool; + return s_pAnnotationPool; } static SfxBindings* getBindings( ViewShellBase& rBase ) diff --git a/sd/source/ui/framework/factories/BasicViewFactory.cxx b/sd/source/ui/framework/factories/BasicViewFactory.cxx index 7f40961e1be6..3c8cc0291881 100644 --- a/sd/source/ui/framework/factories/BasicViewFactory.cxx +++ b/sd/source/ui/framework/factories/BasicViewFactory.cxx @@ -448,20 +448,20 @@ bool BasicViewFactory::IsCacheable (const std::shared_ptr<ViewDescriptor>& rpDes Reference<XRelocatableResource> xResource (rpDescriptor->mxView, UNO_QUERY); if (xResource.is()) { - static ::std::vector<Reference<XResourceId> > maCacheableResources; - if (maCacheableResources.empty() ) + static ::std::vector<Reference<XResourceId> > s_aCacheableResources; + if (s_aCacheableResources.empty() ) { std::shared_ptr<FrameworkHelper> pHelper (FrameworkHelper::Instance(*mpBase)); // The slide sorter and the task panel are cacheable and relocatable. - maCacheableResources.push_back(FrameworkHelper::CreateResourceId( + s_aCacheableResources.push_back(FrameworkHelper::CreateResourceId( FrameworkHelper::msSlideSorterURL, FrameworkHelper::msLeftDrawPaneURL)); - maCacheableResources.push_back(FrameworkHelper::CreateResourceId( + s_aCacheableResources.push_back(FrameworkHelper::CreateResourceId( FrameworkHelper::msSlideSorterURL, FrameworkHelper::msLeftImpressPaneURL)); } ::std::vector<Reference<XResourceId> >::const_iterator iId; - for (iId=maCacheableResources.begin(); iId!=maCacheableResources.end(); ++iId) + for (iId=s_aCacheableResources.begin(); iId!=s_aCacheableResources.end(); ++iId) { if ((*iId)->compareTo(rpDescriptor->mxViewId) == 0) { diff --git a/sd/source/ui/func/undolayer.cxx b/sd/source/ui/func/undolayer.cxx index 0b17185bfa22..22e1adf1f4bb 100644 --- a/sd/source/ui/func/undolayer.cxx +++ b/sd/source/ui/func/undolayer.cxx @@ -51,10 +51,10 @@ SdLayerModifyUndoAction::SdLayerModifyUndoAction( void SdLayerModifyUndoAction::Undo() { - ::sd::DrawDocShell* mpDocSh = mpDoc->GetDocSh(); - if( mpDocSh ) + ::sd::DrawDocShell* pDocSh = mpDoc->GetDocSh(); + if( pDocSh ) { - ::sd::DrawViewShell* pDrViewSh = dynamic_cast< ::sd::DrawViewShell*> ( mpDocSh->GetViewShell() ); + ::sd::DrawViewShell* pDrViewSh = dynamic_cast< ::sd::DrawViewShell*> ( pDocSh->GetViewShell() ); if( pDrViewSh ) { pDrViewSh->ModifyLayer( mpLayer, maOldLayerName, maOldLayerTitle, maOldLayerDesc, mbOldIsVisible, mbOldIsLocked, mbOldIsPrintable ); @@ -64,10 +64,10 @@ void SdLayerModifyUndoAction::Undo() void SdLayerModifyUndoAction::Redo() { - ::sd::DrawDocShell* mpDocSh = mpDoc->GetDocSh(); - if( mpDocSh ) + ::sd::DrawDocShell* pDocSh = mpDoc->GetDocSh(); + if( pDocSh ) { - ::sd::DrawViewShell* pDrViewSh = dynamic_cast< ::sd::DrawViewShell* >( mpDocSh->GetViewShell() ); + ::sd::DrawViewShell* pDrViewSh = dynamic_cast< ::sd::DrawViewShell* >( pDocSh->GetViewShell() ); if( pDrViewSh ) { pDrViewSh->ModifyLayer( mpLayer, maNewLayerName, maNewLayerTitle, maNewLayerDesc, mbNewIsVisible, mbNewIsLocked, mbNewIsPrintable ); diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index 6b7b463f1e52..f6c57bb4b07e 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -1774,10 +1774,10 @@ void SlideshowImpl::updateSlideShow() // have a minimum frequency. // => Allow up to 60 frames per second. Call at least once // every 4 seconds. - const static sal_Int32 mnMaximumFrameCount (60); - const static double mnMinimumTimeout (1.0 / mnMaximumFrameCount); - const static double mnMaximumTimeout (4.0); - fUpdate = ::basegfx::clamp(fUpdate, mnMinimumTimeout, mnMaximumTimeout); + const static sal_Int32 nMaximumFrameCount (60); + const static double nMinimumTimeout (1.0 / nMaximumFrameCount); + const static double nMaximumTimeout (4.0); + fUpdate = ::basegfx::clamp(fUpdate, nMinimumTimeout, nMaximumTimeout); // Make sure that the maximum frame count has not been set // too high (only then conversion to milliseconds and long diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index 569fca33d207..594c157d3d73 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -3072,11 +3072,11 @@ uno::Reference< drawing::XDrawPage > SAL_CALL SdMasterPagesAccess::insertNewByIn uno::Reference< drawing::XDrawPage > xDrawPage; - SdDrawDocument* mpDoc = mpModel->mpDoc; - if( mpDoc ) + SdDrawDocument* pDoc = mpModel->mpDoc; + if( pDoc ) { // calculate internal index and check for range errors - const sal_Int32 nMPageCount = mpDoc->GetMasterPageCount(); + const sal_Int32 nMPageCount = pDoc->GetMasterPageCount(); nInsertPos = nInsertPos * 2 + 1; if( nInsertPos < 0 || nInsertPos > nMPageCount ) nInsertPos = nMPageCount; @@ -3092,7 +3092,7 @@ uno::Reference< drawing::XDrawPage > SAL_CALL SdMasterPagesAccess::insertNewByIn bUnique = true; for( sal_Int32 nMaster = 1; nMaster < nMPageCount; nMaster++ ) { - SdPage* pPage = static_cast<SdPage*>(mpDoc->GetMasterPage((sal_uInt16)nMaster)); + SdPage* pPage = static_cast<SdPage*>(pDoc->GetMasterPage((sal_uInt16)nMaster)); if( pPage && pPage->GetName() == aPrefix ) { bUnique = false; @@ -3113,7 +3113,7 @@ uno::Reference< drawing::XDrawPage > SAL_CALL SdMasterPagesAccess::insertNewByIn aLayoutName += SD_RESSTR(STR_LAYOUT_OUTLINE); // create styles - static_cast<SdStyleSheetPool*>(mpDoc->GetStyleSheetPool())->CreateLayoutStyleSheets( aPrefix ); + static_cast<SdStyleSheetPool*>(pDoc->GetStyleSheetPool())->CreateLayoutStyleSheets( aPrefix ); // get the first page for initial size and border settings SdPage* pPage = mpModel->mpDoc->GetSdPage( (sal_uInt16)0, PK_STANDARD ); @@ -3127,7 +3127,7 @@ uno::Reference< drawing::XDrawPage > SAL_CALL SdMasterPagesAccess::insertNewByIn pPage->GetRgtBorder(), pPage->GetLwrBorder() ); pMPage->SetLayoutName( aLayoutName ); - mpDoc->InsertMasterPage(pMPage, (sal_uInt16)nInsertPos); + pDoc->InsertMasterPage(pMPage, (sal_uInt16)nInsertPos); { // ensure default MasterPage fill @@ -3145,7 +3145,7 @@ uno::Reference< drawing::XDrawPage > SAL_CALL SdMasterPagesAccess::insertNewByIn pRefNotesPage->GetRgtBorder(), pRefNotesPage->GetLwrBorder() ); pMNotesPage->SetLayoutName( aLayoutName ); - mpDoc->InsertMasterPage(pMNotesPage, (sal_uInt16)nInsertPos + 1); + pDoc->InsertMasterPage(pMNotesPage, (sal_uInt16)nInsertPos + 1); pMNotesPage->SetAutoLayout(AUTOLAYOUT_NOTES, true, true); mpModel->SetModified(); } @@ -3290,17 +3290,17 @@ uno::Sequence< OUString > SAL_CALL SdDocLinkTargets::getElementNames() if( nullptr == mpModel ) throw lang::DisposedException(); - SdDrawDocument* mpDoc = mpModel->GetDoc(); - if( mpDoc == nullptr ) + SdDrawDocument* pDoc = mpModel->GetDoc(); + if( pDoc == nullptr ) { uno::Sequence< OUString > aSeq; return aSeq; } - if( mpDoc->GetDocumentType() == DOCUMENT_TYPE_DRAW ) + if( pDoc->GetDocumentType() == DOCUMENT_TYPE_DRAW ) { - const sal_uInt16 nMaxPages = mpDoc->GetSdPageCount( PK_STANDARD ); - const sal_uInt16 nMaxMasterPages = mpDoc->GetMasterSdPageCount( PK_STANDARD ); + const sal_uInt16 nMaxPages = pDoc->GetSdPageCount( PK_STANDARD ); + const sal_uInt16 nMaxMasterPages = pDoc->GetMasterSdPageCount( PK_STANDARD ); uno::Sequence< OUString > aSeq( nMaxPages + nMaxMasterPages ); OUString* pStr = aSeq.getArray(); @@ -3308,17 +3308,17 @@ uno::Sequence< OUString > SAL_CALL SdDocLinkTargets::getElementNames() sal_uInt16 nPage; // standard pages for( nPage = 0; nPage < nMaxPages; nPage++ ) - *pStr++ = mpDoc->GetSdPage( nPage, PK_STANDARD )->GetName(); + *pStr++ = pDoc->GetSdPage( nPage, PK_STANDARD )->GetName(); // master pages for( nPage = 0; nPage < nMaxMasterPages; nPage++ ) - *pStr++ = mpDoc->GetMasterSdPage( nPage, PK_STANDARD )->GetName(); + *pStr++ = pDoc->GetMasterSdPage( nPage, PK_STANDARD )->GetName(); return aSeq; } else { - const sal_uInt16 nMaxPages = mpDoc->GetPageCount(); - const sal_uInt16 nMaxMasterPages = mpDoc->GetMasterPageCount(); + const sal_uInt16 nMaxPages = pDoc->GetPageCount(); + const sal_uInt16 nMaxMasterPages = pDoc->GetMasterPageCount(); uno::Sequence< OUString > aSeq( nMaxPages + nMaxMasterPages ); OUString* pStr = aSeq.getArray(); @@ -3326,11 +3326,11 @@ uno::Sequence< OUString > SAL_CALL SdDocLinkTargets::getElementNames() sal_uInt16 nPage; // standard pages for( nPage = 0; nPage < nMaxPages; nPage++ ) - *pStr++ = static_cast<SdPage*>(mpDoc->GetPage( nPage ))->GetName(); + *pStr++ = static_cast<SdPage*>(pDoc->GetPage( nPage ))->GetName(); // master pages for( nPage = 0; nPage < nMaxMasterPages; nPage++ ) - *pStr++ = static_cast<SdPage*>(mpDoc->GetMasterPage( nPage ))->GetName(); + *pStr++ = static_cast<SdPage*>(pDoc->GetMasterPage( nPage ))->GetName(); return aSeq; } } @@ -3366,22 +3366,22 @@ sal_Bool SAL_CALL SdDocLinkTargets::hasElements() SdPage* SdDocLinkTargets::FindPage( const OUString& rName ) const throw(std::exception) { - SdDrawDocument* mpDoc = mpModel->GetDoc(); - if( mpDoc == nullptr ) + SdDrawDocument* pDoc = mpModel->GetDoc(); + if( pDoc == nullptr ) return nullptr; - const sal_uInt16 nMaxPages = mpDoc->GetPageCount(); - const sal_uInt16 nMaxMasterPages = mpDoc->GetMasterPageCount(); + const sal_uInt16 nMaxPages = pDoc->GetPageCount(); + const sal_uInt16 nMaxMasterPages = pDoc->GetMasterPageCount(); sal_uInt16 nPage; SdPage* pPage; - const bool bDraw = mpDoc->GetDocumentType() == DOCUMENT_TYPE_DRAW; + const bool bDraw = pDoc->GetDocumentType() == DOCUMENT_TYPE_DRAW; // standard pages for( nPage = 0; nPage < nMaxPages; nPage++ ) { - pPage = static_cast<SdPage*>(mpDoc->GetPage( nPage )); + pPage = static_cast<SdPage*>(pDoc->GetPage( nPage )); if( (pPage->GetName() == rName) && (!bDraw || (pPage->GetPageKind() == PK_STANDARD)) ) return pPage; } @@ -3389,7 +3389,7 @@ SdPage* SdDocLinkTargets::FindPage( const OUString& rName ) const throw(std::exc // master pages for( nPage = 0; nPage < nMaxMasterPages; nPage++ ) { - pPage = static_cast<SdPage*>(mpDoc->GetMasterPage( nPage )); + pPage = static_cast<SdPage*>(pDoc->GetMasterPage( nPage )); if( (pPage->GetName() == rName) && (!bDraw || (pPage->GetPageKind() == PK_STANDARD)) ) return pPage; } diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index 580f85edeae1..b0db26731767 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -986,9 +986,9 @@ OUString ImplRetrieveLabelFromCommand( const Reference< XFrame >& xFrame, const { Reference< XNameAccess > const xNameAccess( frame::theUICommandDescription::get(xContext) ); - Reference< css::container::XNameAccess > m_xUICommandLabels( xNameAccess->getByName( aModuleIdentifier ), UNO_QUERY_THROW ); + Reference< css::container::XNameAccess > xUICommandLabels( xNameAccess->getByName( aModuleIdentifier ), UNO_QUERY_THROW ); Sequence< PropertyValue > aPropSeq; - if( m_xUICommandLabels->getByName( aCmdURL ) >>= aPropSeq ) + if( xUICommandLabels->getByName( aCmdURL ) >>= aPropSeq ) { for( sal_Int32 i = 0; i < aPropSeq.getLength(); i++ ) { diff --git a/sdext/source/minimizer/optimizerdialog.cxx b/sdext/source/minimizer/optimizerdialog.cxx index 7a39b89ba388..9b3d7c723024 100644 --- a/sdext/source/minimizer/optimizerdialog.cxx +++ b/sdext/source/minimizer/optimizerdialog.cxx @@ -240,11 +240,11 @@ OptimizerDialog::~OptimizerDialog() void OptimizerDialog::execute() { - Reference< XItemEventBroadcaster > maRoadmapBroadcaster( mxRoadmapControl, UNO_QUERY_THROW ); - maRoadmapBroadcaster->addItemListener( mxItemListener ); + Reference< XItemEventBroadcaster > xRoadmapBroadcaster( mxRoadmapControl, UNO_QUERY_THROW ); + xRoadmapBroadcaster->addItemListener( mxItemListener ); UnoDialog::execute(); UpdateConfiguration(); // taking actual control settings for the configuration - maRoadmapBroadcaster->removeItemListener( mxItemListener ); + xRoadmapBroadcaster->removeItemListener( mxItemListener ); } diff --git a/sdext/source/presenter/PresenterSlideShowView.cxx b/sdext/source/presenter/PresenterSlideShowView.cxx index f14836e0a9d7..65dae40f4524 100644 --- a/sdext/source/presenter/PresenterSlideShowView.cxx +++ b/sdext/source/presenter/PresenterSlideShowView.cxx @@ -798,9 +798,9 @@ void PresenterSlideShowView::PaintEndSlide (const awt::Rectangle& rRepaintBox) // Finally, in double buffered environments, request the changes to be // made visible. - Reference<rendering::XSpriteCanvas> mxSpriteCanvas (mxCanvas, UNO_QUERY); - if (mxSpriteCanvas.is()) - mxSpriteCanvas->updateScreen(true); + Reference<rendering::XSpriteCanvas> xSpriteCanvas (mxCanvas, UNO_QUERY); + if (xSpriteCanvas.is()) + xSpriteCanvas->updateScreen(true); } void PresenterSlideShowView::PaintInnerWindow (const awt::PaintEvent& rEvent) @@ -820,9 +820,9 @@ void PresenterSlideShowView::PaintInnerWindow (const awt::PaintEvent& rEvent) // Finally, in double buffered environments, request the changes to be // made visible. - Reference<rendering::XSpriteCanvas> mxSpriteCanvas (mxCanvas, UNO_QUERY); - if (mxSpriteCanvas.is()) - mxSpriteCanvas->updateScreen(true); + Reference<rendering::XSpriteCanvas> xSpriteCanvas (mxCanvas, UNO_QUERY); + if (xSpriteCanvas.is()) + xSpriteCanvas->updateScreen(true); } Reference<awt::XWindow> PresenterSlideShowView::CreateViewWindow ( diff --git a/sfx2/source/appl/imagemgr.cxx b/sfx2/source/appl/imagemgr.cxx index d6d3fe8a1112..56862e94e601 100644 --- a/sfx2/source/appl/imagemgr.cxx +++ b/sfx2/source/appl/imagemgr.cxx @@ -138,14 +138,14 @@ Image SAL_CALL GetImage( } } - static WeakReference< XModuleManager2 > m_xModuleManager; + static WeakReference< XModuleManager2 > s_xModuleManager; - Reference< XModuleManager2 > xModuleManager = m_xModuleManager; + Reference< XModuleManager2 > xModuleManager = s_xModuleManager; if ( !xModuleManager.is() ) { xModuleManager = ModuleManager::create(::comphelper::getProcessComponentContext()); - m_xModuleManager = xModuleManager; + s_xModuleManager = xModuleManager; } try @@ -155,28 +155,28 @@ Image SAL_CALL GetImage( Reference< XImageManager > xModuleImageManager; OUString aModuleId = xModuleManager->identify( rFrame ); - static ModuleIdToImagegMgr m_aModuleIdToImageMgrMap; + static ModuleIdToImagegMgr s_aModuleIdToImageMgrMap; - ModuleIdToImagegMgr::iterator pIter = m_aModuleIdToImageMgrMap.find( aModuleId ); - if ( pIter != m_aModuleIdToImageMgrMap.end() ) + ModuleIdToImagegMgr::iterator pIter = s_aModuleIdToImageMgrMap.find( aModuleId ); + if ( pIter != s_aModuleIdToImageMgrMap.end() ) xModuleImageManager = pIter->second; else { - static WeakReference< XModuleUIConfigurationManagerSupplier > m_xModuleCfgMgrSupplier; + static WeakReference< XModuleUIConfigurationManagerSupplier > s_xModuleCfgMgrSupplier; - Reference< XModuleUIConfigurationManagerSupplier > xModuleCfgMgrSupplier = m_xModuleCfgMgrSupplier; + Reference< XModuleUIConfigurationManagerSupplier > xModuleCfgMgrSupplier = s_xModuleCfgMgrSupplier; if ( !xModuleCfgMgrSupplier.is() ) { xModuleCfgMgrSupplier = theModuleUIConfigurationManagerSupplier::get( ::comphelper::getProcessComponentContext() ); - m_xModuleCfgMgrSupplier = xModuleCfgMgrSupplier; + s_xModuleCfgMgrSupplier = xModuleCfgMgrSupplier; } Reference< XUIConfigurationManager > xUICfgMgr = xModuleCfgMgrSupplier->getUIConfigurationManager( aModuleId ); xModuleImageManager.set( xUICfgMgr->getImageManager(), UNO_QUERY ); - m_aModuleIdToImageMgrMap.insert( ModuleIdToImagegMgr::value_type( aModuleId, xModuleImageManager )); + s_aModuleIdToImageMgrMap.insert( ModuleIdToImagegMgr::value_type( aModuleId, xModuleImageManager )); } Sequence< Reference< css::graphic::XGraphic > > aGraphicSeq; diff --git a/sfx2/source/control/templateabstractview.cxx b/sfx2/source/control/templateabstractview.cxx index 25374e44a1e3..b202fb614299 100644 --- a/sfx2/source/control/templateabstractview.cxx +++ b/sfx2/source/control/templateabstractview.cxx @@ -310,10 +310,10 @@ void TemplateAbstractView::Paint(vcl::RenderContext& rRenderContext, const Recta maFillColor.getBColor())); const drawinglayer::geometry::ViewInformation2D aNewViewInfos; - std::unique_ptr<drawinglayer::processor2d::BaseProcessor2D> mpProcessor( + std::unique_ptr<drawinglayer::processor2d::BaseProcessor2D> pProcessor( drawinglayer::processor2d::createBaseProcessor2DFromOutputDevice(rRenderContext, aNewViewInfos)); - mpProcessor->process(aSeq); + pProcessor->process(aSeq); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index ef8b863a8b2b..b6a72e86550e 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -959,10 +959,10 @@ bool SfxDocumentPage::FillItemSet( SfxItemSet* rSet ) if ( pExpSet && SfxItemState::SET == pExpSet->GetItemState( SID_DOCINFO, true, &pItem ) ) { - const SfxDocumentInfoItem* m_pInfoItem = static_cast<const SfxDocumentInfoItem*>(pItem); + const SfxDocumentInfoItem* pInfoItem = static_cast<const SfxDocumentInfoItem*>(pItem); bool bUseData = ( TRISTATE_TRUE == m_pUseUserDataCB->GetState() ); - const_cast<SfxDocumentInfoItem*>(m_pInfoItem)->SetUseUserData( bUseData ); - rSet->Put( SfxDocumentInfoItem( *m_pInfoItem ) ); + const_cast<SfxDocumentInfoItem*>(pInfoItem)->SetUseUserData( bUseData ); + rSet->Put( SfxDocumentInfoItem( *pInfoItem ) ); bRet = true; } } @@ -996,10 +996,10 @@ bool SfxDocumentPage::FillItemSet( SfxItemSet* rSet ) if ( pExpSet && SfxItemState::SET == pExpSet->GetItemState( SID_DOCINFO, true, &pItem ) ) { - const SfxDocumentInfoItem* m_pxInfoItem = static_cast<const SfxDocumentInfoItem*>(pItem); + const SfxDocumentInfoItem* pInfoItem = static_cast<const SfxDocumentInfoItem*>(pItem); bool bUseThumbnail = ( TRISTATE_TRUE == m_pUseThumbnailSaveCB->GetState() ); - const_cast<SfxDocumentInfoItem*>(m_pxInfoItem)->SetUseThumbnailSave( bUseThumbnail ); - rSet->Put( SfxDocumentInfoItem( *m_pxInfoItem ) ); + const_cast<SfxDocumentInfoItem*>(pInfoItem)->SetUseThumbnailSave( bUseThumbnail ); + rSet->Put( SfxDocumentInfoItem( *pInfoItem ) ); bRet = true; } } @@ -1082,7 +1082,7 @@ void SfxDocumentPage::Reset( const SfxItemSet* rSet ) m_pFileValEd->SetText( aURL.GetPartBeforeLastName() ); // handle access data - bool m_bUseUserData = rInfoItem.IsUseUserData(); + bool bUseUserData = rInfoItem.IsUseUserData(); const LocaleDataWrapper& rLocaleWrapper( Application::GetSettings().GetLocaleDataWrapper() ); m_pCreateValFt->SetText( ConvertDateTime_Impl( rInfoItem.getAuthor(), rInfoItem.getCreationDate(), rLocaleWrapper ) ); @@ -1095,7 +1095,7 @@ void SfxDocumentPage::Reset( const SfxItemSet* rSet ) m_pPrintValFt->SetText( ConvertDateTime_Impl( rInfoItem.getPrintedBy(), aTime, rLocaleWrapper ) ); const long nTime = rInfoItem.getEditingDuration(); - if ( m_bUseUserData ) + if ( bUseUserData ) { const tools::Time aT( nTime/3600, (nTime%3600)/60, nTime%60 ); m_pTimeLogValFt->SetText( rLocaleWrapper.getDuration( aT ) ); @@ -1103,7 +1103,7 @@ void SfxDocumentPage::Reset( const SfxItemSet* rSet ) rInfoItem.getEditingCycles() ) ); } - bool m_bUseThumbnailSave = rInfoItem.IsUseThumbnailSave(); + bool bUseThumbnailSave = rInfoItem.IsUseThumbnailSave(); // Check for cmis properties where otherwise unavailable if ( rInfoItem.isCmisDocument( ) ) @@ -1116,13 +1116,13 @@ void SfxDocumentPage::Reset( const SfxItemSet* rSet ) { Sequence< sal_Int64 > seqValue; aCmisProps[i].Value >>= seqValue; - SvNumberFormatter m_aNumberFormatter( ::comphelper::getProcessComponentContext(), + SvNumberFormatter aNumberFormatter( ::comphelper::getProcessComponentContext(), Application::GetSettings().GetLanguageTag().getLanguageType() ); - sal_uInt32 nIndex = m_aNumberFormatter.GetFormatIndex( NF_NUMBER_SYSTEM ); + sal_uInt32 nIndex = aNumberFormatter.GetFormatIndex( NF_NUMBER_SYSTEM ); if ( seqValue.getLength( ) > 0 ) { OUString sValue; - m_aNumberFormatter.GetInputLineString( seqValue[0], nIndex, sValue ); + aNumberFormatter.GetInputLineString( seqValue[0], nIndex, sValue ); m_pShowSizeFT->SetText( CreateSizeText( sValue.toInt64( ) ) ); } } @@ -1154,12 +1154,12 @@ void SfxDocumentPage::Reset( const SfxItemSet* rSet ) } } - m_pUseUserDataCB->SetState( static_cast<TriState>(m_bUseUserData) ); + m_pUseUserDataCB->SetState( static_cast<TriState>(bUseUserData) ); m_pUseUserDataCB->SaveValue(); m_pUseUserDataCB->Enable( bEnableUseUserData ); bHandleDelete = false; m_pDeleteBtn->Enable( bEnableUseUserData ); - m_pUseThumbnailSaveCB->SetState( static_cast<TriState>(m_bUseThumbnailSave) ); + m_pUseThumbnailSaveCB->SetState( static_cast<TriState>(bUseThumbnailSave) ); m_pUseThumbnailSaveCB->SaveValue(); } diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx index a53ff86e36c2..3d431919b342 100644 --- a/sfx2/source/dialog/dockwin.cxx +++ b/sfx2/source/dialog/dockwin.cxx @@ -159,22 +159,22 @@ SfxDockingWrapper::SfxDockingWrapper( vcl::Window* pParentWnd , xFactoryMgr->createInstanceWithArgumentsAndContext( aArgs, xContext ), uno::UNO_QUERY ); - static uno::WeakReference< frame::XModuleManager2 > m_xModuleManager; + static uno::WeakReference< frame::XModuleManager2 > s_xModuleManager; - uno::Reference< frame::XModuleManager2 > xModuleManager( m_xModuleManager ); + uno::Reference< frame::XModuleManager2 > xModuleManager( s_xModuleManager ); if ( !xModuleManager.is() ) { xModuleManager = frame::ModuleManager::create(xContext); - m_xModuleManager = xModuleManager; + s_xModuleManager = xModuleManager; } - static uno::WeakReference< container::XNameAccess > m_xWindowStateConfiguration; + static uno::WeakReference< container::XNameAccess > s_xWindowStateConfiguration; - uno::Reference< container::XNameAccess > xWindowStateConfiguration( m_xWindowStateConfiguration ); + uno::Reference< container::XNameAccess > xWindowStateConfiguration( s_xWindowStateConfiguration ); if ( !xWindowStateConfiguration.is() ) { xWindowStateConfiguration = ui::theWindowStateConfiguration::get( xContext ); - m_xWindowStateConfiguration = xWindowStateConfiguration; + s_xWindowStateConfiguration = xWindowStateConfiguration; } OUString sModuleIdentifier = xModuleManager->identify( xFrame ); diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx index 6765452cb15b..93da4a54c9a8 100644 --- a/sfx2/source/dialog/mgetempl.cxx +++ b/sfx2/source/dialog/mgetempl.cxx @@ -397,11 +397,11 @@ bool SfxManageStyleSheetPage::Execute_Impl( pItems[ nCount++ ] = nullptr; - const SfxPoolItem* mpItem = rDispatcher.Execute( + const SfxPoolItem* pItem = rDispatcher.Execute( nId, SfxCallMode::SYNCHRON | SfxCallMode::RECORD | SfxCallMode::MODAL, pItems ); - if ( !mpItem ) + if ( !pItem ) return false; return true; diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx index 50cdd58003a0..2ca537f04433 100644 --- a/sfx2/source/doc/doctempl.cxx +++ b/sfx2/source/doc/doctempl.cxx @@ -296,7 +296,7 @@ OUString SfxDocumentTemplates::GetFullRegionName } -const OUString& SfxDocumentTemplates::GetRegionName +OUString SfxDocumentTemplates::GetRegionName ( sal_uInt16 nIdx // vcl::Region Index ) const @@ -311,7 +311,7 @@ const OUString& SfxDocumentTemplates::GetRegionName */ { - static OUString maTmpString; + OUString aTmpString; DocTemplLocker_Impl aLocker( *pImp ); @@ -320,14 +320,10 @@ const OUString& SfxDocumentTemplates::GetRegionName RegionData_Impl *pData = pImp->GetRegion( nIdx ); if ( pData ) - maTmpString = pData->GetTitle(); - else - maTmpString.clear(); + aTmpString = pData->GetTitle(); } - else - maTmpString.clear(); - return maTmpString; + return aTmpString; } @@ -383,7 +379,7 @@ sal_uInt16 SfxDocumentTemplates::GetCount } -const OUString& SfxDocumentTemplates::GetName +OUString SfxDocumentTemplates::GetName ( sal_uInt16 nRegion, // vcl::Region Index, in which the entry lies sal_uInt16 nIdx // Index of the entry @@ -401,7 +397,7 @@ const OUString& SfxDocumentTemplates::GetName { DocTemplLocker_Impl aLocker( *pImp ); - static OUString maTmpString; + OUString aTmpString; if ( pImp->Construct() ) { @@ -412,14 +408,10 @@ const OUString& SfxDocumentTemplates::GetName pEntry = pRegion->GetEntry( nIdx ); if ( pEntry ) - maTmpString = pEntry->GetTitle(); - else - maTmpString.clear(); + aTmpString = pEntry->GetTitle(); } - else - maTmpString.clear(); - return maTmpString; + return aTmpString; } diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx index 62c49ed44ee4..e51bcb4de0e7 100644 --- a/sfx2/source/doc/templatedlg.cxx +++ b/sfx2/source/doc/templatedlg.cxx @@ -1624,14 +1624,14 @@ void SfxTemplateManagerDlg::localSearchMoveTo(sal_uInt16 nMenuId) void SfxTemplateManagerDlg::loadRepositories() { - uno::Reference < uno::XComponentContext > m_context(comphelper::getProcessComponentContext()); + uno::Reference< uno::XComponentContext > xContext(comphelper::getProcessComponentContext()); // Load from user settings css::uno::Sequence<OUString> aUrls = - officecfg::Office::Common::Misc::TemplateRepositoryUrls::get(m_context); + officecfg::Office::Common::Misc::TemplateRepositoryUrls::get(xContext); css::uno::Sequence<OUString> aNames = - officecfg::Office::Common::Misc::TemplateRepositoryNames::get(m_context); + officecfg::Office::Common::Misc::TemplateRepositoryNames::get(xContext); for (sal_Int32 i = 0; i < aUrls.getLength() && i < aNames.getLength(); ++i) { diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx index c1801d2e4f68..045fbb1dac48 100644 --- a/sfx2/source/sidebar/SidebarController.cxx +++ b/sfx2/source/sidebar/SidebarController.cxx @@ -1015,9 +1015,9 @@ IMPL_LINK_TYPED(SidebarController, OnMenuItemSelected, Menu*, pMenu, bool) case MID_HIDE_SIDEBAR: { const util::URL aURL (Tools::GetURL(gsHideSidebarCommandName)); - Reference<frame::XDispatch> mxDispatch (Tools::GetDispatch(mxFrame, aURL)); - if (mxDispatch.is()) - mxDispatch->dispatch(aURL, Sequence<beans::PropertyValue>()); + Reference<frame::XDispatch> xDispatch (Tools::GetDispatch(mxFrame, aURL)); + if (xDispatch.is()) + xDispatch->dispatch(aURL, Sequence<beans::PropertyValue>()); break; } default: diff --git a/sfx2/source/sidebar/UnoPanel.cxx b/sfx2/source/sidebar/UnoPanel.cxx index 820515f9b8ef..3fd124b459d5 100644 --- a/sfx2/source/sidebar/UnoPanel.cxx +++ b/sfx2/source/sidebar/UnoPanel.cxx @@ -94,13 +94,11 @@ void SAL_CALL SfxUnoPanel::expand( const sal_Bool bCollapseOther ) if (bCollapseOther) { - Panel* aPanel; - - SharedPanelContainer maPanels = mpDeck->GetPanels(); - for ( SharedPanelContainer::iterator iPanel(maPanels.begin()), iEnd(maPanels.end()); - iPanel!=iEnd; ++iPanel) + SharedPanelContainer aPanels = mpDeck->GetPanels(); + for ( SharedPanelContainer::iterator iPanel(aPanels.begin()), iEnd(aPanels.end()); + iPanel!=iEnd; ++iPanel) { - aPanel = *iPanel; + Panel* aPanel = *iPanel; if (! aPanel->HasIdPredicate(mPanelId)) aPanel->SetExpanded(false); diff --git a/sfx2/source/sidebar/UnoSidebar.cxx b/sfx2/source/sidebar/UnoSidebar.cxx index 28bca9ed407e..6ea75563d16c 100644 --- a/sfx2/source/sidebar/UnoSidebar.cxx +++ b/sfx2/source/sidebar/UnoSidebar.cxx @@ -61,9 +61,9 @@ void SAL_CALL SfxUnoSidebar::setVisible ( const sal_Bool bVisible ) if ( (bVisible && !pSidebarController) || (!bVisible && pSidebarController) ) { const util::URL aURL (Tools::GetURL(".uno:Sidebar")); - uno::Reference<frame::XDispatch> mxDispatch (Tools::GetDispatch(xFrame, aURL)); - if (mxDispatch.is()) - mxDispatch->dispatch(aURL, uno::Sequence<beans::PropertyValue>()); + uno::Reference<frame::XDispatch> xDispatch (Tools::GetDispatch(xFrame, aURL)); + if (xDispatch.is()) + xDispatch->dispatch(aURL, uno::Sequence<beans::PropertyValue>()); } } diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx index 2c8992b53f5c..eca3f8a81810 100644 --- a/sfx2/source/view/sfxbasecontroller.cxx +++ b/sfx2/source/view/sfxbasecontroller.cxx @@ -148,14 +148,14 @@ typedef std::unordered_map< sal_Int16, sal_Int16 > GroupHashMap; sal_Int16 MapGroupIDToCommandGroup( sal_Int16 nGroupID ) { - static GroupHashMap mHashMap; + static GroupHashMap s_aHashMap; if ( !bGroupIDMapInitialized ) { sal_Int32 i = 0; while ( GroupIDCommandGroupMap[i].nGroupID != 0 ) { - mHashMap.insert( GroupHashMap::value_type( + s_aHashMap.insert( GroupHashMap::value_type( GroupIDCommandGroupMap[i].nGroupID, GroupIDCommandGroupMap[i].nCommandGroup )); ++i; @@ -163,8 +163,8 @@ sal_Int16 MapGroupIDToCommandGroup( sal_Int16 nGroupID ) bGroupIDMapInitialized = true; } - GroupHashMap::const_iterator pIter = mHashMap.find( nGroupID ); - if ( pIter != mHashMap.end() ) + GroupHashMap::const_iterator pIter = s_aHashMap.find( nGroupID ); + if ( pIter != s_aHashMap.end() ) return pIter->second; else return frame::CommandGroup::INTERNAL; diff --git a/slideshow/source/engine/shapes/viewappletshape.cxx b/slideshow/source/engine/shapes/viewappletshape.cxx index 60f1d5daf77d..2b1ec969c6ae 100644 --- a/slideshow/source/engine/shapes/viewappletshape.cxx +++ b/slideshow/source/engine/shapes/viewappletshape.cxx @@ -83,7 +83,7 @@ namespace slideshow uno::Reference< beans::XPropertySet > xShapePropSet( rxShape, uno::UNO_QUERY_THROW ); - uno::Reference< beans::XPropertySet > mxViewerPropSet( mxViewer, + uno::Reference< beans::XPropertySet > xViewerPropSet( mxViewer, uno::UNO_QUERY_THROW ); // copy shape properties to applet viewer @@ -91,9 +91,9 @@ namespace slideshow for( sal_Size i=0; i<nNumPropEntries; ++i ) { aPropName = OUString::createFromAscii( pPropCopyTable[i] ); - mxViewerPropSet->setPropertyValue( aPropName, - xShapePropSet->getPropertyValue( - aPropName )); + xViewerPropSet->setPropertyValue( aPropName, + xShapePropSet->getPropertyValue( + aPropName )); } } diff --git a/svgio/source/svgreader/svgimagenode.cxx b/svgio/source/svgreader/svgimagenode.cxx index d58dd716b8cd..47c802353322 100644 --- a/svgio/source/svgreader/svgimagenode.cxx +++ b/svgio/source/svgreader/svgimagenode.cxx @@ -258,11 +258,11 @@ namespace svgio } else if(!maXLink.isEmpty()) { - const SvgNode* mpXLink = getDocument().findSvgNodeById(maXLink); + const SvgNode* pXLink = getDocument().findSvgNodeById(maXLink); - if(mpXLink && Display_none != mpXLink->getDisplay()) + if(pXLink && Display_none != pXLink->getDisplay()) { - mpXLink->decomposeSvgNode(aNewTarget, true); + pXLink->decomposeSvgNode(aNewTarget, true); if(!aNewTarget.empty()) { diff --git a/svgio/source/svgreader/svgstyleattributes.cxx b/svgio/source/svgreader/svgstyleattributes.cxx index 1a5b279432aa..2d5bc8548495 100644 --- a/svgio/source/svgreader/svgstyleattributes.cxx +++ b/svgio/source/svgreader/svgstyleattributes.cxx @@ -1145,21 +1145,21 @@ namespace svgio aSource = drawinglayer::primitive2d::Primitive2DContainer { xRef }; } - const SvgClipPathNode* mpClip = accessClipPathXLink(); - while(mpClip) + const SvgClipPathNode* pClip = accessClipPathXLink(); + while(pClip) { // #i124852# transform may be needed when userSpaceOnUse - mpClip->apply(aSource, pTransform); - mpClip = mpClip->getSvgStyleAttributes()->accessClipPathXLink(); + pClip->apply(aSource, pTransform); + pClip = pClip->getSvgStyleAttributes()->accessClipPathXLink(); } if(!aSource.empty()) // test again, applied clipPath may have lead to empty geometry { - const SvgMaskNode* mpMask = accessMaskXLink(); - if(mpMask) + const SvgMaskNode* pMask = accessMaskXLink(); + if(pMask) { // #i124852# transform may be needed when userSpaceOnUse - mpMask->apply(aSource, pTransform); + pMask->apply(aSource, pTransform); } if(!aSource.empty()) // test again, applied mask may have lead to empty geometry diff --git a/svgio/source/svgreader/svgusenode.cxx b/svgio/source/svgreader/svgusenode.cxx index 826aed2729f4..84f4bbe75785 100644 --- a/svgio/source/svgreader/svgusenode.cxx +++ b/svgio/source/svgreader/svgusenode.cxx @@ -141,9 +141,9 @@ namespace svgio void SvgUseNode::decomposeSvgNode(drawinglayer::primitive2d::Primitive2DContainer& rTarget, bool /*bReferenced*/) const { // try to access link to content - const SvgNode* mpXLink = getDocument().findSvgNodeById(maXLink); + const SvgNode* pXLink = getDocument().findSvgNodeById(maXLink); - if(mpXLink && Display_none != mpXLink->getDisplay()) + if(pXLink && Display_none != pXLink->getDisplay()) { // decompose children drawinglayer::primitive2d::Primitive2DContainer aNewTarget; @@ -151,9 +151,9 @@ namespace svgio // todo: in case mpXLink is a SVGTokenSvg or SVGTokenSymbol the // SVG docs want the getWidth() and getHeight() from this node // to be valid for the subtree. - const_cast< SvgNode* >(mpXLink)->setAlternativeParent(this); - mpXLink->decomposeSvgNode(aNewTarget, true); - const_cast< SvgNode* >(mpXLink)->setAlternativeParent(); + const_cast< SvgNode* >(pXLink)->setAlternativeParent(this); + pXLink->decomposeSvgNode(aNewTarget, true); + const_cast< SvgNode* >(pXLink)->setAlternativeParent(); if(!aNewTarget.empty()) { diff --git a/svtools/source/control/headbar.cxx b/svtools/source/control/headbar.cxx index 5e31f3792a6e..caa6bb030584 100644 --- a/svtools/source/control/headbar.cxx +++ b/svtools/source/control/headbar.cxx @@ -1400,10 +1400,10 @@ css::uno::Reference< css::awt::XWindowPeer > HeaderBar::GetComponentInterface( b (Window::GetComponentInterface(false)); if ( !xPeer.is() && bCreate ) { - css::awt::XWindowPeer* mxPeer = new VCLXHeaderBar(this); - m_pVCLXHeaderBar = static_cast<VCLXHeaderBar*>(mxPeer); - SetComponentInterface(mxPeer); - return mxPeer; + css::awt::XWindowPeer* pPeer = new VCLXHeaderBar(this); + m_pVCLXHeaderBar = static_cast<VCLXHeaderBar*>(pPeer); + SetComponentInterface(pPeer); + return pPeer; } else return xPeer; diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx index c80c8c930109..bc0163f89c08 100644 --- a/svx/source/dialog/dlgctrl.cxx +++ b/svx/source/dialog/dlgctrl.cxx @@ -967,8 +967,8 @@ void SvxPixelCtl::KeyInput( const KeyEvent& rKEvt ) Point pRepaintPoint( aRectSize.Width() *( aFocusPosition.getX() - 1)/ nLines - 1, aRectSize.Height() *( aFocusPosition.getY() - 1)/ nLines -1 ); - Size mRepaintSize( aRectSize.Width() *3/ nLines + 2,aRectSize.Height() *3/ nLines + 2); - Rectangle mRepaintRect( pRepaintPoint, mRepaintSize ); + Size aRepaintSize( aRectSize.Width() *3/ nLines + 2,aRectSize.Height() *3/ nLines + 2); + Rectangle aRepaintRect( pRepaintPoint, aRepaintSize ); bool bFocusPosChanged=false; switch(nCode) { @@ -976,7 +976,7 @@ void SvxPixelCtl::KeyInput( const KeyEvent& rKEvt ) if((aFocusPosition.getX() >= 1)) { aFocusPosition.setX( aFocusPosition.getX() - 1 ); - Invalidate(mRepaintRect); + Invalidate(aRepaintRect); bFocusPosChanged=true; } break; @@ -984,7 +984,7 @@ void SvxPixelCtl::KeyInput( const KeyEvent& rKEvt ) if( aFocusPosition.getX() < (nLines - 1) ) { aFocusPosition.setX( aFocusPosition.getX() + 1 ); - Invalidate(mRepaintRect); + Invalidate(aRepaintRect); bFocusPosChanged=true; } break; @@ -992,7 +992,7 @@ void SvxPixelCtl::KeyInput( const KeyEvent& rKEvt ) if((aFocusPosition.getY() >= 1)) { aFocusPosition.setY( aFocusPosition.getY() - 1 ); - Invalidate(mRepaintRect); + Invalidate(aRepaintRect); bFocusPosChanged=true; } break; @@ -1000,7 +1000,7 @@ void SvxPixelCtl::KeyInput( const KeyEvent& rKEvt ) if( aFocusPosition.getY() < ( nLines - 1 ) ) { aFocusPosition.setY( aFocusPosition.getY() + 1 ); - Invalidate(mRepaintRect); + Invalidate(aRepaintRect); bFocusPosChanged=true; } break; diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index 3ff920eb0790..babd7ae740d1 100755 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -2336,9 +2336,9 @@ css::uno::Reference< css::awt::XWindowPeer > css::uno::Reference< css::awt::XWindowPeer > xPeer( Window::GetComponentInterface(false) ); if ( !xPeer.is() && bCreate ) { - css::awt::XWindowPeer* mxPeer = new VCLXSvxFindReplaceDialog(this); - SetComponentInterface(mxPeer); - return mxPeer; + css::awt::XWindowPeer* pPeer = new VCLXSvxFindReplaceDialog(this); + SetComponentInterface(pPeer); + return pPeer; } else return xPeer; diff --git a/svx/source/engine3d/obj3d.cxx b/svx/source/engine3d/obj3d.cxx index 4777944069e0..f4af93b60196 100644 --- a/svx/source/engine3d/obj3d.cxx +++ b/svx/source/engine3d/obj3d.cxx @@ -353,23 +353,23 @@ void E3dObject::NbcResize(const Point& rRef, const Fraction& xFact, const Fracti // build transform basegfx::B3DHomMatrix aInverseOrientation(aViewInfo3D.getOrientation()); aInverseOrientation.invert(); - basegfx::B3DHomMatrix mFullTransform(GetFullTransform()); - basegfx::B3DHomMatrix mTrans(mFullTransform); + basegfx::B3DHomMatrix aFullTransform(GetFullTransform()); + basegfx::B3DHomMatrix aTrans(aFullTransform); - mTrans *= aViewInfo3D.getOrientation(); - mTrans.translate(-aScaleCenter3D.getX(), -aScaleCenter3D.getY(), -aScaleCenter3D.getZ()); - mTrans.scale(fScaleX, fScaleY, 1.0); - mTrans.translate(aScaleCenter3D.getX(), aScaleCenter3D.getY(), aScaleCenter3D.getZ()); - mTrans *= aInverseOrientation; - mFullTransform.invert(); - mTrans *= mFullTransform; + aTrans *= aViewInfo3D.getOrientation(); + aTrans.translate(-aScaleCenter3D.getX(), -aScaleCenter3D.getY(), -aScaleCenter3D.getZ()); + aTrans.scale(fScaleX, fScaleY, 1.0); + aTrans.translate(aScaleCenter3D.getX(), aScaleCenter3D.getY(), aScaleCenter3D.getZ()); + aTrans *= aInverseOrientation; + aFullTransform.invert(); + aTrans *= aFullTransform; // Apply - basegfx::B3DHomMatrix mObjTrans(GetTransform()); - mObjTrans *= mTrans; + basegfx::B3DHomMatrix aObjTrans(GetTransform()); + aObjTrans *= aTrans; E3DModifySceneSnapRectUpdater aUpdater(this); - SetTransform(mObjTrans); + SetTransform(aObjTrans); } } @@ -386,11 +386,11 @@ void E3dObject::NbcMove(const Size& rSize) //Dimensions of the scene in 3D and 2D for comparison Rectangle aRect = pScene->GetSnapRect(); - basegfx::B3DHomMatrix mInvDispTransform; + basegfx::B3DHomMatrix aInvDispTransform; if(GetParentObj()) { - mInvDispTransform = GetParentObj()->GetFullTransform(); - mInvDispTransform.invert(); + aInvDispTransform = GetParentObj()->GetFullTransform(); + aInvDispTransform.invert(); } // BoundVolume from 3d world to 3d eye @@ -412,7 +412,7 @@ void E3dObject::NbcMove(const Size& rSize) // movement vector to local coordinates of objects' parent basegfx::B3DHomMatrix aInverseOrientation(aViewInfo3D.getOrientation()); aInverseOrientation.invert(); - basegfx::B3DHomMatrix aCompleteTrans(mInvDispTransform * aInverseOrientation); + basegfx::B3DHomMatrix aCompleteTrans(aInvDispTransform * aInverseOrientation); aMove = aCompleteTrans * aMove; aPos = aCompleteTrans * aPos; diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx index 2679bf40c0d5..a1b57725166b 100644 --- a/svx/source/sidebar/nbdtmg.cxx +++ b/svx/source/sidebar/nbdtmg.cxx @@ -166,7 +166,7 @@ void NBOTypeMgrBase::ImplLoad(const OUString& filename) if (nVersion==DEFAULT_NUMBERING_CACHE_FORMAT_VERSION) //first version { xIStm->ReadInt32( nNumIndex ); - sal_uInt16 mLevel = 0x1; + sal_uInt16 nLevel = 0x1; while (nNumIndex>=0 && nNumIndex<DEFAULT_NUM_VALUSET_COUNT) { SvxNumRule aNum(*xIStm); //bullet color in font properties is not stored correctly. Need set tranparency bits manually @@ -182,7 +182,7 @@ void NBOTypeMgrBase::ImplLoad(const OUString& filename) aNum.SetLevel(i, aFmt); } } - RelplaceNumRule(aNum,nNumIndex,mLevel); + RelplaceNumRule(aNum,nNumIndex,nLevel); xIStm->ReadInt32( nNumIndex ); } } @@ -209,9 +209,9 @@ void NBOTypeMgrBase::ImplStore(const OUString& filename) SvxNumRuleFlags::CHAR_TEXT_DISTANCE | SvxNumRuleFlags::SYMBOL_ALIGNMENT, 10, false, SvxNumRuleType::NUMBERING, SvxNumberFormat::LABEL_ALIGNMENT); - sal_uInt16 mLevel = 0x1; + sal_uInt16 nLevel = 0x1; xOStm->WriteInt32( nItem ); - ApplyNumRule(aDefNumRule,nItem,mLevel,false,true); + ApplyNumRule(aDefNumRule,nItem,nLevel,false,true); aDefNumRule.Store(*xOStm); } } diff --git a/svx/source/unodraw/UnoNameItemTable.cxx b/svx/source/unodraw/UnoNameItemTable.cxx index 9643a20ea04f..0dc2369cb78d 100644 --- a/svx/source/unodraw/UnoNameItemTable.cxx +++ b/svx/source/unodraw/UnoNameItemTable.cxx @@ -85,13 +85,13 @@ sal_Bool SAL_CALL SvxUnoNameItemTable::supportsService( const OUString& Service void SAL_CALL SvxUnoNameItemTable::ImplInsertByName( const OUString& aName, const uno::Any& aElement ) { - SfxItemSet* mpInSet = new SfxItemSet( *mpModelPool, mnWhich, mnWhich ); - maItemSetVector.push_back( mpInSet ); + SfxItemSet* pInSet = new SfxItemSet( *mpModelPool, mnWhich, mnWhich ); + maItemSetVector.push_back( pInSet ); std::unique_ptr<NameOrIndex> pNewItem(createItem()); pNewItem->SetName( aName ); pNewItem->PutValue( aElement, mnMemberId ); - mpInSet->Put( *pNewItem, mnWhich ); + pInSet->Put( *pNewItem, mnWhich ); } // XNameContainer diff --git a/svx/source/unodraw/unomtabl.cxx b/svx/source/unodraw/unomtabl.cxx index dda1e7c5f9cc..dc2eb3c808a8 100644 --- a/svx/source/unodraw/unomtabl.cxx +++ b/svx/source/unodraw/unomtabl.cxx @@ -148,20 +148,20 @@ uno::Sequence< OUString > SAL_CALL SvxUnoMarkerTable::getSupportedServiceNames( void SAL_CALL SvxUnoMarkerTable::ImplInsertByName( const OUString& aName, const uno::Any& aElement ) { - SfxItemSet* mpInSet = new SfxItemSet( *mpModelPool, XATTR_LINESTART, XATTR_LINEEND ); - maItemSetVector.push_back( mpInSet ); + SfxItemSet* pInSet = new SfxItemSet( *mpModelPool, XATTR_LINESTART, XATTR_LINEEND ); + maItemSetVector.push_back( pInSet ); XLineEndItem aEndMarker; aEndMarker.SetName( aName ); aEndMarker.PutValue( aElement, 0 ); - mpInSet->Put( aEndMarker, XATTR_LINEEND ); + pInSet->Put( aEndMarker, XATTR_LINEEND ); XLineStartItem aStartMarker; aStartMarker.SetName( aName ); aStartMarker.PutValue( aElement, 0 ); - mpInSet->Put( aStartMarker, XATTR_LINESTART ); + pInSet->Put( aStartMarker, XATTR_LINESTART ); } // XNameContainer diff --git a/sw/source/core/access/accfrmobj.cxx b/sw/source/core/access/accfrmobj.cxx index cbd7b518e486..c6986d9d9ac5 100644 --- a/sw/source/core/access/accfrmobj.cxx +++ b/sw/source/core/access/accfrmobj.cxx @@ -156,9 +156,9 @@ bool SwAccessibleChild::IsBoundAsChar() const } else if ( mpDrawObj ) { - const SwFrameFormat* mpFrameFormat = ::FindFrameFormat( mpDrawObj ); - bRet = mpFrameFormat - && (FLY_AS_CHAR == mpFrameFormat->GetAnchor().GetAnchorId()); + const SwFrameFormat* pFrameFormat = ::FindFrameFormat( mpDrawObj ); + bRet = pFrameFormat + && (FLY_AS_CHAR == pFrameFormat->GetAnchor().GetAnchorId()); } else if ( mpWindow ) { diff --git a/sw/source/core/crsr/trvltbl.cxx b/sw/source/core/crsr/trvltbl.cxx index dfd6da6b63f4..896893fe1c46 100644 --- a/sw/source/core/crsr/trvltbl.cxx +++ b/sw/source/core/crsr/trvltbl.cxx @@ -629,9 +629,9 @@ bool GotoCurrTable( SwPaM& rCurrentCursor, SwPosTable fnPosTable, bool SwCursor::MoveTable( SwWhichTable fnWhichTable, SwPosTable fnPosTable ) { bool bRet = false; - SwTableCursor* m_pTableCursor = dynamic_cast<SwTableCursor*>(this); + SwTableCursor* pTableCursor = dynamic_cast<SwTableCursor*>(this); - if( m_pTableCursor || !HasMark() ) + if( pTableCursor || !HasMark() ) { SwCursorSaveState aSaveState( *this ); bRet = (*fnWhichTable)( *this, fnPosTable, IsReadOnlyAvailable() ) && diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx index 1dcea3300233..aca03fb1f769 100644 --- a/sw/source/core/doc/docnew.cxx +++ b/sw/source/core/doc/docnew.cxx @@ -158,13 +158,13 @@ void StartGrammarChecking( SwDoc &rDoc ) { // check for a visible view bool bVisible = false; - const SwDocShell *mpDocShell = rDoc.GetDocShell(); - SfxViewFrame *pFrame = SfxViewFrame::GetFirst( mpDocShell, false ); + const SwDocShell *pDocShell = rDoc.GetDocShell(); + SfxViewFrame *pFrame = SfxViewFrame::GetFirst( pDocShell, false ); while (pFrame && !bVisible) { if (pFrame->IsVisible()) bVisible = true; - pFrame = SfxViewFrame::GetNext( *pFrame, mpDocShell, false ); + pFrame = SfxViewFrame::GetNext( *pFrame, pDocShell, false ); } //!! only documents with visible views need to be checked diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx index c3dc0f75e39a..8b3786d78bf7 100644 --- a/sw/source/core/edit/autofmt.cxx +++ b/sw/source/core/edit/autofmt.cxx @@ -2599,12 +2599,12 @@ void SwEditShell::AutoFormatBySplitNode() else { // then go one node backwards - SwNodeIndex m_aNdIdx( pCursor->GetMark()->nNode, -1 ); - SwTextNode* pTextNd = m_aNdIdx.GetNode().GetTextNode(); + SwNodeIndex aNdIdx( pCursor->GetMark()->nNode, -1 ); + SwTextNode* pTextNd = aNdIdx.GetNode().GetTextNode(); if (pTextNd && !pTextNd->GetText().isEmpty()) { pContent->Assign( pTextNd, 0 ); - pCursor->GetMark()->nNode = m_aNdIdx; + pCursor->GetMark()->nNode = aNdIdx; bRange = true; } } diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx index 599bef62d0a7..f65fe5b46f86 100644 --- a/sw/source/core/layout/wsfrm.cxx +++ b/sw/source/core/layout/wsfrm.cxx @@ -1974,15 +1974,15 @@ void SwContentFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem * pNew ) } _InvalidatePrt(); } - SwFrame* mpNextFrame = GetIndNext(); - if ( mpNextFrame && nInvFlags & 0x10) + SwFrame* pNextFrame = GetIndNext(); + if ( pNextFrame && nInvFlags & 0x10) { - mpNextFrame->_InvalidatePrt(); - mpNextFrame->InvalidatePage( pPage ); + pNextFrame->_InvalidatePrt(); + pNextFrame->InvalidatePage( pPage ); } - if ( mpNextFrame && nInvFlags & 0x80 ) + if ( pNextFrame && nInvFlags & 0x80 ) { - mpNextFrame->SetCompletePaint(); + pNextFrame->SetCompletePaint(); } if ( nInvFlags & 0x20 ) { diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx index 2b303329b048..95dadc18f664 100644 --- a/sw/source/core/text/inftxt.cxx +++ b/sw/source/core/text/inftxt.cxx @@ -840,31 +840,31 @@ static void lcl_DrawSpecial( const SwTextPaintInfo& rInf, const SwLinePortion& r const SwFont* pOldFnt = rInf.GetFont(); // Font is generated only once: - static SwFont* m_pFnt = nullptr; - if ( ! m_pFnt ) + static SwFont* s_pFnt = nullptr; + if ( ! s_pFnt ) { - m_pFnt = new SwFont( *pOldFnt ); - m_pFnt->SetFamily( FAMILY_DONTKNOW, m_pFnt->GetActual() ); - m_pFnt->SetName( numfunc::GetDefBulletFontname(), m_pFnt->GetActual() ); - m_pFnt->SetStyleName( aEmptyOUStr, m_pFnt->GetActual() ); - m_pFnt->SetCharSet( RTL_TEXTENCODING_SYMBOL, m_pFnt->GetActual() ); + s_pFnt = new SwFont( *pOldFnt ); + s_pFnt->SetFamily( FAMILY_DONTKNOW, s_pFnt->GetActual() ); + s_pFnt->SetName( numfunc::GetDefBulletFontname(), s_pFnt->GetActual() ); + s_pFnt->SetStyleName( aEmptyOUStr, s_pFnt->GetActual() ); + s_pFnt->SetCharSet( RTL_TEXTENCODING_SYMBOL, s_pFnt->GetActual() ); } // Some of the current values are set at the font: if ( ! bRotate ) - m_pFnt->SetVertical( 0, rInf.GetTextFrame()->IsVertical() ); + s_pFnt->SetVertical( 0, rInf.GetTextFrame()->IsVertical() ); else - m_pFnt->SetVertical( pOldFnt->GetOrientation() ); + s_pFnt->SetVertical( pOldFnt->GetOrientation() ); - m_pFnt->SetColor(rCol); + s_pFnt->SetColor(rCol); Size aFontSize( 0, SPECIAL_FONT_HEIGHT ); - m_pFnt->SetSize( aFontSize, m_pFnt->GetActual() ); + s_pFnt->SetSize( aFontSize, s_pFnt->GetActual() ); - const_cast<SwTextPaintInfo&>(rInf).SetFont( m_pFnt ); + const_cast<SwTextPaintInfo&>(rInf).SetFont( s_pFnt ); // The maximum width depends on the current orientation - const sal_uInt16 nDir = m_pFnt->GetOrientation( rInf.GetTextFrame()->IsVertical() ); + const sal_uInt16 nDir = s_pFnt->GetOrientation( rInf.GetTextFrame()->IsVertical() ); SwTwips nMaxWidth; if (nDir == 900 || nDir == 2700) nMaxWidth = rRect.Height(); @@ -883,14 +883,14 @@ static void lcl_DrawSpecial( const SwTextPaintInfo& rInf, const SwLinePortion& r const SwTwips nOldWidth = aFontSize.Width(); // new height for font - const SwFontScript nAct = m_pFnt->GetActual(); - aFontSize.Height() = ( 100 * m_pFnt->GetSize( nAct ).Height() ) / nFactor; - aFontSize.Width() = ( 100 * m_pFnt->GetSize( nAct).Width() ) / nFactor; + const SwFontScript nAct = s_pFnt->GetActual(); + aFontSize.Height() = ( 100 * s_pFnt->GetSize( nAct ).Height() ) / nFactor; + aFontSize.Width() = ( 100 * s_pFnt->GetSize( nAct).Width() ) / nFactor; if ( !aFontSize.Width() && !aFontSize.Height() ) break; - m_pFnt->SetSize( aFontSize, nAct ); + s_pFnt->SetSize( aFontSize, nAct ); aFontSize = rInf.GetTextSize( aTmp ).SvLSize(); diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx index cd1decb998e2..155004acf4b6 100644 --- a/sw/source/core/text/txtfrm.cxx +++ b/sw/source/core/text/txtfrm.cxx @@ -2227,7 +2227,7 @@ void SwTextFrame::_CalcHeightOfLastLine( const bool _bUseFont ) { // i#71281 // Invalidate printing area, if height of last line changes - const SwTwips mnOldHeightOfLastLine( mnHeightOfLastLine ); + const SwTwips nOldHeightOfLastLine( mnHeightOfLastLine ); // determine output device SwViewShell* pVsh = getRootFrame()->GetCurrShell(); @@ -2346,7 +2346,7 @@ void SwTextFrame::_CalcHeightOfLastLine( const bool _bUseFont ) } // i#71281 // invalidate printing area, if height of last line changes - if ( mnHeightOfLastLine != mnOldHeightOfLastLine ) + if ( mnHeightOfLastLine != nOldHeightOfLastLine ) { InvalidatePrt(); } diff --git a/sw/source/core/unocore/XMLRangeHelper.cxx b/sw/source/core/unocore/XMLRangeHelper.cxx index b06e726d75b6..8047e000f2c6 100644 --- a/sw/source/core/unocore/XMLRangeHelper.cxx +++ b/sw/source/core/unocore/XMLRangeHelper.cxx @@ -37,12 +37,12 @@ public: explicit lcl_Escape( OUStringBuffer & aResultBuffer ) : m_aResultBuffer( aResultBuffer ) {} void operator() ( sal_Unicode aChar ) { - static const sal_Unicode m_aQuote( '\'' ); - static const sal_Unicode m_aBackslash( '\\' ); + static const sal_Unicode s_aQuote( '\'' ); + static const sal_Unicode s_aBackslash( '\\' ); - if( aChar == m_aQuote || - aChar == m_aBackslash ) - m_aResultBuffer.append( m_aBackslash ); + if( aChar == s_aQuote || + aChar == s_aBackslash ) + m_aResultBuffer.append( s_aBackslash ); m_aResultBuffer.append( aChar ); } @@ -60,9 +60,9 @@ public: explicit lcl_UnEscape( OUStringBuffer & aResultBuffer ) : m_aResultBuffer( aResultBuffer ) {} void operator() ( sal_Unicode aChar ) { - static const sal_Unicode m_aBackslash( '\\' ); + static const sal_Unicode s_aBackslash( '\\' ); - if( aChar != m_aBackslash ) + if( aChar != s_aBackslash ) m_aResultBuffer.append( aChar ); } diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx index a040e992d9f8..9b2f278e6d67 100644 --- a/sw/source/core/unocore/unocoll.cxx +++ b/sw/source/core/unocore/unocoll.cxx @@ -126,8 +126,6 @@ public: for ( sal_Int32 i=0; i < sModuleNames.getLength(); ++i ) { - script::ModuleInfo mInfo; - if ( xVBAModuleInfo->hasModuleInfo( sModuleNames[ i ] ) && xVBAModuleInfo->getModuleInfo( sModuleNames[ i ] ).ModuleType == script::ModuleType::DOCUMENT ) { msThisDocumentCodeName = sModuleNames[ i ]; diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx index fce4122607db..c4c5ed21d0ef 100644 --- a/sw/source/core/unocore/unoframe.cxx +++ b/sw/source/core/unocore/unoframe.cxx @@ -3013,12 +3013,12 @@ void SwXFrame::attachToRange(const uno::Reference< text::XTextRange > & xTextRan // Not sure if these setParent() and InsertEmbeddedObject() calls are really // needed, it seems to work without, but logic from code elsewhere suggests // they should be done. - SfxObjectShell& mrPers = *pDoc->GetPersist(); + SfxObjectShell& rPers = *pDoc->GetPersist(); uno::Reference < container::XChild > xChild( obj, uno::UNO_QUERY ); if ( xChild.is() ) - xChild->setParent( mrPers.GetModel() ); + xChild->setParent( rPers.GetModel() ); OUString rName; - mrPers.GetEmbeddedObjectContainer().InsertEmbeddedObject( obj, rName ); + rPers.GetEmbeddedObjectContainer().InsertEmbeddedObject( obj, rName ); SwFlyFrameFormat* pFrameFormat = nullptr; pFrameFormat = pDoc->getIDocumentContentOperations().Insert( aPam, xObj, &aFrameSet, nullptr, nullptr ); diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx index 1ac6ae80164c..1b0086291e6f 100644 --- a/sw/source/filter/ww8/wrtw8esh.cxx +++ b/sw/source/filter/ww8/wrtw8esh.cxx @@ -178,14 +178,14 @@ void SwBasicEscherEx::WriteHyperlinkWithinFly( SvMemoryStream& rStrm, const SwFo { if ( !pINetFormatArg ) return; - sal_uInt8 maGuidStdLink[ 16 ] ={ + sal_uInt8 aGuidStdLink[ 16 ] ={ 0xD0, 0xC9, 0xEA, 0x79, 0xF9, 0xBA, 0xCE, 0x11, 0x8C, 0x82, 0x00, 0xAA, 0x00, 0x4B, 0xA9, 0x0B }; - sal_uInt8 maGuidUrlMoniker[ 16 ] = { + sal_uInt8 aGuidUrlMoniker[ 16 ] = { 0xE0, 0xC9, 0xEA, 0x79, 0xF9, 0xBA, 0xCE, 0x11, 0x8C, 0x82, 0x00, 0xAA, 0x00, 0x4B, 0xA9, 0x0B }; - sal_uInt8 maGuidFileMoniker[ 16 ] = { + sal_uInt8 aGuidFileMoniker[ 16 ] = { 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46 }; - sal_uInt8 maGuidFileTail[] = { + sal_uInt8 aGuidFileTail[] = { 0xFF, 0xFF, 0xAD, 0xDE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 @@ -202,7 +202,7 @@ void SwBasicEscherEx::WriteHyperlinkWithinFly( SvMemoryStream& rStrm, const SwFo OUString rUrl = pINetFormatArg->GetURL(); OUString rTarFrame = pINetFormatArg->GetTargetFrameName(); - sal_uInt32 mnFlags = 0; + sal_uInt32 nFlags = 0; INetURLObject aUrlObj( rUrl ); const INetProtocol eProtocol = aUrlObj.GetProtocol(); @@ -215,7 +215,7 @@ void SwBasicEscherEx::WriteHyperlinkWithinFly( SvMemoryStream& rStrm, const SwFo tmpStrm.WriteUInt16( 0 ); - mnFlags |= WW8_HLINK_FRAME; + nFlags |= WW8_HLINK_FRAME; } // file link or URL @@ -226,15 +226,15 @@ void SwBasicEscherEx::WriteHyperlinkWithinFly( SvMemoryStream& rStrm, const SwFo OUString aFileName( BuildFileName( nLevel, bRel, rUrl )); if( !bRel ) - mnFlags |= WW8_HLINK_ABS; + nFlags |= WW8_HLINK_ABS; - mnFlags |= WW8_HLINK_BODY; + nFlags |= WW8_HLINK_BODY; - tmpStrm.Write( maGuidFileMoniker,sizeof(maGuidFileMoniker) ); + tmpStrm.Write( aGuidFileMoniker,sizeof(aGuidFileMoniker) ); tmpStrm.WriteUInt16( nLevel ); SwWW8Writer::WriteLong(tmpStrm, aFileName.getLength()+1); SwWW8Writer::WriteString8( tmpStrm, aFileName, true, RTL_TEXTENCODING_MS_1252 ); - tmpStrm.Write( maGuidFileTail,sizeof(maGuidFileTail) ); + tmpStrm.Write( aGuidFileTail,sizeof(aGuidFileTail) ); //For UNICODE SwWW8Writer::WriteLong(tmpStrm, 2*aFileName.getLength()+6); @@ -244,11 +244,11 @@ void SwBasicEscherEx::WriteHyperlinkWithinFly( SvMemoryStream& rStrm, const SwFo } else if( eProtocol != INetProtocol::NotValid ) { - tmpStrm.Write( maGuidUrlMoniker,sizeof(maGuidUrlMoniker) ); + tmpStrm.Write( aGuidUrlMoniker,sizeof(aGuidUrlMoniker) ); SwWW8Writer::WriteLong(tmpStrm, 2*(rUrl.getLength()+1)); - SwWW8Writer::WriteString16(tmpStrm, rUrl, true); - mnFlags |= WW8_HLINK_BODY | WW8_HLINK_ABS; + SwWW8Writer::WriteString16(tmpStrm, rUrl, true); + nFlags |= WW8_HLINK_BODY | WW8_HLINK_ABS; } else if (rUrl[0] == '#' ) { @@ -267,12 +267,12 @@ void SwBasicEscherEx::WriteHyperlinkWithinFly( SvMemoryStream& rStrm, const SwFo SwWW8Writer::WriteLong(tmpStrm, tmpTextMark.getLength()+1); SwWW8Writer::WriteString16(tmpStrm, tmpTextMark, true); - mnFlags |= WW8_HLINK_MARK; + nFlags |= WW8_HLINK_MARK; } - rStrm.Write( maGuidStdLink,16 ); + rStrm.Write( aGuidStdLink,16 ); rStrm .WriteUInt32( 2 ) - .WriteUInt32( mnFlags ); + .WriteUInt32( nFlags ); tmpStrm.Seek( STREAM_SEEK_TO_BEGIN ); sal_uInt32 const nLen = tmpStrm.remainingSize(); if(nLen >0) diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 720c83c943ed..a6346c37a34f 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -278,10 +278,10 @@ void SwWW8ImplReader::ReadEmbeddedData( SvMemoryStream& rStrm, SwDocShell* pDocS //sal_uInt8 maGuidStdLink[ 16 ] ={ // 0xD0, 0xC9, 0xEA, 0x79, 0xF9, 0xBA, 0xCE, 0x11, 0x8C, 0x82, 0x00, 0xAA, 0x00, 0x4B, 0xA9, 0x0B }; - sal_uInt8 maGuidUrlMoniker[ 16 ] = { + sal_uInt8 aGuidUrlMoniker[ 16 ] = { 0xE0, 0xC9, 0xEA, 0x79, 0xF9, 0xBA, 0xCE, 0x11, 0x8C, 0x82, 0x00, 0xAA, 0x00, 0x4B, 0xA9, 0x0B }; - sal_uInt8 maGuidFileMoniker[ 16 ] = { + sal_uInt8 aGuidFileMoniker[ 16 ] = { 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46 }; sal_uInt8 aGuid[16]; @@ -320,7 +320,7 @@ void SwWW8ImplReader::ReadEmbeddedData( SvMemoryStream& rStrm, SwDocShell* pDocS { rStrm.Read( aGuid, 16); - if( (memcmp(aGuid, maGuidFileMoniker, 16) == 0) ) + if( (memcmp(aGuid, aGuidFileMoniker, 16) == 0) ) { rStrm.ReadUInt16( nLevel ); xShortName.reset( new OUString ); @@ -342,7 +342,7 @@ void SwWW8ImplReader::ReadEmbeddedData( SvMemoryStream& rStrm, SwDocShell* pDocS else lclGetAbsPath( *xShortName, nLevel, pDocShell); } - else if( (memcmp(aGuid, maGuidUrlMoniker, 16) == 0) ) + else if( (memcmp(aGuid, aGuidUrlMoniker, 16) == 0) ) { sal_uInt32 nStrLen(0); rStrm.ReadUInt32( nStrLen ); @@ -1149,22 +1149,22 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream& rSt, { SvMemoryStream aMemStream; struct HyperLinksTable hlStr; - sal_uInt16 mnRawRecId,mnRawRecSize; + sal_uInt16 nRawRecId,nRawRecSize; aMemStream.WriteUInt16( 0 ).WriteUInt16( nBufferSize ); // copy from DFF stream to memory stream ::std::vector< sal_uInt8 > aBuffer( nBufferSize ); sal_uInt8* pnData = &aBuffer.front(); - sal_uInt8 mnStreamSize; + sal_uInt8 nStreamSize; if( pnData && rSt.Read( pnData, nBufferSize ) == nBufferSize ) { aMemStream.Write( pnData, nBufferSize ); aMemStream.Seek( STREAM_SEEK_TO_END ); - mnStreamSize = aMemStream.Tell(); + nStreamSize = aMemStream.Tell(); aMemStream.Seek( STREAM_SEEK_TO_BEGIN ); - bool bRet = 4 <= mnStreamSize; + bool bRet = 4 <= nStreamSize; if( bRet ) - aMemStream.ReadUInt16( mnRawRecId ).ReadUInt16( mnRawRecSize ); + aMemStream.ReadUInt16( nRawRecId ).ReadUInt16( nRawRecSize ); SwDocShell* pDocShell = rReader.m_pDocShell; if(pDocShell) { diff --git a/sw/source/ui/chrdlg/numpara.cxx b/sw/source/ui/chrdlg/numpara.cxx index 80326edc2faa..c90136653180 100644 --- a/sw/source/ui/chrdlg/numpara.cxx +++ b/sw/source/ui/chrdlg/numpara.cxx @@ -366,11 +366,11 @@ bool SwParagraphNumTabPage::ExecuteEditNumStyle_Impl( pItems[ nCount++ ] = nullptr; - const SfxPoolItem* mpItem = rDispatcher.Execute( + const SfxPoolItem* pItem = rDispatcher.Execute( nId, SfxCallMode::SYNCHRON | SfxCallMode::RECORD | SfxCallMode::MODAL, pItems ); - if ( !mpItem ) + if ( !pItem ) return false; return true; diff --git a/sw/source/ui/misc/linenum.cxx b/sw/source/ui/misc/linenum.cxx index 5a30ab0f3977..789904392edd 100644 --- a/sw/source/ui/misc/linenum.cxx +++ b/sw/source/ui/misc/linenum.cxx @@ -39,8 +39,8 @@ static rtl::Reference<SwDocStyleSheet> lcl_getDocStyleSheet(const OUString& rName, SwWrtShell *pSh) { sal_uInt16 nFamily = SFX_STYLE_FAMILY_PARA; - SfxStyleSheetBasePool* mpBase = pSh->GetView().GetDocShell()->GetStyleSheetPool(); - SfxStyleSheetBase* pStyle = mpBase->Find(rName, (SfxStyleFamily)nFamily); + SfxStyleSheetBasePool* pBase = pSh->GetView().GetDocShell()->GetStyleSheetPool(); + SfxStyleSheetBase* pStyle = pBase->Find(rName, (SfxStyleFamily)nFamily); SAL_WARN_IF( !pStyle, "sw.ui", "Style not found" ); if(!pStyle) return nullptr; diff --git a/sw/source/ui/vba/vbaaddins.cxx b/sw/source/ui/vba/vbaaddins.cxx index 9d8e45d3410e..7d7e804b7d08 100644 --- a/sw/source/ui/vba/vbaaddins.cxx +++ b/sw/source/ui/vba/vbaaddins.cxx @@ -27,7 +27,7 @@ using namespace ::com::sun::star; static uno::Reference< container::XIndexAccess > lcl_getAddinCollection( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext ) { - XNamedObjectCollectionHelper< word::XAddin >::XNamedVec maAddins; + XNamedObjectCollectionHelper< word::XAddin >::XNamedVec aAddins; // first get the autoload addins in the directory STARTUP uno::Reference< lang::XMultiComponentFactory > xMCF( xContext->getServiceManager(), uno::UNO_QUERY_THROW ); @@ -45,14 +45,14 @@ static uno::Reference< container::XIndexAccess > lcl_getAddinCollection( const u OUString sUrl = sEntries[ index ]; if( !xSFA->isFolder( sUrl ) && sUrl.endsWithIgnoreAsciiCase( ".dot" ) ) { - maAddins.push_back( uno::Reference< word::XAddin >( new SwVbaAddin( xParent, xContext, sUrl ) ) ); + aAddins.push_back( uno::Reference< word::XAddin >( new SwVbaAddin( xParent, xContext, sUrl ) ) ); } } } // TODO: second get the customize addins in the org.openoffice.Office.Writer/GlobalTemplateList - uno::Reference< container::XIndexAccess > xAddinsAccess( new XNamedObjectCollectionHelper< word::XAddin >( maAddins ) ); + uno::Reference< container::XIndexAccess > xAddinsAccess( new XNamedObjectCollectionHelper< word::XAddin >( aAddins ) ); return xAddinsAccess; } diff --git a/sw/source/ui/vba/vbavariables.cxx b/sw/source/ui/vba/vbavariables.cxx index d77ce2a19d49..ba2e445bf735 100644 --- a/sw/source/ui/vba/vbavariables.cxx +++ b/sw/source/ui/vba/vbavariables.cxx @@ -27,14 +27,14 @@ using namespace ::com::sun::star; uno::Reference< container::XIndexAccess > createVariablesAccess( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< beans::XPropertyAccess >& xUserDefined ) throw ( uno::RuntimeException ) { // FIXME: the performance is poor? - XNamedObjectCollectionHelper< word::XVariable >::XNamedVec mVariables; + XNamedObjectCollectionHelper< word::XVariable >::XNamedVec aVariables; const uno::Sequence< beans::PropertyValue > props = xUserDefined->getPropertyValues(); sal_Int32 nCount = props.getLength(); - mVariables.reserve( nCount ); + aVariables.reserve( nCount ); for( sal_Int32 i=0; i < nCount; i++ ) - mVariables.push_back( uno::Reference< word::XVariable > ( new SwVbaVariable( xParent, xContext, xUserDefined, props[i].Name ) ) ); + aVariables.push_back( uno::Reference< word::XVariable > ( new SwVbaVariable( xParent, xContext, xUserDefined, props[i].Name ) ) ); - uno::Reference< container::XIndexAccess > xVariables( new XNamedObjectCollectionHelper< word::XVariable >( mVariables ) ); + uno::Reference< container::XIndexAccess > xVariables( new XNamedObjectCollectionHelper< word::XVariable >( aVariables ) ); return xVariables; } diff --git a/sw/source/uibase/uiview/viewport.cxx b/sw/source/uibase/uiview/viewport.cxx index b68af257e300..b33e775961e1 100644 --- a/sw/source/uibase/uiview/viewport.cxx +++ b/sw/source/uibase/uiview/viewport.cxx @@ -87,7 +87,7 @@ static void lcl_GetPos(SwView* pView, bool bBorder) { SwWrtShell &rSh = pView->GetWrtShell(); - const Size m_aDocSz( rSh.GetDocSize() ); + const Size aDocSz( rSh.GetDocSize() ); const long lBorder = bBorder ? DOCUMENTBORDER : DOCUMENTBORDER * 2; const bool bHori = pScrollbar->IsHoriScroll(); @@ -96,7 +96,7 @@ static void lcl_GetPos(SwView* pView, long lDelta = lPos - (bHori ? rSh.VisArea().Pos().X() : rSh.VisArea().Pos().Y()); - const long lSize = (bHori ? m_aDocSz.A() : m_aDocSz.B()) + lBorder; + const long lSize = (bHori ? aDocSz.A() : aDocSz.B()) + lBorder; // Should right or below are too much space, // then they must be subtracted out of the VisArea! long nTmp = pView->GetVisArea().Right()+lDelta; diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx index 476c95e36b30..165289ba089d 100644 --- a/sw/source/uibase/utlui/content.cxx +++ b/sw/source/uibase/utlui/content.cxx @@ -1418,7 +1418,7 @@ bool SwContentTree::Expand( SvTreeListEntry* pParent ) m_nHiddenBlock |= nOr; if((pCntType->GetType() == ContentTypeId::OUTLINE)) { - std::map< void*, bool > mCurrOutLineNodeMap; + std::map< void*, bool > aCurrOutLineNodeMap; SwWrtShell* pShell = GetWrtShell(); bool bBool = SvTreeListBox::Expand(pParent); @@ -1429,17 +1429,17 @@ bool SwContentTree::Expand( SvTreeListEntry* pParent ) { sal_Int32 nPos = static_cast<SwContent*>(pChild->GetUserData())->GetYPos(); void* key = static_cast<void*>(pShell->getIDocumentOutlineNodesAccess()->getOutlineNode( nPos )); - mCurrOutLineNodeMap.insert(std::map<void*, bool>::value_type( key, false ) ); + aCurrOutLineNodeMap.insert(std::map<void*, bool>::value_type( key, false ) ); std::map<void*, bool>::iterator iter = mOutLineNodeMap.find( key ); if( iter != mOutLineNodeMap.end() && mOutLineNodeMap[key]) { - mCurrOutLineNodeMap[key] = true; + aCurrOutLineNodeMap[key] = true; SvTreeListBox::Expand(pChild); } } pChild = Next(pChild); } - mOutLineNodeMap = mCurrOutLineNodeMap; + mOutLineNodeMap = aCurrOutLineNodeMap; return bBool; } diff --git a/ucb/source/ucp/cmis/cmis_content.cxx b/ucb/source/ucp/cmis/cmis_content.cxx index 7ea714f12175..e4c64352c2ca 100644 --- a/ucb/source/ucp/cmis/cmis_content.cxx +++ b/ucb/source/ucp/cmis/cmis_content.cxx @@ -187,8 +187,8 @@ namespace { uno::Sequence< OUString > seqValue; value >>= seqValue; - sal_Int32 m_nNumValue = seqValue.getLength( ); - for ( sal_Int32 i = 0; i < m_nNumValue; ++i ) + sal_Int32 nNumValue = seqValue.getLength( ); + for ( sal_Int32 i = 0; i < nNumValue; ++i ) { values.push_back( OUSTR_TO_STDSTR( seqValue[i] ) ); } @@ -198,8 +198,8 @@ namespace { uno::Sequence< sal_Bool > seqValue; value >>= seqValue; - sal_Int32 m_nNumValue = seqValue.getLength( ); - for ( sal_Int32 i = 0; i < m_nNumValue; ++i ) + sal_Int32 nNumValue = seqValue.getLength( ); + for ( sal_Int32 i = 0; i < nNumValue; ++i ) { values.push_back( OUSTR_TO_STDSTR( OUString::boolean( seqValue[i] ) ) ); } @@ -209,8 +209,8 @@ namespace { uno::Sequence< sal_Int64 > seqValue; value >>= seqValue; - sal_Int32 m_nNumValue = seqValue.getLength( ); - for ( sal_Int32 i = 0; i < m_nNumValue; ++i ) + sal_Int32 nNumValue = seqValue.getLength( ); + for ( sal_Int32 i = 0; i < nNumValue; ++i ) { values.push_back( OUSTR_TO_STDSTR( OUString::number( seqValue[i] ) ) ); } @@ -220,8 +220,8 @@ namespace { uno::Sequence< double > seqValue; value >>= seqValue; - sal_Int32 m_nNumValue = seqValue.getLength( ); - for ( sal_Int32 i = 0; i < m_nNumValue; ++i ) + sal_Int32 nNumValue = seqValue.getLength( ); + for ( sal_Int32 i = 0; i < nNumValue; ++i ) { values.push_back( OUSTR_TO_STDSTR( OUString::number( seqValue[i] ) ) ); } @@ -231,8 +231,8 @@ namespace { uno::Sequence< util::DateTime > seqValue; value >>= seqValue; - sal_Int32 m_nNumValue = seqValue.getLength( ); - for ( sal_Int32 i = 0; i < m_nNumValue; ++i ) + sal_Int32 nNumValue = seqValue.getLength( ); + for ( sal_Int32 i = 0; i < nNumValue; ++i ) { OUStringBuffer aBuffer; ::sax::Converter::convertDateTime( aBuffer, seqValue[i], nullptr ); diff --git a/ucb/source/ucp/file/filglob.cxx b/ucb/source/ucp/file/filglob.cxx index 1f34f8fdea68..5b1613d9df5f 100644 --- a/ucb/source/ucp/file/filglob.cxx +++ b/ucb/source/ucp/file/filglob.cxx @@ -564,12 +564,12 @@ namespace fileaccess { PropertyValue prop; prop.Name = "ResourceName"; prop.Handle = -1; - OUString m_aClashingName( + OUString aClashingName( rtl::Uri::decode( getTitle(aUncPath), rtl_UriDecodeWithCharset, RTL_TEXTENCODING_UTF8)); - prop.Value <<= m_aClashingName; + prop.Value <<= aClashingName; Sequence<Any> seq(1); seq[0] <<= prop; excep.Arguments = seq; diff --git a/ucb/source/ucp/file/filrset.cxx b/ucb/source/ucp/file/filrset.cxx index 3fdfe61eab71..acace4e175c5 100644 --- a/ucb/source/ucp/file/filrset.cxx +++ b/ucb/source/ucp/file/filrset.cxx @@ -217,12 +217,12 @@ XResultSet_impl::OneMore( osl::FileBase::RC err; bool IsRegular; OUString aUnqPath; - osl::DirectoryItem m_aDirIte; + osl::DirectoryItem aDirIte; uno::Reference< sdbc::XRow > aRow; while( true ) { - err = m_aFolder.getNextItem( m_aDirIte ); + err = m_aFolder.getNextItem( aDirIte ); if( err == osl::FileBase::E_NOENT || err == osl::FileBase::E_INVAL ) { @@ -233,7 +233,7 @@ XResultSet_impl::OneMore( else if( err == osl::FileBase::E_None ) { aRow = m_pMyShell->getv( - this, m_sProperty, m_aDirIte, aUnqPath, IsRegular ); + this, m_sProperty, aDirIte, aUnqPath, IsRegular ); if( m_nOpenMode == ucb::OpenMode::DOCUMENTS && IsRegular ) { diff --git a/vbahelper/source/vbahelper/vbadocumentsbase.cxx b/vbahelper/source/vbahelper/vbadocumentsbase.cxx index ca8aa5e41b12..230a7f022b1d 100644 --- a/vbahelper/source/vbahelper/vbadocumentsbase.cxx +++ b/vbahelper/source/vbahelper/vbadocumentsbase.cxx @@ -80,10 +80,10 @@ public: explicit DocumentsEnumImpl( const uno::Reference< uno::XComponentContext >& xContext ) throw ( uno::RuntimeException ) : m_xContext( xContext ) { uno::Reference< frame::XDesktop2 > xDesktop = frame::Desktop::create( m_xContext ); - uno::Reference< container::XEnumeration > mxComponents = xDesktop->getComponents()->createEnumeration(); - while( mxComponents->hasMoreElements() ) + uno::Reference< container::XEnumeration > xComponents = xDesktop->getComponents()->createEnumeration(); + while( xComponents->hasMoreElements() ) { - uno::Reference< frame::XModel > xNext( mxComponents->nextElement(), uno::UNO_QUERY ); + uno::Reference< frame::XModel > xNext( xComponents->nextElement(), uno::UNO_QUERY ); if ( xNext.is() ) m_documents.push_back( xNext ); } diff --git a/vbahelper/source/vbahelper/vbashapes.cxx b/vbahelper/source/vbahelper/vbashapes.cxx index 0126bfebabd4..fc66a1747c49 100644 --- a/vbahelper/source/vbahelper/vbashapes.cxx +++ b/vbahelper/source/vbahelper/vbashapes.cxx @@ -68,12 +68,12 @@ void ScVbaShapes::initBaseCollection() if ( m_xNameAccess.is() ) // already has NameAccess return; // no NameAccess then use ShapeCollectionHelper - XNamedObjectCollectionHelper< drawing::XShape >::XNamedVec mShapes; + XNamedObjectCollectionHelper< drawing::XShape >::XNamedVec aShapes; sal_Int32 nLen = m_xIndexAccess->getCount(); - mShapes.reserve( nLen ); + aShapes.reserve( nLen ); for ( sal_Int32 index=0; index<nLen; ++index ) - mShapes.push_back( uno::Reference< drawing::XShape >( m_xIndexAccess->getByIndex( index ) , uno::UNO_QUERY ) ); - uno::Reference< container::XIndexAccess > xShapes( new XNamedObjectCollectionHelper< drawing::XShape >( mShapes ) ); + aShapes.push_back( uno::Reference< drawing::XShape >( m_xIndexAccess->getByIndex( index ) , uno::UNO_QUERY ) ); + uno::Reference< container::XIndexAccess > xShapes( new XNamedObjectCollectionHelper< drawing::XShape >( aShapes ) ); m_xIndexAccess.set( xShapes, uno::UNO_QUERY ); m_xNameAccess.set( xShapes, uno::UNO_QUERY ); } @@ -138,7 +138,7 @@ ScVbaShapes::getShapesByArrayIndices( const uno::Any& Index ) throw (uno::Runti uno::Sequence< uno::Any > sIndices; aConverted >>= sIndices; - XNamedObjectCollectionHelper< drawing::XShape >::XNamedVec mShapes; + XNamedObjectCollectionHelper< drawing::XShape >::XNamedVec aShapes; sal_Int32 nElems = sIndices.getLength(); for( sal_Int32 index = 0; index < nElems; ++index ) { @@ -159,9 +159,9 @@ ScVbaShapes::getShapesByArrayIndices( const uno::Any& Index ) throw (uno::Runti } // populate map with drawing::XShapes if ( xShape.is() ) - mShapes.push_back( xShape ); + aShapes.push_back( xShape ); } - uno::Reference< container::XIndexAccess > xIndexAccess( new XNamedObjectCollectionHelper< drawing::XShape >( mShapes ) ); + uno::Reference< container::XIndexAccess > xIndexAccess( new XNamedObjectCollectionHelper< drawing::XShape >( aShapes ) ); return xIndexAccess; } diff --git a/vcl/opengl/program.cxx b/vcl/opengl/program.cxx index 340b10f6bb8f..c8b0583f56a2 100644 --- a/vcl/opengl/program.cxx +++ b/vcl/opengl/program.cxx @@ -278,8 +278,8 @@ void OpenGLProgram::SetTransform( (float) aYRel.getX()/nTexHeight, (float) aYRel.getY()/nTexHeight, 0, 0, 0, 0, 1, 0, (float) rNull.getX(), (float) rNull.getY(), 0, 1 }; - glm::mat4 mMatrix = glm::make_mat4( aValues ); - glUniformMatrix4fv( nUniform, 1, GL_FALSE, glm::value_ptr( mMatrix ) ); + glm::mat4 aMatrix = glm::make_mat4( aValues ); + glUniformMatrix4fv( nUniform, 1, GL_FALSE, glm::value_ptr( aMatrix ) ); CHECK_GL_ERROR(); } @@ -296,12 +296,12 @@ void OpenGLProgram::ApplyMatrix(float fWidth, float fHeight, float fPixelOffset) OString sProjectionMatrix("mvp"); GLuint nUniform = GetUniformLocation(sProjectionMatrix); - glm::mat4 mMVP = glm::ortho(0.0f, fWidth, fHeight, 0.0f, 0.0f, 1.0f); + glm::mat4 aMVP = glm::ortho(0.0f, fWidth, fHeight, 0.0f, 0.0f, 1.0f); if (fPixelOffset != 0.0f) - mMVP = glm::translate(mMVP, glm::vec3(fPixelOffset, fPixelOffset, 0.0f)); + aMVP = glm::translate(aMVP, glm::vec3(fPixelOffset, fPixelOffset, 0.0f)); - glUniformMatrix4fv(nUniform, 1, GL_FALSE, glm::value_ptr(mMVP)); + glUniformMatrix4fv(nUniform, 1, GL_FALSE, glm::value_ptr(aMVP)); CHECK_GL_ERROR(); } diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx index 6dce7e787b2e..9b973be74dff 100644 --- a/vcl/source/app/help.cxx +++ b/vcl/source/app/help.cxx @@ -584,8 +584,8 @@ void ImplSetHelpWindowPos( vcl::Window* pHelpWin, sal_uInt16 nHelpWinStyle, Quic Rectangle aScreenRect = pHelpWin->ImplGetFrameWindow()->GetDesktopRectPixel(); aPos = pHelpWin->GetParent()->ImplGetFrameWindow()->OutputToAbsoluteScreenPixel( aPos ); // get mouse screen coords - Point mPos( pHelpWin->GetParent()->ImplGetFrameWindow()->GetPointerPosPixel() ); - mPos = pHelpWin->GetParent()->ImplGetFrameWindow()->OutputToAbsoluteScreenPixel( mPos ); + Point aMousePos( pHelpWin->GetParent()->ImplGetFrameWindow()->GetPointerPosPixel() ); + aMousePos = pHelpWin->GetParent()->ImplGetFrameWindow()->OutputToAbsoluteScreenPixel( aMousePos ); if ( nHelpWinStyle == HELPWINSTYLE_QUICK ) { @@ -603,7 +603,7 @@ void ImplSetHelpWindowPos( vcl::Window* pHelpWin, sal_uInt16 nHelpWinStyle, Quic { // If it's the mouse position, move the window slightly // so the mouse pointer does not cover it - if ( aPos == mPos ) + if ( aPos == aMousePos ) { aPos.X() += 12; aPos.Y() += 16; @@ -665,15 +665,15 @@ void ImplSetHelpWindowPos( vcl::Window* pHelpWin, sal_uInt16 nHelpWinStyle, Quic // otherwise it would directly be closed due to a focus change... */ Rectangle aHelpRect( aPos, aSz ); - if( aHelpRect.IsInside( mPos ) ) + if( aHelpRect.IsInside( aMousePos ) ) { Point delta(2,2); Point pSize( aSz.Width(), aSz.Height() ); - Point pTest( mPos - pSize - delta ); + Point pTest( aMousePos - pSize - delta ); if( pTest.X() > aScreenRect.Left() && pTest.Y() > aScreenRect.Top() ) aPos = pTest; else - aPos = mPos + delta; + aPos = aMousePos + delta; } } diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx index 40b6161dd29c..de89a6c3336d 100644 --- a/vcl/source/control/scrbar.cxx +++ b/vcl/source/control/scrbar.cxx @@ -138,12 +138,12 @@ void ScrollBar::ImplUpdateRects( bool bUpdate ) mnStateFlags &= ~SCRBAR_STATE_BTN1_DISABLE; mnStateFlags &= ~SCRBAR_STATE_BTN2_DISABLE; - Rectangle& maTrackRect = mpData->maTrackRect; // TODO: remove when maTrackRect is no longer in mpData + Rectangle& aTrackRect = mpData->maTrackRect; // TODO: remove when maTrackRect is no longer in mpData if ( mnThumbPixRange ) { if ( GetStyle() & WB_HORZ ) { - maThumbRect.Left() = maTrackRect.Left()+mnThumbPixPos; + maThumbRect.Left() = aTrackRect.Left()+mnThumbPixPos; maThumbRect.Right() = maThumbRect.Left()+mnThumbPixSize-1; if ( !mnThumbPixPos ) maPage1Rect.Right() = RECT_EMPTY; @@ -154,12 +154,12 @@ void ScrollBar::ImplUpdateRects( bool bUpdate ) else { maPage2Rect.Left() = maThumbRect.Right()+1; - maPage2Rect.Right() = maTrackRect.Right(); + maPage2Rect.Right() = aTrackRect.Right(); } } else { - maThumbRect.Top() = maTrackRect.Top()+mnThumbPixPos; + maThumbRect.Top() = aTrackRect.Top()+mnThumbPixPos; maThumbRect.Bottom() = maThumbRect.Top()+mnThumbPixSize-1; if ( !mnThumbPixPos ) maPage1Rect.Bottom() = RECT_EMPTY; @@ -170,7 +170,7 @@ void ScrollBar::ImplUpdateRects( bool bUpdate ) else { maPage2Rect.Top() = maThumbRect.Bottom()+1; - maPage2Rect.Bottom() = maTrackRect.Bottom(); + maPage2Rect.Bottom() = aTrackRect.Bottom(); } } } @@ -178,24 +178,24 @@ void ScrollBar::ImplUpdateRects( bool bUpdate ) { if ( GetStyle() & WB_HORZ ) { - const long nSpace = maTrackRect.Right() - maTrackRect.Left(); + const long nSpace = aTrackRect.Right() - aTrackRect.Left(); if ( nSpace > 0 ) { - maPage1Rect.Left() = maTrackRect.Left(); - maPage1Rect.Right() = maTrackRect.Left() + (nSpace/2); + maPage1Rect.Left() = aTrackRect.Left(); + maPage1Rect.Right() = aTrackRect.Left() + (nSpace/2); maPage2Rect.Left() = maPage1Rect.Right() + 1; - maPage2Rect.Right() = maTrackRect.Right(); + maPage2Rect.Right() = aTrackRect.Right(); } } else { - const long nSpace = maTrackRect.Bottom() - maTrackRect.Top(); + const long nSpace = aTrackRect.Bottom() - aTrackRect.Top(); if ( nSpace > 0 ) { - maPage1Rect.Top() = maTrackRect.Top(); - maPage1Rect.Bottom() = maTrackRect.Top() + (nSpace/2); + maPage1Rect.Top() = aTrackRect.Top(); + maPage1Rect.Bottom() = aTrackRect.Top() + (nSpace/2); maPage2Rect.Top() = maPage1Rect.Bottom() + 1; - maPage2Rect.Bottom() = maTrackRect.Bottom(); + maPage2Rect.Bottom() = aTrackRect.Bottom(); } } } @@ -250,7 +250,7 @@ void ScrollBar::ImplCalc( bool bUpdate ) const Size aSize = GetOutputSizePixel(); const long nMinThumbSize = GetSettings().GetStyleSettings().GetMinThumbSize(); - Rectangle& maTrackRect = mpData->maTrackRect; // TODO: remove when maTrackRect is no longer in mpData + Rectangle& aTrackRect = mpData->maTrackRect; // TODO: remove when maTrackRect is no longer in mpData if ( mbCalcSize ) { Size aOldSize = getCurrentCalcSize(); @@ -279,18 +279,18 @@ void ScrollBar::ImplCalc( bool bUpdate ) if ( GetNativeControlRegion( CTRL_SCROLLBAR, PART_TRACK_HORZ_AREA, aControlRegion, ControlState::NONE, ImplControlValue(), OUString(), aBoundingRegion, aTrackRegion ) ) - maTrackRect = aTrackRegion; + aTrackRect = aTrackRegion; else - maTrackRect = Rectangle( maBtn1Rect.TopRight(), maBtn2Rect.BottomLeft() ); + aTrackRect = Rectangle( maBtn1Rect.TopRight(), maBtn2Rect.BottomLeft() ); // Check if available space is big enough for thumb ( min thumb size = ScrBar width/height ) - mnThumbPixRange = maTrackRect.Right() - maTrackRect.Left(); + mnThumbPixRange = aTrackRect.Right() - aTrackRect.Left(); if( mnThumbPixRange > 0 ) { - maPage1Rect.Left() = maTrackRect.Left(); + maPage1Rect.Left() = aTrackRect.Left(); maPage1Rect.Bottom() = maPage2Rect.Bottom() = - maThumbRect.Bottom() = maTrackRect.Bottom(); + maThumbRect.Bottom() = aTrackRect.Bottom(); } else { @@ -320,18 +320,18 @@ void ScrollBar::ImplCalc( bool bUpdate ) if ( GetNativeControlRegion( CTRL_SCROLLBAR, PART_TRACK_VERT_AREA, aControlRegion, ControlState::NONE, ImplControlValue(), OUString(), aBoundingRegion, aTrackRegion ) ) - maTrackRect = aTrackRegion; + aTrackRect = aTrackRegion; else - maTrackRect = Rectangle( maBtn1Rect.BottomLeft()+Point(0,1), maBtn2Rect.TopRight() ); + aTrackRect = Rectangle( maBtn1Rect.BottomLeft()+Point(0,1), maBtn2Rect.TopRight() ); // Check if available space is big enough for thumb - mnThumbPixRange = maTrackRect.Bottom() - maTrackRect.Top(); + mnThumbPixRange = aTrackRect.Bottom() - aTrackRect.Top(); if( mnThumbPixRange > 0 ) { - maPage1Rect.Top() = maTrackRect.Top(); + maPage1Rect.Top() = aTrackRect.Top(); maPage1Rect.Right() = maPage2Rect.Right() = - maThumbRect.Right() = maTrackRect.Right(); + maThumbRect.Right() = aTrackRect.Right(); } else { diff --git a/vcl/source/gdi/regionband.cxx b/vcl/source/gdi/regionband.cxx index 759c0121a62d..44663759e217 100644 --- a/vcl/source/gdi/regionband.cxx +++ b/vcl/source/gdi/regionband.cxx @@ -1233,25 +1233,25 @@ void RegionBand::GetRegionRectangles(RectangleVector& rTarget) const { // clear result vector rTarget.clear(); - ImplRegionBand* mpCurrRectBand = mpFirstBand; + ImplRegionBand* pCurrRectBand = mpFirstBand; Rectangle aRectangle; - while(mpCurrRectBand) + while(pCurrRectBand) { - ImplRegionBandSep* mpCurrRectBandSep = mpCurrRectBand->mpFirstSep; + ImplRegionBandSep* pCurrRectBandSep = pCurrRectBand->mpFirstSep; - aRectangle.Top() = mpCurrRectBand->mnYTop; - aRectangle.Bottom() = mpCurrRectBand->mnYBottom; + aRectangle.Top() = pCurrRectBand->mnYTop; + aRectangle.Bottom() = pCurrRectBand->mnYBottom; - while(mpCurrRectBandSep) + while(pCurrRectBandSep) { - aRectangle.Left() = mpCurrRectBandSep->mnXLeft; - aRectangle.Right() = mpCurrRectBandSep->mnXRight; + aRectangle.Left() = pCurrRectBandSep->mnXLeft; + aRectangle.Right() = pCurrRectBandSep->mnXRight; rTarget.push_back(aRectangle); - mpCurrRectBandSep = mpCurrRectBandSep->mpNextSep; + pCurrRectBandSep = pCurrRectBandSep->mpNextSep; } - mpCurrRectBand = mpCurrRectBand->mpNextBand; + pCurrRectBand = pCurrRectBand->mpNextBand; } } diff --git a/vcl/source/window/decoview.cxx b/vcl/source/window/decoview.cxx index 0d43be98f19e..4e75b536c608 100644 --- a/vcl/source/window/decoview.cxx +++ b/vcl/source/window/decoview.cxx @@ -955,11 +955,11 @@ Rectangle DecorationView::DrawFrame( const Rectangle& rRect, DrawFrameStyle nSty ImplDrawFrame( mpOutDev, aRect, mpOutDev->GetSettings().GetStyleSettings(), nStyle, nFlags ); else { - Color maOldLineColor = mpOutDev->GetLineColor(); - Color maOldFillColor = mpOutDev->GetFillColor(); + Color aOldLineColor = mpOutDev->GetLineColor(); + Color aOldFillColor = mpOutDev->GetFillColor(); ImplDrawFrame( mpOutDev, aRect, mpOutDev->GetSettings().GetStyleSettings(), nStyle, nFlags ); - mpOutDev->SetLineColor( maOldLineColor ); - mpOutDev->SetFillColor( maOldFillColor ); + mpOutDev->SetLineColor( aOldLineColor ); + mpOutDev->SetFillColor( aOldFillColor ); } } @@ -988,11 +988,11 @@ Rectangle DecorationView::DrawButton( const Rectangle& rRect, DrawButtonFlags nS mpOutDev->EnableMapMode( false ); } - const Color maOldLineColor = mpOutDev->GetLineColor(); - const Color maOldFillColor = mpOutDev->GetFillColor(); + const Color aOldLineColor = mpOutDev->GetLineColor(); + const Color aOldFillColor = mpOutDev->GetFillColor(); ImplDrawButton( mpOutDev, aRect, nStyle ); - mpOutDev->SetLineColor( maOldLineColor ); - mpOutDev->SetFillColor( maOldFillColor ); + mpOutDev->SetLineColor( aOldLineColor ); + mpOutDev->SetFillColor( aOldFillColor ); // keep border free, although it is used at default representation ++aRect.Left(); diff --git a/vcl/source/window/menuitemlist.cxx b/vcl/source/window/menuitemlist.cxx index d1042b4fb30b..5f73bc5b9615 100644 --- a/vcl/source/window/menuitemlist.cxx +++ b/vcl/source/window/menuitemlist.cxx @@ -198,13 +198,13 @@ MenuItemData* MenuItemList::SearchItem( sal_Int32 n = pData->aText.indexOf('~'); if ( n != -1 ) { - KeyCode mnKeyCode; - sal_Unicode mnUnicode = pData->aText[n+1]; + KeyCode nKeyCode; + sal_Unicode nUnicode = pData->aText[n+1]; vcl::Window* pDefWindow = ImplGetDefaultWindow(); if( ( pDefWindow - && pDefWindow->ImplGetFrame()->MapUnicodeToKeyCode( mnUnicode, - Application::GetSettings().GetUILanguageTag().getLanguageType(), mnKeyCode ) - && aKeyCode.GetCode() == mnKeyCode.GetCode() + && pDefWindow->ImplGetFrame()->MapUnicodeToKeyCode( nUnicode, + Application::GetSettings().GetUILanguageTag().getLanguageType(), nKeyCode ) + && aKeyCode.GetCode() == nKeyCode.GetCode() ) || ( ascii && rI18nHelper.MatchMnemonic( pData->aText, ascii ) @@ -258,14 +258,14 @@ size_t MenuItemList::GetItemCount( KeyCode aKeyCode ) const sal_Int32 n = pData->aText.indexOf('~'); if (n != -1) { - KeyCode mnKeyCode; + KeyCode nKeyCode; // if MapUnicodeToKeyCode fails or is unsupported we try the pure ascii mapping of the keycodes // so we have working shortcuts when ascii mnemonics are used vcl::Window* pDefWindow = ImplGetDefaultWindow(); if( ( pDefWindow && pDefWindow->ImplGetFrame()->MapUnicodeToKeyCode( pData->aText[n+1], - Application::GetSettings().GetUILanguageTag().getLanguageType(), mnKeyCode ) - && aKeyCode.GetCode() == mnKeyCode.GetCode() + Application::GetSettings().GetUILanguageTag().getLanguageType(), nKeyCode ) + && aKeyCode.GetCode() == nKeyCode.GetCode() ) || ( ascii && rI18nHelper.MatchMnemonic( pData->aText, ascii ) diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index 34c722f3c51f..09d35239204f 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -956,7 +956,7 @@ sal_uInt16 ToolBox::ImplTestLineSize( ToolBox* pThis, const Point& rPos ) void ToolBox::ImplLineSizing( ToolBox* pThis, const Point& rPos, Rectangle& rRect, sal_uInt16 nLineMode ) { - bool mbHorz; + bool bHorz; long nOneLineSize; long nCurSize; long nMaxSize; @@ -966,34 +966,34 @@ void ToolBox::ImplLineSizing( ToolBox* pThis, const Point& rPos, Rectangle& rRec if ( nLineMode & DOCK_LINERIGHT ) { nCurSize = rPos.X() - rRect.Left(); - mbHorz = false; + bHorz = false; } else if ( nLineMode & DOCK_LINEBOTTOM ) { nCurSize = rPos.Y() - rRect.Top(); - mbHorz = true; + bHorz = true; } else if ( nLineMode & DOCK_LINELEFT ) { nCurSize = rRect.Right() - rPos.X(); - mbHorz = false; + bHorz = false; } else if ( nLineMode & DOCK_LINETOP ) { nCurSize = rRect.Bottom() - rPos.Y(); - mbHorz = true; + bHorz = true; } else { OSL_FAIL( "ImplLineSizing: Trailing else" ); nCurSize = 0; - mbHorz = false; + bHorz = false; } Size aWinSize = pThis->GetSizePixel(); sal_uInt16 nMaxLines = (pThis->mnLines > pThis->mnCurLines) ? pThis->mnLines : pThis->mnCurLines; if ( nMaxLines > TB_MAXLINES ) nMaxLines = TB_MAXLINES; - if ( mbHorz ) + if ( bHorz ) { nOneLineSize = ImplCalcSize( pThis, 1 ).Height(); nMaxSize = pThis->maOutDockRect.GetHeight() - 20; @@ -1018,7 +1018,7 @@ void ToolBox::ImplLineSizing( ToolBox* pThis, const Point& rPos, Rectangle& rRec { i++; aSize = ImplCalcSize( pThis, i ); - if ( mbHorz ) + if ( bHorz ) nSize = aSize.Height(); else nSize = aSize.Width(); @@ -1026,7 +1026,7 @@ void ToolBox::ImplLineSizing( ToolBox* pThis, const Point& rPos, Rectangle& rRec { i--; aSize = ImplCalcSize( pThis, i ); - if ( mbHorz ) + if ( bHorz ) nSize = aSize.Height(); else nSize = aSize.Width(); @@ -4584,7 +4584,7 @@ void ToolBox::ToggleFloatingMode() if (!mpData) return; - bool mbOldHorz = mbHorz; + bool bOldHorz = mbHorz; if ( ImplIsFloatingMode() ) { @@ -4592,7 +4592,7 @@ void ToolBox::ToggleFloatingMode() meAlign = WindowAlign::Top; mbScroll = true; - if( mbOldHorz != mbHorz ) + if( bOldHorz != mbHorz ) mbCalc = true; // orientation was changed ! ImplSetMinMaxFloatSize( this ); @@ -4610,7 +4610,7 @@ void ToolBox::ToggleFloatingMode() ImplGetFrameWindow()->GetWindow( GetWindowType::Client )->GrabFocus(); } - if( mbOldHorz != mbHorz ) + if( bOldHorz != mbHorz ) { // if orientation changes, the toolbox has to be initialized again // to update the direction of the gradient diff --git a/vcl/unx/generic/app/i18n_cb.cxx b/vcl/unx/generic/app/i18n_cb.cxx index fe0207aff528..7fea53241df1 100644 --- a/vcl/unx/generic/app/i18n_cb.cxx +++ b/vcl/unx/generic/app/i18n_cb.cxx @@ -385,15 +385,15 @@ GetPreeditSpotLocation(XIC ic, XPointer client_data) // Send SalEventExtTextInputPos event to get spotlocation - SalExtTextInputPosEvent mPosEvent; + SalExtTextInputPosEvent aPosEvent; preedit_data_t* pPreeditData = reinterpret_cast<preedit_data_t*>(client_data); if( pPreeditData->pFrame ) - pPreeditData->pFrame->CallCallback(SALEVENT_EXTTEXTINPUTPOS, static_cast<void*>(&mPosEvent)); + pPreeditData->pFrame->CallCallback(SALEVENT_EXTTEXTINPUTPOS, static_cast<void*>(&aPosEvent)); XPoint point; - point.x = mPosEvent.mnX + mPosEvent.mnWidth; - point.y = mPosEvent.mnY + mPosEvent.mnHeight; + point.x = aPosEvent.mnX + aPosEvent.mnWidth; + point.y = aPosEvent.mnY + aPosEvent.mnHeight; XVaNestedList preedit_attr; preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &point, nullptr); diff --git a/vcl/unx/generic/app/i18n_im.cxx b/vcl/unx/generic/app/i18n_im.cxx index 7b88e3327a66..0f6672d6f6dd 100644 --- a/vcl/unx/generic/app/i18n_im.cxx +++ b/vcl/unx/generic/app/i18n_im.cxx @@ -387,20 +387,20 @@ SalI18N_InputMethod::FilterEvent( XEvent *pEvent, ::Window window ) * fix broken key release handling of some IMs */ XKeyEvent* pKeyEvent = &(pEvent->xkey); - static XKeyEventOp maLastKeyPress; + static XKeyEventOp s_aLastKeyPress; if (bFilterEvent) { if (pKeyEvent->type == KeyRelease) - bFilterEvent = !maLastKeyPress.match (*pKeyEvent); - maLastKeyPress.erase(); + bFilterEvent = !s_aLastKeyPress.match (*pKeyEvent); + s_aLastKeyPress.erase(); } else /* (!bFilterEvent) */ { if (pKeyEvent->type == KeyPress) - maLastKeyPress = *pKeyEvent; + s_aLastKeyPress = *pKeyEvent; else - maLastKeyPress.erase(); + s_aLastKeyPress.erase(); } return bFilterEvent; diff --git a/vcl/unx/generic/print/printerjob.cxx b/vcl/unx/generic/print/printerjob.cxx index 9266c820a584..ca68522a93da 100644 --- a/vcl/unx/generic/print/printerjob.cxx +++ b/vcl/unx/generic/print/printerjob.cxx @@ -273,10 +273,10 @@ PrinterJob::~PrinterJob () static void WriteLocalTimePS( osl::File *rFile ) { - TimeValue m_start_time, tLocal; + TimeValue aStartTime, tLocal; oslDateTime date_time; - if (osl_getSystemTime( &m_start_time ) && - osl_getLocalTimeFromSystemTime( &m_start_time, &tLocal ) && + if (osl_getSystemTime( &aStartTime ) && + osl_getLocalTimeFromSystemTime( &aStartTime, &tLocal ) && osl_getDateTimeFromTimeValue( &tLocal, &date_time )) { char ar[ 256 ]; diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx index 9b77a41a6dba..1c95e32ba3dd 100644 --- a/vcl/workben/vcldemo.cxx +++ b/vcl/workben/vcldemo.cxx @@ -404,7 +404,7 @@ public: else aText = aLatinText; - std::vector<OUString> maFontNames; + std::vector<OUString> aFontNames; sal_uInt32 nCols[] = { COL_BLACK, COL_BLUE, COL_GREEN, COL_CYAN, COL_RED, COL_MAGENTA, @@ -420,7 +420,7 @@ public: size_t nNumFontNames = SAL_N_ELEMENTS(pNames); for (size_t i = 0; i < nNumFontNames; i++) - maFontNames.push_back(OUString::createFromAscii(pNames[i])); + aFontNames.push_back(OUString::createFromAscii(pNames[i])); if (bClip && !bRotate) { @@ -445,12 +445,12 @@ public: { // random font size to avoid buffering nFontHeight = 1 + i * (0.9 + comphelper::rng::uniform_real_distribution(0.0, std::nextafter(0.1, DBL_MAX))) * (r.Top() - r.Bottom()) / nPrintNumCopies; - nFontIndex = (i % maFontNames.size()); - nFontColorIndex=(i % maFontNames.size()); + nFontIndex = (i % aFontNames.size()); + nFontColorIndex=(i % aFontNames.size()); } rDev.SetTextColor(Color(nCols[nFontColorIndex])); - vcl::Font aFont( maFontNames[nFontIndex], Size(0, nFontHeight )); + vcl::Font aFont( aFontNames[nFontIndex], Size(0, nFontHeight )); if (bRotate) { diff --git a/xmloff/source/chart/SchXMLChartContext.cxx b/xmloff/source/chart/SchXMLChartContext.cxx index 2c6c6bd7823c..3a05c5c61b14 100644 --- a/xmloff/source/chart/SchXMLChartContext.cxx +++ b/xmloff/source/chart/SchXMLChartContext.cxx @@ -1149,7 +1149,7 @@ void SchXMLTitleContext::StartElement( const uno::Reference< xml::sax::XAttribut { sal_Int16 nAttrCount = xAttrList.is()? xAttrList->getLength(): 0; - css::awt::Point maPosition; + css::awt::Point aPosition; bool bHasXPosition=false; bool bHasYPosition=false; @@ -1165,13 +1165,13 @@ void SchXMLTitleContext::StartElement( const uno::Reference< xml::sax::XAttribut if( IsXMLToken( aLocalName, XML_X ) ) { GetImport().GetMM100UnitConverter().convertMeasureToCore( - maPosition.X, aValue ); + aPosition.X, aValue ); bHasXPosition = true; } else if( IsXMLToken( aLocalName, XML_Y ) ) { GetImport().GetMM100UnitConverter().convertMeasureToCore( - maPosition.Y, aValue ); + aPosition.Y, aValue ); bHasYPosition = true; } } @@ -1185,7 +1185,7 @@ void SchXMLTitleContext::StartElement( const uno::Reference< xml::sax::XAttribut if( mxTitleShape.is()) { if( bHasXPosition && bHasYPosition ) - mxTitleShape->setPosition( maPosition ); + mxTitleShape->setPosition( aPosition ); uno::Reference< beans::XPropertySet > xProp( mxTitleShape, uno::UNO_QUERY ); if( xProp.is()) diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx index 7034d75850cf..f3e897eae52b 100644 --- a/xmloff/source/core/xmlimp.cxx +++ b/xmloff/source/core/xmlimp.cxx @@ -413,9 +413,6 @@ void SvXMLImport::InitCtor_() mxEventListener.set(new SvXMLImportEventListener(this)); mxModel->addEventListener(mxEventListener); } - - ::comphelper::UnoInterfaceToUniqueIdentifierMapper maInterfaceToIdentifierMapper; - } SvXMLImport::SvXMLImport( diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx index 4577f7256e56..a305be733999 100644 --- a/xmloff/source/draw/shapeexport.cxx +++ b/xmloff/source/draw/shapeexport.cxx @@ -585,7 +585,7 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape sal_Int32 nZIndex = 0; uno::Reference< beans::XPropertySet > xSet( xShape, uno::UNO_QUERY ); - std::unique_ptr< SvXMLElementExport > mpHyperlinkElement; + std::unique_ptr< SvXMLElementExport > pHyperlinkElement; // export hyperlinks with <a><shape/></a>. Currently only in draw since draw // does not support document events @@ -605,7 +605,7 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_HREF, sURL ); mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE ); mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_SHOW, XML_EMBED ); - mpHyperlinkElement.reset( new SvXMLElementExport(mrExport, XML_NAMESPACE_DRAW, XML_A, true, true) ); + pHyperlinkElement.reset( new SvXMLElementExport(mrExport, XML_NAMESPACE_DRAW, XML_A, true, true) ); } } } @@ -935,7 +935,7 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape } } - mpHyperlinkElement.reset(); + pHyperlinkElement.reset(); // #97489# #97111# // if there was an error and no element for the shape was exported diff --git a/xmloff/source/xforms/xformsapi.cxx b/xmloff/source/xforms/xformsapi.cxx index 5916051b3a07..17383a4908b9 100644 --- a/xmloff/source/xforms/xformsapi.cxx +++ b/xmloff/source/xforms/xformsapi.cxx @@ -197,14 +197,14 @@ sal_uInt16 xforms_getTypeClass( OUString sLocalName; sal_uInt16 nPrefix = rNamespaceMap.GetKeyByAttrName(rXMLName, &sLocalName); SvXMLTokenMap aMap( aTypes ); - sal_uInt16 mnToken = aMap.Get( nPrefix, sLocalName ); + sal_uInt16 nToken = aMap.Get( nPrefix, sLocalName ); sal_uInt16 nTypeClass = css::xsd::DataTypeClass::STRING; - if( mnToken != XML_TOK_UNKNOWN ) + if( nToken != XML_TOK_UNKNOWN ) { // we found an XSD name: then get the proper API name for it DBG_ASSERT( xRepository.is(), "can't find type without repository"); - switch( mnToken ) + switch( nToken ) { case XML_STRING: nTypeClass = css::xsd::DataTypeClass::STRING; @@ -267,8 +267,8 @@ OUString xforms_getTypeName( OUString sLocalName; sal_uInt16 nPrefix = rNamespaceMap.GetKeyByAttrName(rXMLName, &sLocalName); SvXMLTokenMap aMap( aTypes ); - sal_uInt16 mnToken = aMap.Get( nPrefix, sLocalName ); - return ( mnToken == XML_TOK_UNKNOWN ) + sal_uInt16 nToken = aMap.Get( nPrefix, sLocalName ); + return ( nToken == XML_TOK_UNKNOWN ) ? rXMLName : xforms_getBasicTypeName( xRepository, rNamespaceMap, rXMLName ); } |