From 5abc669599001bf888b97c4d3c2715e1fb7523b9 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 20 Apr 2016 10:34:01 +0200 Subject: new plugin stylepolice check for local variables which follow our member field naming convention, which is highly confusing Change-Id: Idacedf7145d09843e96a584237b385f7662eea10 --- sc/qa/extras/check_data_pilot_field.cxx | 4 ++-- sc/qa/extras/check_data_pilot_table.cxx | 4 ++-- sc/qa/extras/check_xcell_ranges_query.cxx | 10 +++++----- sc/qa/unit/subsequent_export-test.cxx | 16 ++++++++-------- 4 files changed, 17 insertions(+), 17 deletions(-) (limited to 'sc/qa') 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 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 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 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()); } } -- cgit