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>

7 files changed, 127 insertions, 127 deletions

diff --git a/test/source/sheet/datapilotfield.cxx b/test/source/sheet/datapilotfield.cxx
index 581bc26f2035..2772328eef17 100644
--- a/test/source/sheet/datapilotfield.cxx
+++ b/test/source/sheet/datapilotfield.cxx
@@ -39,29 +39,29 @@ void DataPilotField::testSortInfo()
     aSortInfoValue.Field = "Col1";
     aSortInfoValue.IsAscending = false;
     aSortInfoValue.Mode = sheet::DataPilotFieldSortMode::MANUAL;
-    uno::Any xValue;
-    xValue <<= aSortInfoValue;
-    xPropSet->setPropertyValue(aSortInfo, xValue);
+    uno::Any aValue;
+    aValue <<= aSortInfoValue;
+    xPropSet->setPropertyValue(aSortInfo, aValue);
 
     sheet::DataPilotFieldSortInfo aNewSortInfoValue;
-    xValue = xPropSet->getPropertyValue(aSortInfo);
-    CPPUNIT_ASSERT( xValue >>= aNewSortInfoValue );
+    aValue = xPropSet->getPropertyValue(aSortInfo);
+    CPPUNIT_ASSERT( aValue >>= aNewSortInfoValue );
     CPPUNIT_ASSERT_MESSAGE("set value should be the same as got value", aNewSortInfoValue.Field == aSortInfoValue.Field
             && aNewSortInfoValue.Mode == aSortInfoValue.Mode && aNewSortInfoValue.IsAscending == aSortInfoValue.IsAscending);
 
     //setting HasSortInfo only makes sense for false, for true the uno implementation does nothing
     bool bHasSortInfo(false);
     OUString aHasSortInfo("HasSortInfo");
-    xValue = xPropSet->getPropertyValue(aHasSortInfo);
-    CPPUNIT_ASSERT( xValue >>= bHasSortInfo );
+    aValue = xPropSet->getPropertyValue(aHasSortInfo);
+    CPPUNIT_ASSERT( aValue >>= bHasSortInfo );
     CPPUNIT_ASSERT_MESSAGE("should have sort info", bHasSortInfo);
 
     bHasSortInfo = false;
-    xValue <<= bHasSortInfo;
-    xPropSet->setPropertyValue(aHasSortInfo, xValue);
+    aValue <<= bHasSortInfo;
+    xPropSet->setPropertyValue(aHasSortInfo, aValue);
 
-    xValue = xPropSet->getPropertyValue(aHasSortInfo);
-    CPPUNIT_ASSERT( xValue >>= bHasSortInfo );
+    aValue = xPropSet->getPropertyValue(aHasSortInfo);
+    CPPUNIT_ASSERT( aValue >>= bHasSortInfo );
     CPPUNIT_ASSERT_MESSAGE("should have no sort info", !bHasSortInfo);
 }
 
@@ -72,29 +72,29 @@ void DataPilotField::testLayoutInfo()
     OUString aLayoutInfo("LayoutInfo");
     aLayoutInfoValue.AddEmptyLines = false;
     aLayoutInfoValue.LayoutMode = sheet::DataPilotFieldLayoutMode::OUTLINE_SUBTOTALS_BOTTOM;
-    uno::Any xValue;
-    xValue <<= aLayoutInfoValue;
-    xPropSet->setPropertyValue(aLayoutInfo, xValue);
+    uno::Any aValue;
+    aValue <<= aLayoutInfoValue;
+    xPropSet->setPropertyValue(aLayoutInfo, aValue);
 
     sheet::DataPilotFieldLayoutInfo aNewLayoutInfoValue;
-    xValue = xPropSet->getPropertyValue(aLayoutInfo);
-    CPPUNIT_ASSERT( xValue >>= aNewLayoutInfoValue );
+    aValue = xPropSet->getPropertyValue(aLayoutInfo);
+    CPPUNIT_ASSERT( aValue >>= aNewLayoutInfoValue );
     CPPUNIT_ASSERT_MESSAGE("set value should be the same as the got value", aNewLayoutInfoValue.LayoutMode == aLayoutInfoValue.LayoutMode &&
             aNewLayoutInfoValue.AddEmptyLines == aLayoutInfoValue.AddEmptyLines);
 
     //setting HasLayoutInfo only makes sense for false, tor true the uno implementation does nothing
     bool bHasLayoutInfo(false);
     OUString aHasLayoutInfo("HasLayoutInfo");
