teach stylepolice plugin about ref-counted-pointer naming

Change-Id: I6e91d22fc1826038c05ddb6fc065563c6a250752
Reviewed-on: https://gerrit.libreoffice.org/24459
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>

8 files changed, 74 insertions, 74 deletions

diff --git a/sc/source/core/tool/interpr8.cxx b/sc/source/core/tool/interpr8.cxx
index 2c117346fbaa..321929a5422b 100644
--- a/sc/source/core/tool/interpr8.cxx
+++ b/sc/source/core/tool/interpr8.cxx
@@ -1534,14 +1534,14 @@ void ScInterpreter::ScTextJoin_MS()
             pStack[ sp - 1 - i ] = p;
         }
 
-        // get xDelimiter and bSkipEmpty
-        std::vector< OUString > xDelimiter;
+        // get aDelimiters and bSkipEmpty
+        std::vector< OUString > aDelimiters;
         size_t nRefInList = 0;
         switch ( GetStackType() )
         {
             case svString:
             case svDouble:
-                xDelimiter.push_back( PopString().getString() );
+                aDelimiters.push_back( PopString().getString() );
                 break;
             case svSingleRef :
             {
@@ -1553,11 +1553,11 @@ void ScInterpreter::ScTextJoin_MS()
                 if ( !aCell.isEmpty() )
                 {
                     if ( aCell.hasString() )
-                        xDelimiter.push_back( aCell.getString( pDok ) );
+                        aDelimiters.push_back( aCell.getString( pDok ) );
                     else
                     {
                         if ( !aCell.hasEmptyValue() )
-                            xDelimiter.push_back( OUString::number( aCell.getValue() ) );
+                            aDelimiters.push_back( OUString::number( aCell.getValue() ) );
                     }
                 }
             }
@@ -1595,15 +1595,15 @@ void ScInterpreter::ScTextJoin_MS()
                         if ( !aCell.isEmpty() )
                         {
                             if ( aCell.hasString() )
-                                xDelimiter.push_back( aCell.getString( pDok ) );
+                                aDelimiters.push_back( aCell.getString( pDok ) );
                             else
                             {
                                 if ( !aCell.hasEmptyValue() )
-                                    xDelimiter.push_back( OUString::number( aCell.getValue() ) );
+                                    aDelimiters.push_back( OUString::number( aCell.getValue() ) );
                             }
                         }
                         else
-                            xDelimiter.push_back( "" );
+                            aDelimiters.push_back( "" );
                     }
                 }
             }
@@ -1628,15 +1628,15 @@ void ScInterpreter::ScTextJoin_MS()
                                 if ( !pMat->IsEmpty( j, k ) )
                                 {
                                     if ( pMat->IsString( j, k ) )
-                                        xDelimiter.push_back( pMat->GetString( j, k ).getString() );
+                                        aDelimiters.push_back( pMat->GetString( j, k ).getString() );
                                     else
                                     {
                                         if ( pMat->IsValue( j, k ) )
-                                            xDelimiter.push_back( OUString::number( pMat->GetDouble( j, k ) ) );
+                                            aDelimiters.push_back( OUString::number( pMat->GetDouble( j, k ) ) );
                                     }
                                 }
                                 else
-                                    xDelimiter.push_back( "" );
+                                    aDelimiters.push_back( "" );
                             }
                         }
                     }
@@ -1648,12 +1648,12 @@ void ScInterpreter::ScTextJoin_MS()
                 SetError( errIllegalArgument);
                 break;
         }
-        if ( xDelimiter.empty() )
+        if ( aDelimiters.empty() )
         {
             PushIllegalArgument();
             return;
         }
-        SCSIZE nSize = xDelimiter.size();
+        SCSIZE nSize = aDelimiters.size();
         bool bSkipEmpty = static_cast< bool >( GetDouble() );
         nParamCount -= 2;
 
