diff options
author | Noel Grandin <noel@peralex.com> | 2016-04-25 09:59:16 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2016-04-26 10:55:58 +0000 |
commit | e8fd5a07eca70912ddee45aaa34d434809b59fb7 (patch) | |
tree | d5dc890d12987cad73f5e64301f823ba23a97f2d /desktop | |
parent | e6adb3e8b4de3c0f78d249b83de19b849ef65b59 (diff) |
update loplugin stylepolice to check local pointers vars
are actually pointer vars.
Also convert from regex to normal code, so we can enable this
plugin all the time.
Change-Id: Ie36a25ecba61c18f99c77c77646d6459a443cbd1
Reviewed-on: https://gerrit.libreoffice.org/24391
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'desktop')
-rw-r--r-- | desktop/qa/desktop_lib/test_desktop_lib.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx b/desktop/qa/desktop_lib/test_desktop_lib.cxx index c73e680f5063..93bde3decb7f 100644 --- a/desktop/qa/desktop_lib/test_desktop_lib.cxx +++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx @@ -774,10 +774,10 @@ void DesktopLOKTest::testSheetOperations() CPPUNIT_ASSERT_EQUAL(pDocument->pClass->getParts(pDocument), 6); - std::vector<OString> pExpected = { "FirstSheet", "Renamed", "Sheet3", "Sheet4", "Sheet5", "LastSheet" }; + std::vector<OString> aExpected = { "FirstSheet", "Renamed", "Sheet3", "Sheet4", "Sheet5", "LastSheet" }; for (int i = 0; i < 6; ++i) { - CPPUNIT_ASSERT_EQUAL(pExpected[i], OString(pDocument->pClass->getPartName(pDocument, i))); + CPPUNIT_ASSERT_EQUAL(aExpected[i], OString(pDocument->pClass->getPartName(pDocument, i))); } comphelper::LibreOfficeKit::setActive(false); @@ -831,13 +831,13 @@ void DesktopLOKTest::testSheetSelections() { char* pUsedMimeType = nullptr; char* pCopiedContent = pDocument->pClass->getTextSelection(pDocument, nullptr, &pUsedMimeType); - std::vector<int> pExpected = {5, 6, 7, 8, 9}; + std::vector<int> aExpected = {5, 6, 7, 8, 9}; std::istringstream iss(pCopiedContent); - for (size_t i = 0; i < pExpected.size(); i++) + for (size_t i = 0; i < aExpected.size(); i++) { std::string token; iss >> token; - CPPUNIT_ASSERT_EQUAL(pExpected[i], std::stoi(token)); + CPPUNIT_ASSERT_EQUAL(aExpected[i], std::stoi(token)); } free(pUsedMimeType); @@ -877,13 +877,13 @@ void DesktopLOKTest::testSheetSelections() { char* pUsedMimeType = nullptr; char* pCopiedContent = pDocument->pClass->getTextSelection(pDocument, nullptr, &pUsedMimeType); - std::vector<int> pExpected = { 8 }; + std::vector<int> aExpected = { 8 }; std::istringstream iss(pCopiedContent); - for (size_t i = 0; i < pExpected.size(); i++) + for (size_t i = 0; i < aExpected.size(); i++) { std::string token; iss >> token; - CPPUNIT_ASSERT_EQUAL(pExpected[i], std::stoi(token)); + CPPUNIT_ASSERT_EQUAL(aExpected[i], std::stoi(token)); } free(pUsedMimeType); |