-    xValue = xPropSet->getPropertyValue(aHasLayoutInfo);
-    CPPUNIT_ASSERT( xValue >>= bHasLayoutInfo );
+    aValue = xPropSet->getPropertyValue(aHasLayoutInfo);
+    CPPUNIT_ASSERT( aValue >>= bHasLayoutInfo );
     CPPUNIT_ASSERT_MESSAGE("should have layout information", bHasLayoutInfo);
 
     bHasLayoutInfo = false;
-    xValue <<= bHasLayoutInfo;
-    xPropSet->setPropertyValue(aHasLayoutInfo, xValue);
+    aValue <<= bHasLayoutInfo;
+    xPropSet->setPropertyValue(aHasLayoutInfo, aValue);
 
-    xValue = xPropSet->getPropertyValue(aHasLayoutInfo);
-    CPPUNIT_ASSERT( xValue >>= bHasLayoutInfo );
+    aValue = xPropSet->getPropertyValue(aHasLayoutInfo);
+    CPPUNIT_ASSERT( aValue >>= bHasLayoutInfo );
     CPPUNIT_ASSERT_MESSAGE("should have no longer sort information", !bHasLayoutInfo);
 }
 
@@ -105,29 +105,29 @@ void DataPilotField::testAutoShowInfo()
     aAutoShowInfoValue.DataField = "Col1";
     aAutoShowInfoValue.IsEnabled = true;
     OUString aAutoShowInfo("AutoShowInfo");
-    uno::Any xValue;
-    xValue <<= aAutoShowInfoValue;
-    xPropSet->setPropertyValue(aAutoShowInfo, xValue);
+    uno::Any aValue;
+    aValue <<= aAutoShowInfoValue;
+    xPropSet->setPropertyValue(aAutoShowInfo, aValue);
 
     sheet::DataPilotFieldAutoShowInfo aNewAutoShowInfoValue;
-    xValue = xPropSet->getPropertyValue(aAutoShowInfo);
-    CPPUNIT_ASSERT( xValue >>= aNewAutoShowInfoValue );
+    aValue = xPropSet->getPropertyValue(aAutoShowInfo);
+    CPPUNIT_ASSERT( aValue >>= aNewAutoShowInfoValue );
     CPPUNIT_ASSERT_MESSAGE("set value should be the same as the got value", aNewAutoShowInfoValue.DataField == aAutoShowInfoValue.DataField &&
             aNewAutoShowInfoValue.IsEnabled == aAutoShowInfoValue.IsEnabled);
 
     //setting HasLayoutInfo only makes sense for false, tor true the uno implementation does nothing
     bool bHasAutoShowInfo(false);
     OUString aHasAutoShowInfo("HasAutoShowInfo");
-    xValue = xPropSet->getPropertyValue(aHasAutoShowInfo);
-    CPPUNIT_ASSERT( xValue >>= bHasAutoShowInfo );
+    aValue = xPropSet->getPropertyValue(aHasAutoShowInfo);
+    CPPUNIT_ASSERT( aValue >>= bHasAutoShowInfo );
     CPPUNIT_ASSERT_MESSAGE("should have AutoShow information", bHasAutoShowInfo);
 
     bHasAutoShowInfo = false;
-    xValue <<= bHasAutoShowInfo;
-    xPropSet->setPropertyValue(aHasAutoShowInfo, xValue);
+    aValue <<= bHasAutoShowInfo;
+    xPropSet->setPropertyValue(aHasAutoShowInfo, aValue);
 
-    xValue = xPropSet->getPropertyValue(aHasAutoShowInfo);
-    CPPUNIT_ASSERT( xValue >>= bHasAutoShowInfo );
+    aValue = xPropSet->getPropertyValue(aHasAutoShowInfo);
+    CPPUNIT_ASSERT( aValue >>= bHasAutoShowInfo );
     CPPUNIT_ASSERT_MESSAGE("should have no longer AutoShow information", !bHasAutoShowInfo);
 }
 
@@ -138,50 +138,50 @@ void DataPilotField::testReference()
     aReferenceValue.ReferenceField = "Col1";
     aReferenceValue.ReferenceItemType = sheet::DataPilotFieldReferenceItemType::NAMED;
     OUString aReference("Reference");