@@ -1674,7 +1674,7 @@ void ScInterpreter::ScTextJoin_MS()
                     {
                         if ( !bFirst )
                         {
-                            aResBuf.append( xDelimiter[ nIdx ] );
+                            aResBuf.append( aDelimiters[ nIdx ] );
                             if ( nSize > 1 )
                             {
                                 if ( ++nIdx >= nSize )
@@ -1711,7 +1711,7 @@ void ScInterpreter::ScTextJoin_MS()
                     {
                         if ( !bFirst )
                         {
-                            aResBuf.append( xDelimiter[ nIdx ] );
+                            aResBuf.append( aDelimiters[ nIdx ] );
                             if ( nSize > 1 )
                             {
                                 if ( ++nIdx >= nSize )
@@ -1771,7 +1771,7 @@ void ScInterpreter::ScTextJoin_MS()
                             {
                                 if ( !bFirst )
                                 {
-                                    aResBuf.append( xDelimiter[ nIdx ] );
+                                    aResBuf.append( aDelimiters[ nIdx ] );
                                     if ( nSize > 1 )
                                     {
                                         if ( ++nIdx >= nSize )
@@ -1820,7 +1820,7 @@ void ScInterpreter::ScTextJoin_MS()
                                     {
                                         if ( !bFirst )
                                         {
-                                            aResBuf.append( xDelimiter[ nIdx ] );
+                                            aResBuf.append( aDelimiters[ nIdx ] );
                                             if ( nSize > 1 )
                                             {
                                                 if ( ++nIdx >= nSize )
@@ -1842,7 +1842,7 @@ void ScInterpreter::ScTextJoin_MS()
                     {
                         if ( !bFirst )
                         {
-                            aResBuf.append( xDelimiter[ nIdx ] );
+                            aResBuf.append( aDelimiters[ nIdx ] );
                             if ( nSize > 1 )
                             {
                                 if ( ++nIdx >= nSize )
diff --git a/sc/source/filter/excel/excdoc.cxx b/sc/source/filter/excel/excdoc.cxx
index e0819bbdeaf9..a1a2a75443d4 100644
--- a/sc/source/filter/excel/excdoc.cxx
+++ b/sc/source/filter/excel/excdoc.cxx
@@ -661,8 +661,8 @@ void ExcTable::FillAsTableXml()
 
     // list of HLINK records, generated by the cell table
     XclExpRecordRef xHyperlinks = mxCellTable->CreateRecord( EXC_ID_HLINK );
-    XclExpHyperlinkList* xHyperlinkList = dynamic_cast<XclExpHyperlinkList*>(xHyperlinks.get());
-    if( xHyperlinkList != nullptr && !xHyperlinkList->IsEmpty() )
+    XclExpHyperlinkList* pHyperlinkList = dynamic_cast<XclExpHyperlinkList*>(xHyperlinks.get());
+    if( pHyperlinkList != nullptr && !pHyperlinkList->IsEmpty() )
     {
         aRecList.AppendNewRecord( new XclExpXmlStartElementRecord( XML_hyperlinks ) );
         aRecList.AppendRecord( xHyperlinks );
diff --git a/sc/source/filter/excel/xelink.cxx b/sc/source/filter/excel/xelink.cxx
index 62f1735603ba..4b91c2a9b43b 100644
--- a/sc/source/filter/excel/xelink.cxx
+++ b/sc/source/filter/excel/xelink.cxx
@@ -2089,13 +2089,13 @@ void XclExpSupbookBuffer::SaveXml( XclExpXmlStream& rStrm )
 
         sal_uInt16 nId = xRef->GetFileId();
         const OUString& rUrl = xRef->GetUrl();
-        ::std::pair< ::std::map< sal_uInt16, OUString >::iterator, bool > xInsert(
+        ::std::pair< ::std::map< sal_uInt16, OUString >::iterator, bool > aInsert(
                 aMap.insert( ::std::make_pair( nId, rUrl)));
-        if (!xInsert.second)
+        if (!aInsert.second)
         {
             SAL_WARN( "sc.filter", "XclExpSupbookBuffer::SaveXml: file ID already used: " << nId <<
-                    " wanted for " << rUrl << " and is " << (*xInsert.first).second <<
-                    (rUrl == (*xInsert.first).second ? " multiple Supbook not supported" : ""));
+                    " wanted for " << rUrl << " and is " << (*aInsert.first).second <<
+                    (rUrl == (*aInsert.first).second ? " multiple Supbook not supported" : ""));
             continue;
         }
 
diff --git a/sc/source/filter/excel/xichart.cxx b/sc/source/filter/excel/xichart.cxx
index a9ed30120401..09bd891da9c5 100644
--- a/sc/source/filter/excel/xichart.cxx
+++ b/sc/source/filter/excel/xichart.cxx
@@ -2740,8 +2740,8 @@ bool XclImpChTypeGroup::HasConnectorLines() const
     // existence of connector lines (only in stacked bar charts)
     if ( !(maType.IsStacked() || maType.IsPercent()) || (maTypeInfo.meTypeCateg != EXC_CHTYPECATEG_BAR) )
         return false;
-    XclImpChLineFormatMap::const_iterator xConLine = m_ChartLines.find(EXC_CHCHARTLINE_CONNECT);
-    return (xConLine != m_ChartLines.end() && xConLine->second.HasLine());
+    XclImpChLineFormatMap::const_iterator aConLine = m_ChartLines.find(EXC_CHCHARTLINE_CONNECT);
+    return (aConLine != m_ChartLines.end() && aConLine->second.HasLine());
 }
 
 OUString XclImpChTypeGroup::GetSingleSeriesTitle() const
@@ -2817,9 +2817,9 @@ void XclImpChTypeGroup::ReadChChartLine( XclImpStream& rStrm )
     sal_uInt16 nLineId = rStrm.ReaduInt16();
     if( (rStrm.GetNextRecId() == EXC_ID_CHLINEFORMAT) && rStrm.StartNextRecord() )
     {
-        XclImpChLineFormat xLineFmt;
-        xLineFmt.ReadChLineFormat( rStrm );
-        m_ChartLines[ nLineId ] = xLineFmt;
+        XclImpChLineFormat aLineFmt;
+        aLineFmt.ReadChLineFormat( rStrm );
+        m_ChartLines[ nLineId ] = aLineFmt;
     }
 }
 
@@ -2919,11 +2919,11 @@ void XclImpChTypeGroup::CreateStockSeries( Reference< XChartType > xChartType, s
         aTypeProp.SetBoolProperty( EXC_CHPROP_SHOWFIRST, HasDropBars() );
         aTypeProp.SetBoolProperty( EXC_CHPROP_SHOWHIGHLOW, true );
         // hi-lo line format
-        XclImpChLineFormatMap::const_iterator xHiLoLine = m_ChartLines.find( EXC_CHCHARTLINE_HILO );
-        if (xHiLoLine != m_ChartLines.end())
+        XclImpChLineFormatMap::const_iterator aHiLoLine = m_ChartLines.find( EXC_CHCHARTLINE_HILO );
+        if (aHiLoLine != m_ChartLines.end())
         {
             ScfPropertySet aSeriesProp( xDataSeries );
-            xHiLoLine->second.Convert( GetChRoot(), aSeriesProp, EXC_CHOBJTYPE_HILOLINE );
+            aHiLoLine->second.Convert( GetChRoot(), aSeriesProp, EXC_CHOBJTYPE_HILOLINE );
         }
         // white dropbar format
         XclImpChDropBarMap::const_iterator itr = m_DropBars.find(EXC_CHDROPBAR_UP);
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index b38de6979951..2c33b961cdce 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -1975,9 +1975,9 @@ void ScXMLExport::AddStyleFromCells(const uno::Reference<beans::XPropertySet>& x
     OUString sStyleName;
     sal_Int32 nNumberFormat(-1);
     sal_Int32 nValidationIndex(-1);
-    std::vector< XMLPropertyState > xPropStates(xCellStylesExportPropertySetMapper->Filter( xProperties ));
-    std::vector< XMLPropertyState >::iterator aItr(xPropStates.begin());
-    std::vector< XMLPropertyState >::iterator aEndItr(xPropStates.end());
+    std::vector< XMLPropertyState > aPropStates(xCellStylesExportPropertySetMapper->Filter( xProperties ));
+    std::vector< XMLPropertyState >::iterator aItr(aPropStates.begin());
+    std::vector< XMLPropertyState >::iterator aEndItr(aPropStates.end());
     sal_Int32 nCount(0);
     while (aItr != aEndItr)
     {
@@ -1992,8 +1992,8 @@ void ScXMLExport::AddStyleFromCells(const uno::Reference<beans::XPropertySet>& x
                     // if it is not the last property it is the property before the last property,
                     // so in the worst case only one property has to be copied, but in the best case no
                     // property has to be copied
-                    aItr = xPropStates.erase(aItr);
-                    aEndItr = xPropStates.end();    // old aEndItr is invalidated!
+                    aItr = aPropStates.erase(aItr);
+                    aEndItr = aPropStates.end();    // old aEndItr is invalidated!
                 }
                 break;
                 case CTF_SC_CELLSTYLE :
@@ -2027,17 +2027,17 @@ void ScXMLExport::AddStyleFromCells(const uno::Reference<beans::XPropertySet>& x
         }
     }
     if (nCount == 1) // this is the CellStyle and should be removed if alone
-        xPropStates.clear();
+        aPropStates.clear();
     if (nNumberFormat == -1)
         xProperties->getPropertyValue(SC_NUMBERFORMAT) >>= nNumberFormat;
     if (!sStyleName.isEmpty())
     {
-        if (!xPropStates.empty())
+        if (!aPropStates.empty())
         {
             sal_Int32 nIndex;
             if (pOldName)
             {
-                if (GetAutoStylePool()->AddNamed(*pOldName, XML_STYLE_FAMILY_TABLE_CELL, sStyleName, xPropStates))
+                if (GetAutoStylePool()->AddNamed(*pOldName, XML_STYLE_FAMILY_TABLE_CELL, sStyleName, aPropStates))
                 {
                     GetAutoStylePool()->RegisterName(XML_STYLE_FAMILY_TABLE_CELL, *pOldName);
                     // add to pCellStyles, so the name is found for normal sheets
@@ -2050,7 +2050,7 @@ void ScXMLExport::AddStyleFromCells(const uno::Reference<beans::XPropertySet>& x
             {
                 OUString sName;
                 bool bIsAutoStyle(true);
-                if (GetAutoStylePool()->Add(sName, XML_STYLE_FAMILY_TABLE_CELL, sStyleName, xPropStates))
+                if (GetAutoStylePool()->Add(sName, XML_STYLE_FAMILY_TABLE_CELL, sStyleName, aPropStates))
                 {
                     OUString* pTemp(new OUString(sName));
                     if (!pCellStyles->AddStyleName(pTemp, nIndex))
@@ -2107,11 +2107,11 @@ void ScXMLExport::AddStyleFromColumn(const uno::Reference<beans::XPropertySet>&
 {
     OUString SC_SCOLUMNPREFIX(XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_PREFIX);
 
-    std::vector<XMLPropertyState> xPropStates(xColumnStylesExportPropertySetMapper->Filter(xColumnProperties));
-    if(!xPropStates.empty())
+    std::vector<XMLPropertyState> aPropStates(xColumnStylesExportPropertySetMapper->Filter(xColumnProperties));
+    if(!aPropStates.empty())
     {
-        std::vector< XMLPropertyState >::iterator aItr(xPropStates.begin());
-        std::vector< XMLPropertyState >::iterator aEndItr(xPropStates.end());
+        std::vector< XMLPropertyState >::iterator aItr(aPropStates.begin());
+        std::vector< XMLPropertyState >::iterator aEndItr(aPropStates.end());
         while (aItr != aEndItr)
         {
             if (xColumnStylesPropertySetMapper->GetEntryContextId(aItr->mnIndex) == CTF_SC_ISVISIBLE)
@@ -2125,7 +2125,7 @@ void ScXMLExport::AddStyleFromColumn(const uno::Reference<beans::XPropertySet>&
         OUString sParent;
         if (pOldName)
         {
-            if (GetAutoStylePool()->AddNamed(*pOldName, XML_STYLE_FAMILY_TABLE_COLUMN, sParent, xPropStates))
+            if (GetAutoStylePool()->AddNamed(*pOldName, XML_STYLE_FAMILY_TABLE_COLUMN, sParent, aPropStates))
             {
                 GetAutoStylePool()->RegisterName(XML_STYLE_FAMILY_TABLE_COLUMN, *pOldName);
                 // add to pColumnStyles, so the name is found for normal sheets
@@ -2136,7 +2136,7 @@ void ScXMLExport::AddStyleFromColumn(const uno::Reference<beans::XPropertySet>&
         else
         {
             OUString sName;
-            if (GetAutoStylePool()->Add(sName, XML_STYLE_FAMILY_TABLE_COLUMN, sParent, xPropStates))
+            if (GetAutoStylePool()->Add(sName, XML_STYLE_FAMILY_TABLE_COLUMN, sParent, aPropStates))
             {
                 OUString* pTemp(new OUString(sName));
                 rIndex = pColumnStyles->AddStyleName(pTemp);
@@ -2152,13 +2152,13 @@ void ScXMLExport::AddStyleFromRow(const uno::Reference<beans::XPropertySet>& xRo
 {
     OUString SC_SROWPREFIX(XML_STYLE_FAMILY_TABLE_ROW_STYLES_PREFIX);
 
-    std::vector<XMLPropertyState> xPropStates(xRowStylesExportPropertySetMapper->Filter(xRowProperties));
-    if(!xPropStates.empty())
+    std::vector<XMLPropertyState> aPropStates(xRowStylesExportPropertySetMapper->Filter(xRowProperties));
+    if(!aPropStates.empty())
     {
         OUString sParent;
         if (pOldName)
         {
-            if (GetAutoStylePool()->AddNamed(*pOldName, XML_STYLE_FAMILY_TABLE_ROW, sParent, xPropStates))
+            if (GetAutoStylePool()->AddNamed(*pOldName, XML_STYLE_FAMILY_TABLE_ROW, sParent, aPropStates))
             {
                 GetAutoStylePool()->RegisterName(XML_STYLE_FAMILY_TABLE_ROW, *pOldName);
                 // add to pRowStyles, so the name is found for normal sheets
@@ -2169,7 +2169,7 @@ void ScXMLExport::AddStyleFromRow(const uno::Reference<beans::XPropertySet>& xRo
         else
         {
             OUString sName;
-            if (GetAutoStylePool()->Add(sName, XML_STYLE_FAMILY_TABLE_ROW, sParent, xPropStates))
+            if (GetAutoStylePool()->Add(sName, XML_STYLE_FAMILY_TABLE_ROW, sParent, aPropStates))
             {
                 OUString* pTemp(new OUString(sName));
                 rIndex = pRowStyles->AddStyleName(pTemp);
@@ -2305,10 +2305,10 @@ void ScXMLExport::ExportAutoStyles_()
                     Reference<beans::XPropertySet> xTableProperties(xIndex->getByIndex(nTable), uno::UNO_QUERY);
                     if (xTableProperties.is())
                     {
-                        std::vector<XMLPropertyState> xPropStates(xTableStylesExportPropertySetMapper->Filter(xTableProperties));
+                        std::vector<XMLPropertyState> aPropStates(xTableStylesExportPropertySetMapper->Filter(xTableProperties));
                         OUString sParent;
                         OUString sName( aTableIter->maName );
-                        GetAutoStylePool()->AddNamed(sName, XML_STYLE_FAMILY_TABLE_TABLE, sParent, xPropStates);
+                        GetAutoStylePool()->AddNamed(sName, XML_STYLE_FAMILY_TABLE_TABLE, sParent, aPropStates);
                         GetAutoStylePool()->RegisterName(XML_STYLE_FAMILY_TABLE_TABLE, sName);
                     }
                 }
@@ -2343,19 +2343,19 @@ void ScXMLExport::ExportAutoStyles_()
                         {
                             if ( !aNoteIter->maStyleName.isEmpty() )
                             {
-                                std::vector<XMLPropertyState> xPropStates(xShapeMapper->Filter(xShapeProperties));
+                                std::vector<XMLPropertyState> aPropStates(xShapeMapper->Filter(xShapeProperties));
                                 OUString sParent;
                                 OUString sName( aNoteIter->maStyleName );
-                                GetAutoStylePool()->AddNamed(sName, XML_STYLE_FAMILY_SD_GRAPHICS_ID, sParent, xPropStates);
+                                GetAutoStylePool()->AddNamed(sName, XML_STYLE_FAMILY_SD_GRAPHICS_ID, sParent, aPropStates);
                                 GetAutoStylePool()->RegisterName(XML_STYLE_FAMILY_SD_GRAPHICS_ID, sName);
                             }
                             if ( !aNoteIter->maTextStyle.isEmpty() )
                             {
-                                std::vector<XMLPropertyState> xPropStates(
+                                std::vector<XMLPropertyState> aPropStates(
                                     GetTextParagraphExport()->GetParagraphPropertyMapper()->Filter(xShapeProperties));
                                 OUString sParent;
                                 OUString sName( aNoteIter->maTextStyle );
-                                GetAutoStylePool()->AddNamed(sName, XML_STYLE_FAMILY_TEXT_PARAGRAPH, sParent, xPropStates);
+                                GetAutoStylePool()->AddNamed(sName, XML_STYLE_FAMILY_TEXT_PARAGRAPH, sParent, aPropStates);
                                 GetAutoStylePool()->RegisterName(XML_STYLE_FAMILY_TEXT_PARAGRAPH, sName);
                             }
                         }
@@ -2388,10 +2388,10 @@ void ScXMLExport::ExportAutoStyles_()
                             lcl_GetEnumerated( xCellText, aNoteParaIter->maSelection.nStartPara ), uno::UNO_QUERY );
                         if ( xParaProp.is() )
                         {
-                            std::vector<XMLPropertyState> xPropStates(xParaPropMapper->Filter(xParaProp));
+                            std::vector<XMLPropertyState> aPropStates(xParaPropMapper->Filter(xParaProp));
                             OUString sParent;
                             OUString sName( aNoteParaIter->maName );
-                            GetAutoStylePool()->AddNamed(sName, XML_STYLE_FAMILY_TEXT_PARAGRAPH, sParent, xPropStates);
+                            GetAutoStylePool()->AddNamed(sName, XML_STYLE_FAMILY_TEXT_PARAGRAPH, sParent, aPropStates);
                             GetAutoStylePool()->RegisterName(XML_STYLE_FAMILY_TEXT_PARAGRAPH, sName);
                         }
                     }
@@ -2425,10 +2425,10 @@ void ScXMLExport::ExportAutoStyles_()
                         {
                             pCursor->SetSelection( aNoteTextIter->maSelection );
 
-                            std::vector<XMLPropertyState> xPropStates(xTextPropMapper->Filter(xCursorProp));
+                            std::vector<XMLPropertyState> aPropStates(xTextPropMapper->Filter(xCursorProp));
                             OUString sParent;
                             OUString sName( aNoteTextIter->maName );
-                            GetAutoStylePool()->AddNamed(sName, XML_STYLE_FAMILY_TEXT_TEXT, sParent, xPropStates);
+                            GetAutoStylePool()->AddNamed(sName, XML_STYLE_FAMILY_TEXT_TEXT, sParent, aPropStates);
                             GetAutoStylePool()->RegisterName(XML_STYLE_FAMILY_TEXT_TEXT, sName);
                         }
                     }
@@ -2459,10 +2459,10 @@ void ScXMLExport::ExportAutoStyles_()
                     {
                         pCursor->SetSelection( aTextIter->maSelection );
 
-                        std::vector<XMLPropertyState> xPropStates(xTextPropMapper->Filter(xCursorProp));
+                        std::vector<XMLPropertyState> aPropStates(xTextPropMapper->Filter(xCursorProp));
                         OUString sParent;
                         OUString sName( aTextIter->maName );
-                        GetAutoStylePool()->AddNamed(sName, XML_STYLE_FAMILY_TEXT_TEXT, sParent, xPropStates);
+                        GetAutoStylePool()->AddNamed(sName, XML_STYLE_FAMILY_TEXT_TEXT, sParent, aPropStates);
                         GetAutoStylePool()->RegisterName(XML_STYLE_FAMILY_TEXT_TEXT, sName);
                     }
                 }
@@ -2491,12 +2491,12 @@ void ScXMLExport::ExportAutoStyles_()
             Reference<beans::XPropertySet> xTableProperties(xTable, uno::UNO_QUERY);
             if (xTableProperties.is())
             {
-                std::vector<XMLPropertyState> xPropStates(xTableStylesExportPropertySetMapper->Filter(xTableProperties));
-                if(!xPropStates.empty())
+                std::vector<XMLPropertyState> aPropStates(xTableStylesExportPropertySetMapper->Filter(xTableProperties));
+                if(!aPropStates.empty())
                 {
                     OUString sParent;
                     OUString sName;
-                    GetAutoStylePool()->Add(sName, XML_STYLE_FAMILY_TABLE_TABLE, sParent, xPropStates);
+                    GetAutoStylePool()->Add(sName, XML_STYLE_FAMILY_TABLE_TABLE, sParent, aPropStates);
                     aTableStyles.push_back(sName);
                 }
             }
diff --git a/sc/source/ui/unoobj/warnpassword.cxx b/sc/source/ui/unoobj/warnpassword.cxx
index f7a5ca74ef6a..27a197f63e1b 100644
--- a/sc/source/ui/unoobj/warnpassword.cxx
+++ b/sc/source/ui/unoobj/warnpassword.cxx
@@ -44,14 +44,14 @@ bool ScWarnPassword::WarningOnPassword( SfxMedium& rMedium )
     {
 
         OUString empty;
-        Any xException( makeAny(InteractiveAppException(empty,
+        Any aException( makeAny(InteractiveAppException(empty,
                 Reference <XInterface> (),
                 InteractionClassification_QUERY,
                  ERRCODE_SVX_EXPORT_FILTER_CRYPT)));
 
         Reference< ucbhelper::SimpleInteractionRequest > xRequest
                     = new ucbhelper::SimpleInteractionRequest(
-                        xException,
+                        aException,
                         ucbhelper::CONTINUATION_APPROVE
                             | ucbhelper::CONTINUATION_DISAPPROVE );
 
diff --git a/sc/source/ui/vba/vbacomment.cxx b/sc/source/ui/vba/vbacomment.cxx
index cd9ccdd512d1..130ed99d9763 100644
--- a/sc/source/ui/vba/vbacomment.cxx
+++ b/sc/source/ui/vba/vbacomment.cxx
@@ -83,9 +83,9 @@ ScVbaComment::getAnnotationIndex() throw (uno::RuntimeException)
     for ( ; aIndex < aCount ; aIndex++ )
     {
         uno::Reference< sheet::XSheetAnnotation > xAnno( xAnnos->getByIndex( aIndex ), uno::UNO_QUERY_THROW );
-        table::CellAddress xAddress = xAnno->getPosition();
+        table::CellAddress aAnnoAddress = xAnno->getPosition();
 
-        if ( xAddress.Column == aAddress.Column && xAddress.Row == aAddress.Row && xAddress.Sheet == aAddress.Sheet )
+        if ( aAnnoAddress.Column == aAddress.Column && aAnnoAddress.Row == aAddress.Row && aAnnoAddress.Sheet == aAddress.Sheet )
         {
             SAL_INFO("sc.ui", "terminating search, index is " << aIndex);
             break;
diff --git a/sc/source/ui/vba/vbanames.cxx b/sc/source/ui/vba/vbanames.cxx
index 22db74ad12a2..b30ebe364267 100644
--- a/sc/source/ui/vba/vbanames.cxx
+++ b/sc/source/ui/vba/vbanames.cxx
@@ -194,13 +194,13 @@ ScVbaNames::Add( const css::uno::Any& Name ,
 
         uno::Reference< excel::XRange > xArea( xRange->Areas( uno::makeAny( sal_Int32(1) ) ), uno::UNO_QUERY );
 
-        uno::Any xAny = xArea->getCellRange() ;
+        uno::Any aAny = xArea->getCellRange() ;
 
-        uno::Reference< sheet::XCellRangeAddressable > thisRangeAdd( xAny, ::uno::UNO_QUERY_THROW);
+        uno::Reference< sheet::XCellRangeAddressable > thisRangeAdd( aAny, ::uno::UNO_QUERY_THROW);
 
         table::CellRangeAddress aAddr = thisRangeAdd->getRangeAddress();
         ScAddress aPos( static_cast< SCCOL >( aAddr.StartColumn ) , static_cast< SCROW >( aAddr.StartRow ) , static_cast< SCTAB >(aAddr.Sheet ) );
-        uno::Any xAny2 ;
+        uno::Any aAny2 ;
         if ( mxNames.is() )
         {
             sal_Int32 nUnoType = 0;
@@ -213,7 +213,7 @@ ScVbaNames::Add( const css::uno::Any& Name ,
             {
                 xArea.set( xRange->Areas( uno::makeAny( nArea ) ), uno::UNO_QUERY_THROW );
 
-                OUString sRangeAdd = xArea->Address( xAny2, xAny2 , xAny2 , xAny2, xAny2 );
+                OUString sRangeAdd = xArea->Address( aAny2, aAny2 , aAny2 , aAny2, aAny2 );
                 if ( nArea > 1 )
                     sTmp += ",";
                 sTmp = sTmp + "'" + xRange->getWorksheet()->getName() + "'." + sRangeAdd;