-    uno::Any xValue;
-    xValue <<= aReferenceValue;
-    xPropSet->setPropertyValue(aReference, xValue);
+    uno::Any aValue;
+    aValue <<= aReferenceValue;
+    xPropSet->setPropertyValue(aReference, aValue);
 
     sheet::DataPilotFieldReference aNewReferenceValue;
-    xValue = xPropSet->getPropertyValue(aReference);
-    CPPUNIT_ASSERT( xValue >>= aNewReferenceValue );
+    aValue = xPropSet->getPropertyValue(aReference);
+    CPPUNIT_ASSERT( aValue >>= aNewReferenceValue );
     CPPUNIT_ASSERT_MESSAGE("set value should be the same as the got value", aReferenceValue.ReferenceField == aNewReferenceValue.ReferenceField
             && aReferenceValue.ReferenceItemType == aNewReferenceValue.ReferenceItemType);
 
     //setting HasReference only makes sense for false, tor true the uno implementation does nothing
     bool bHasReference(false);
     OUString aHasReference("HasReference");
-    xValue = xPropSet->getPropertyValue(aHasReference);
-    CPPUNIT_ASSERT( xValue >>= bHasReference );
+    aValue = xPropSet->getPropertyValue(aHasReference);
+    CPPUNIT_ASSERT( aValue >>= bHasReference );
     CPPUNIT_ASSERT_MESSAGE("should have Reference information", bHasReference);
 
     bHasReference = false;
-    xValue <<= bHasReference;
-    xPropSet->setPropertyValue(aHasReference, xValue);
+    aValue <<= bHasReference;
+    xPropSet->setPropertyValue(aHasReference, aValue);
 
-    xValue = xPropSet->getPropertyValue(aHasReference);
-    CPPUNIT_ASSERT( xValue >>= bHasReference );
+    aValue = xPropSet->getPropertyValue(aHasReference);
+    CPPUNIT_ASSERT( aValue >>= bHasReference );
     CPPUNIT_ASSERT_MESSAGE("should have no longer reference information", !bHasReference);
 }
 
 void DataPilotField::testIsGroupField()
 {
     uno::Reference< beans::XPropertySet > xPropSet(init(),UNO_QUERY_THROW);
-    uno::Any xValue;
+    uno::Any aValue;
     OUString aIsGroupField("IsGroupField");
     bool bIsGroupField(false);
 
-    xValue = xPropSet->getPropertyValue(aIsGroupField);
-    CPPUNIT_ASSERT( xValue >>= bIsGroupField);
+    aValue = xPropSet->getPropertyValue(aIsGroupField);
+    CPPUNIT_ASSERT( aValue >>= bIsGroupField);
     //only setting to false is supported
     if (bIsGroupField)
     {
         bIsGroupField = false;
-        xValue <<= bIsGroupField;
+        aValue <<= bIsGroupField;
 
-        xPropSet->setPropertyValue(aIsGroupField, xValue);
-        xValue = xPropSet->getPropertyValue(aIsGroupField);
-        CPPUNIT_ASSERT(xValue >>= bIsGroupField);
+        xPropSet->setPropertyValue(aIsGroupField, aValue);
+        aValue = xPropSet->getPropertyValue(aIsGroupField);
+        CPPUNIT_ASSERT(aValue >>= bIsGroupField);
         CPPUNIT_ASSERT_MESSAGE("setting IsGroupField is supported and should have happened", !bIsGroupField);
     }
     else
diff --git a/test/source/sheet/xdatabaserange.cxx b/test/source/sheet/xdatabaserange.cxx
index 7fb422e7885f..45f59fc9109c 100644
--- a/test/source/sheet/xdatabaserange.cxx
+++ b/test/source/sheet/xdatabaserange.cxx
@@ -68,59 +68,59 @@ void XDatabaseRange::testGetSortDescriptor()
     uno::Sequence< beans::PropertyValue > xSortDescr = xDBRange->getSortDescriptor();
     for (sal_Int32 i = 0; i < xSortDescr.getLength(); ++i)
     {
-        beans::PropertyValue xProp = xSortDescr[i];
-        //std::cout << "Prop " << i << " Name: " << OUString(xProp.Name) << std::endl;
+        beans::PropertyValue aProp = xSortDescr[i];
+        //std::cout << "Prop " << i << " Name: " << OUString(aProp.Name) << std::endl;
 
-        if (xProp.Name == "IsSortColumns")
+        if (aProp.Name == "IsSortColumns")
         {
             bool bIsSortColumns = true;
-            xProp.Value >>= bIsSortColumns;
+            aProp.Value >>= bIsSortColumns;
             CPPUNIT_ASSERT(bIsSortColumns);
         }
-        else if (xProp.Name == "ContainsHeader")
+        else if (aProp.Name == "ContainsHeader")
         {
             bool bContainsHeader = true;
-            xProp.Value >>= bContainsHeader;
+            aProp.Value >>= bContainsHeader;
             CPPUNIT_ASSERT(bContainsHeader);
         }
-        else if (xProp.Name == "MaxFieldCount")
+        else if (aProp.Name == "MaxFieldCount")
         {
             sal_Int32 nMaxFieldCount = 0;
-            xProp.Value >>= nMaxFieldCount;
+            aProp.Value >>= nMaxFieldCount;
             std::cout << "Value: " << nMaxFieldCount << std::endl;
 
         }
-        else if (xProp.Name == "SortFields")
+        else if (aProp.Name == "SortFields")
         {
 
         }
-        else if (xProp.Name == "BindFormatsToContent")
+        else if (aProp.Name == "BindFormatsToContent")
         {
             bool bBindFormatsToContent = false;
-            xProp.Value >>= bBindFormatsToContent;
+            aProp.Value >>= bBindFormatsToContent;
             CPPUNIT_ASSERT(bBindFormatsToContent);
         }
-        else if (xProp.Name == "CopyOutputData")
+        else if (aProp.Name == "CopyOutputData")
         {
             bool bCopyOutputData = true;
-            xProp.Value >>= bCopyOutputData;
+            aProp.Value >>= bCopyOutputData;
             CPPUNIT_ASSERT(!bCopyOutputData);
         }
-        else if (xProp.Name == "OutputPosition")
+        else if (aProp.Name == "OutputPosition")
         {
 
         }
-        else if (xProp.Name == "IsUserListEnabled")
+        else if (aProp.Name == "IsUserListEnabled")
         {
             bool bIsUserListEnabled  = true;
-            xProp.Value >>= bIsUserListEnabled;
+            aProp.Value >>= bIsUserListEnabled;
             CPPUNIT_ASSERT(!bIsUserListEnabled);
 
         }
-        else if (xProp.Name == "UserListIndex")
+        else if (aProp.Name == "UserListIndex")
         {
             sal_Int32 nUserListIndex = 1;
-            xProp.Value >>= nUserListIndex;
+            aProp.Value >>= nUserListIndex;
             CPPUNIT_ASSERT(nUserListIndex == 0);
         }
     }
diff --git a/test/source/sheet/xnamedrange.cxx b/test/source/sheet/xnamedrange.cxx
index ee82169abbbd..3ce1477e6351 100644
--- a/test/source/sheet/xnamedrange.cxx
+++ b/test/source/sheet/xnamedrange.cxx
@@ -105,11 +105,11 @@ void XNamedRange::testGetReferencePosition()
     OUString aTestedNamedRangeString("initial2");
     uno::Reference< sheet::XNamedRange > xNamedRange = getNamedRange(aTestedNamedRangeString);
 
-    table::CellAddress xCellAddress = xNamedRange->getReferencePosition();
+    table::CellAddress aCellAddress = xNamedRange->getReferencePosition();
     // the expected address is on B1, as it was the active cell when intial2 created
-    CPPUNIT_ASSERT_MESSAGE("Wrong SHEET reference position", xCellAddress.Sheet == 0);
-    CPPUNIT_ASSERT_MESSAGE("Wrong COLUMN reference position", xCellAddress.Column == 1);
-    CPPUNIT_ASSERT_MESSAGE("Wrong ROW reference position", xCellAddress.Row == 0);
+    CPPUNIT_ASSERT_MESSAGE("Wrong SHEET reference position", aCellAddress.Sheet == 0);
+    CPPUNIT_ASSERT_MESSAGE("Wrong COLUMN reference position", aCellAddress.Column == 1);
+    CPPUNIT_ASSERT_MESSAGE("Wrong ROW reference position", aCellAddress.Row == 0);
 }
 
 void XNamedRange::testSetReferencePosition()
@@ -121,10 +121,10 @@ void XNamedRange::testSetReferencePosition()
 
     xNamedRange->setReferencePosition(aBaseAddress);
 
-    table::CellAddress xCellAddress = xNamedRange->getReferencePosition();
-    CPPUNIT_ASSERT_MESSAGE("Wrong SHEET reference position after setting it", xCellAddress.Sheet == 1);
-    CPPUNIT_ASSERT_MESSAGE("Wrong COLUMN reference position after setting it", xCellAddress.Column == 2);
-    CPPUNIT_ASSERT_MESSAGE("Wrong ROW reference position after setting it", xCellAddress.Row == 3);
+    table::CellAddress aCellAddress = xNamedRange->getReferencePosition();
+    CPPUNIT_ASSERT_MESSAGE("Wrong SHEET reference position after setting it", aCellAddress.Sheet == 1);
+    CPPUNIT_ASSERT_MESSAGE("Wrong COLUMN reference position after setting it", aCellAddress.Column == 2);
+    CPPUNIT_ASSERT_MESSAGE("Wrong ROW reference position after setting it", aCellAddress.Row == 3);
 }
 
 }
diff --git a/test/source/sheet/xnamedranges.cxx b/test/source/sheet/xnamedranges.cxx
index 41295b831392..c31f4afe7d82 100644
--- a/test/source/sheet/xnamedranges.cxx
+++ b/test/source/sheet/xnamedranges.cxx
@@ -176,12 +176,12 @@ void XNamedRanges::testRemoveByName()
 
 void XNamedRanges::testOutputList()
 {
-    table::CellAddress xCellAddress = table::CellAddress (0,2,0);
+    table::CellAddress aCellAddress = table::CellAddress (0,2,0);
     uno::Reference< sheet::XNamedRanges > xNamedRanges(init(), UNO_QUERY_THROW);
     uno::Reference< container::XIndexAccess > xNamedRangesIndex(init(), UNO_QUERY_THROW);
     sal_Int32 nElementsCount = xNamedRangesIndex->getCount();
 
-    xNamedRanges->outputList(xCellAddress);
+    xNamedRanges->outputList(aCellAddress);
 
     OUString aString;
     uno::Reference< table::XCell > xCell;
diff --git a/test/source/sheet/xsheetannotation.cxx b/test/source/sheet/xsheetannotation.cxx
index 2755f5661a58..b39552603d13 100644
--- a/test/source/sheet/xsheetannotation.cxx
+++ b/test/source/sheet/xsheetannotation.cxx
@@ -22,17 +22,17 @@ namespace apitest {
 void XSheetAnnotation::testGetPosition()
 {
     uno::Reference< sheet::XSheetAnnotation > aSheetAnnotation (init(), UNO_QUERY_THROW);
-    table::CellAddress xResultCellAddress = aSheetAnnotation->getPosition();
+    table::CellAddress aResultCellAddress = aSheetAnnotation->getPosition();
 
     //expected result
-    table::CellAddress xExpectedCellAddress;
-    xExpectedCellAddress.Sheet = 0;
-    xExpectedCellAddress.Row = 1;
-    xExpectedCellAddress.Column = 2;
+    table::CellAddress aExpectedCellAddress;
+    aExpectedCellAddress.Sheet = 0;
+    aExpectedCellAddress.Row = 1;
+    aExpectedCellAddress.Column = 2;
 
-    CPPUNIT_ASSERT_MESSAGE("Wrong SHEET reference position", xResultCellAddress.Sheet == xExpectedCellAddress.Sheet);
-    CPPUNIT_ASSERT_MESSAGE("Wrong COLUMN reference position", xResultCellAddress.Column == xExpectedCellAddress.Column);
-    CPPUNIT_ASSERT_MESSAGE("Wrong ROW reference position", xResultCellAddress.Row == xExpectedCellAddress.Row);
+    CPPUNIT_ASSERT_MESSAGE("Wrong SHEET reference position", aResultCellAddress.Sheet == aExpectedCellAddress.Sheet);
+    CPPUNIT_ASSERT_MESSAGE("Wrong COLUMN reference position", aResultCellAddress.Column == aExpectedCellAddress.Column);
+    CPPUNIT_ASSERT_MESSAGE("Wrong ROW reference position", aResultCellAddress.Row == aExpectedCellAddress.Row);
 }
 
 void XSheetAnnotation::testGetAuthor()
diff --git a/test/source/sheet/xsheetannotations.cxx b/test/source/sheet/xsheetannotations.cxx
index d6e521f7bef1..b84acc0769c3 100644
--- a/test/source/sheet/xsheetannotations.cxx
+++ b/test/source/sheet/xsheetannotations.cxx
@@ -34,8 +34,8 @@ void XSheetAnnotations::testCount()
     uno::Reference< sheet::XSheetAnnotations > xSheet2Annotations( getAnnotations(1), UNO_QUERY_THROW);
 
     // insert a note on sheet 2
-    table::CellAddress xTargetCellAddress (1,0,0);
-    xSheet2Annotations->insertNew(xTargetCellAddress, "an inserted annotation on sheet 2");
+    table::CellAddress aTargetCellAddress (1,0,0);
+    xSheet2Annotations->insertNew(aTargetCellAddress, "an inserted annotation on sheet 2");
 
     // count again on sheet 1
     sal_Int32 nAfter = xAnnotationsIndex->getCount();
@@ -55,8 +55,8 @@ void XSheetAnnotations::testInsertNew()
         "There should already be one note", sal_Int32(1), nBefore );
 
     // insert the annotation
-    table::CellAddress xTargetCellAddress (0,3,4);
-    aSheetAnnotations->insertNew(xTargetCellAddress, "an inserted annotation");
+    table::CellAddress aTargetCellAddress (0,3,4);
+    aSheetAnnotations->insertNew(aTargetCellAddress, "an inserted annotation");
 
     // count after inserting
     //uno::Reference< container::XIndexAccess > xAnnotationsIndexAfter (aSheetAnnotations, UNO_QUERY_THROW);
@@ -67,17 +67,17 @@ void XSheetAnnotations::testInsertNew()
 
     // is the position ok ?
     uno::Reference< sheet::XSheetAnnotation > aLastSheetAnnotation (xAnnotationsIndex->getByIndex(nAfter-1), UNO_QUERY_THROW);
-    table::CellAddress xResultCellAddress = aLastSheetAnnotation->getPosition();
+    table::CellAddress aResultCellAddress = aLastSheetAnnotation->getPosition();
 
     CPPUNIT_ASSERT_EQUAL_MESSAGE(
         "Insert Annotation - Wrong SHEET reference position",
-        xTargetCellAddress.Sheet, xResultCellAddress.Sheet);
+        aTargetCellAddress.Sheet, aResultCellAddress.Sheet);
     CPPUNIT_ASSERT_EQUAL_MESSAGE(
         "Insert Annotation - Wrong COLUMN reference position",
-        xTargetCellAddress.Column, xResultCellAddress.Column);
+        aTargetCellAddress.Column, aResultCellAddress.Column);
     CPPUNIT_ASSERT_EQUAL_MESSAGE(
         "Insert Annotation - Wrong ROW reference position",
-        xTargetCellAddress.Row, xResultCellAddress.Row);
+        aTargetCellAddress.Row, aResultCellAddress.Row);
 
     // is the string ok ?
     uno::Reference< text::XTextRange > aTextSheetAnnotation(aLastSheetAnnotation, UNO_QUERY_THROW);
@@ -94,12 +94,12 @@ void XSheetAnnotations::testRemoveByIndex()
     uno::Reference< sheet::XSheetAnnotations > aSheetAnnotations (init(), UNO_QUERY_THROW);
 
     // insert some annotations
-    table::CellAddress xTargetCellAddress (0,4,5);
-    aSheetAnnotations->insertNew(xTargetCellAddress, "an inserted annotation 1");
-    table::CellAddress xToBeRemovedCellAddress (0,5,6);
-    aSheetAnnotations->insertNew(xToBeRemovedCellAddress, "an inserted annotation 2");
-    table::CellAddress xOtherCellAddress (0,7,8);
-    aSheetAnnotations->insertNew(xOtherCellAddress, "an inserted annotation 3");
+    table::CellAddress aTargetCellAddress (0,4,5);
+    aSheetAnnotations->insertNew(aTargetCellAddress, "an inserted annotation 1");
+    table::CellAddress aToBeRemovedCellAddress (0,5,6);
+    aSheetAnnotations->insertNew(aToBeRemovedCellAddress, "an inserted annotation 2");
+    table::CellAddress aOtherCellAddress (0,7,8);
+    aSheetAnnotations->insertNew(aOtherCellAddress, "an inserted annotation 3");
 
     // count before removing
     uno::Reference< container::XIndexAccess > xAnnotationsIndex (aSheetAnnotations, UNO_QUERY_THROW);
@@ -114,17 +114,17 @@ void XSheetAnnotations::testRemoveByIndex()
 
     // the last position should be xOtherCellAddress
     uno::Reference< sheet::XSheetAnnotation > aLastSheetAnnotation (xAnnotationsIndex->getByIndex(nAfter-1), UNO_QUERY_THROW);
-    table::CellAddress xResultCellAddress = aLastSheetAnnotation->getPosition();
+    table::CellAddress aResultCellAddress = aLastSheetAnnotation->getPosition();
 
     CPPUNIT_ASSERT_EQUAL_MESSAGE(
         "Remove Annotation - Wrong SHEET reference position",
-        xOtherCellAddress.Sheet, xResultCellAddress.Sheet);
+        aOtherCellAddress.Sheet, aResultCellAddress.Sheet);
     CPPUNIT_ASSERT_EQUAL_MESSAGE(
         "Remove Annotation - Wrong COLUMN reference position",
-        xOtherCellAddress.Column, xResultCellAddress.Column);
+        aOtherCellAddress.Column, aResultCellAddress.Column);
     CPPUNIT_ASSERT_EQUAL_MESSAGE(
         "Remove Annotation - Wrong ROW reference position",
-        xOtherCellAddress.Row, xResultCellAddress.Row);
+        aOtherCellAddress.Row, aResultCellAddress.Row);
 
     // is the string ok ?
     uno::Reference< text::XTextRange > aLastTextSheetAnnotation(aLastSheetAnnotation, UNO_QUERY_THROW);
@@ -136,17 +136,17 @@ void XSheetAnnotations::testRemoveByIndex()
 
     // the previous should be xTargetCellAddress
     uno::Reference< sheet::XSheetAnnotation > aPreviousSheetAnnotation (xAnnotationsIndex->getByIndex(nAfter-2), UNO_QUERY_THROW);
-    table::CellAddress xPreviousCellAddress = aPreviousSheetAnnotation->getPosition();
+    table::CellAddress aPreviousCellAddress = aPreviousSheetAnnotation->getPosition();
 
     CPPUNIT_ASSERT_EQUAL_MESSAGE(
         "Remove Annotation - Wrong SHEET reference position",
-        xTargetCellAddress.Sheet, xPreviousCellAddress.Sheet);
+        aTargetCellAddress.Sheet, aPreviousCellAddress.Sheet);
     CPPUNIT_ASSERT_EQUAL_MESSAGE(
         "Remove Annotation - Wrong COLUMN reference position",
-        xTargetCellAddress.Column, xPreviousCellAddress.Column);
+        aTargetCellAddress.Column, aPreviousCellAddress.Column);
     CPPUNIT_ASSERT_EQUAL_MESSAGE(
         "Remove Annotation - Wrong ROW reference position",
-        xTargetCellAddress.Row, xPreviousCellAddress.Row);
+        aTargetCellAddress.Row, aPreviousCellAddress.Row);
 
     // is the string ok ?
     uno::Reference< text::XTextRange > aPreviousTextSheetAnnotation(aPreviousSheetAnnotation, UNO_QUERY_THROW);
@@ -164,39 +164,39 @@ void XSheetAnnotations::testGetByIndex()
 
     // insert annotations in first sheet
     uno::Reference< sheet::XSheetAnnotations > aSheet0Annotations (init(), UNO_QUERY_THROW);
-    table::CellAddress xTargetCellAddress0 (0,0,1);
-    aSheet0Annotations->insertNew(xTargetCellAddress0, "an inserted annotation 1 on sheet 1");
-    table::CellAddress xSecondTargetCellAddress0 (0,0,2);
-    aSheet0Annotations->insertNew(xSecondTargetCellAddress0, "an inserted annotation 2 on sheet 1");
-    table::CellAddress xThirdCellAddress0 (0,0,3);
-    aSheet0Annotations->insertNew(xThirdCellAddress0, "an inserted annotation 3 on sheet 1");
+    table::CellAddress aTargetCellAddress0 (0,0,1);
+    aSheet0Annotations->insertNew(aTargetCellAddress0, "an inserted annotation 1 on sheet 1");
+    table::CellAddress aSecondTargetCellAddress0 (0,0,2);
+    aSheet0Annotations->insertNew(aSecondTargetCellAddress0, "an inserted annotation 2 on sheet 1");
+    table::CellAddress aThirdCellAddress0 (0,0,3);
+    aSheet0Annotations->insertNew(aThirdCellAddress0, "an inserted annotation 3 on sheet 1");
 
     // insert annotations in third sheet
     uno::Reference< sheet::XSheetAnnotations > aSheet2Annotations (getAnnotations(2), UNO_QUERY_THROW);
-    table::CellAddress xTargetCellAddress2 (2,4,5);
-    aSheet2Annotations->insertNew(xTargetCellAddress2, "an inserted annotation 1 on sheet 3");
-    table::CellAddress xSecondTargetCellAddress2 (2,5,6);
-    aSheet2Annotations->insertNew(xSecondTargetCellAddress2, "an inserted annotation 2 on sheet 3");
-    table::CellAddress xThirdCellAddress2 (2,7,8);
-    aSheet2Annotations->insertNew(xThirdCellAddress2, "an inserted annotation 3 on sheet 3");
+    table::CellAddress aTargetCellAddress2 (2,4,5);
+    aSheet2Annotations->insertNew(aTargetCellAddress2, "an inserted annotation 1 on sheet 3");
+    table::CellAddress aSecondTargetCellAddress2 (2,5,6);
+    aSheet2Annotations->insertNew(aSecondTargetCellAddress2, "an inserted annotation 2 on sheet 3");
+    table::CellAddress aThirdCellAddress2 (2,7,8);
+    aSheet2Annotations->insertNew(aThirdCellAddress2, "an inserted annotation 3 on sheet 3");
 
     // get second annotation for second sheet
     uno::Reference< sheet::XSheetAnnotations > aSheetAnnotations (getAnnotations(2), UNO_QUERY_THROW);
     uno::Reference< container::XIndexAccess > xAnnotationsIndex (aSheetAnnotations, UNO_QUERY_THROW);
     uno::Reference< sheet::XSheetAnnotation > aAnnotation (xAnnotationsIndex->getByIndex(1), UNO_QUERY_THROW);
 
-    table::CellAddress xToBeAnalyzedCellAddress = aAnnotation->getPosition();
+    table::CellAddress aToBeAnalyzedCellAddress = aAnnotation->getPosition();
 
     // is the CellAddress ok ?
     CPPUNIT_ASSERT_EQUAL_MESSAGE(
         "GetByIndex Annotation - Wrong SHEET reference position",
-        xSecondTargetCellAddress2.Sheet, xToBeAnalyzedCellAddress.Sheet);
+        aSecondTargetCellAddress2.Sheet, aToBeAnalyzedCellAddress.Sheet);
     CPPUNIT_ASSERT_EQUAL_MESSAGE(
         "GetByIndex Annotation - Wrong COLUMN reference position",
-        xSecondTargetCellAddress2.Column, xToBeAnalyzedCellAddress.Column);
+        aSecondTargetCellAddress2.Column, aToBeAnalyzedCellAddress.Column);
     CPPUNIT_ASSERT_EQUAL_MESSAGE(
         "GetByIndex Annotation - Wrong ROW reference position",
-        xSecondTargetCellAddress2.Row, xToBeAnalyzedCellAddress.Row);
+        aSecondTargetCellAddress2.Row, aToBeAnalyzedCellAddress.Row);
 
     // is the string ok ?
     uno::Reference< text::XTextRange > aTextSheetAnnotation(aAnnotation, UNO_QUERY_THROW);
diff --git a/test/source/sheet/xspreadsheets2.cxx b/test/source/sheet/xspreadsheets2.cxx
index 5da8e96e1f27..75332d5b0ee4 100644
--- a/test/source/sheet/xspreadsheets2.cxx
+++ b/test/source/sheet/xspreadsheets2.cxx
@@ -264,8 +264,8 @@ void XSpreadsheets2::testImportCellStyle()
     uno::Reference< style::XStyleFamiliesSupplier > xFamiliesSupplier (xDestDoc, UNO_QUERY_THROW);
     uno::Reference< container::XNameAccess > xFamiliesNameAccess (xFamiliesSupplier->getStyleFamilies(), UNO_QUERY_THROW);
     OUString aCellFamilyName("CellStyles");
-    uno::Any xCellStylesFamily = xFamiliesNameAccess->getByName(aCellFamilyName);
-    uno::Reference< container::XNameContainer > xCellStylesFamilyNameAccess (xCellStylesFamily, UNO_QUERY_THROW);
+    uno::Any aCellStylesFamily = xFamiliesNameAccess->getByName(aCellFamilyName);
+    uno::Reference< container::XNameContainer > xCellStylesFamilyNameAccess (aCellStylesFamily, UNO_QUERY_THROW);
 
     CPPUNIT_ASSERT_MESSAGE("New cell style not present", xCellStylesFamilyNameAccess->hasByName(aDestStyleName));