diff options
| author | Noel Grandin <noel@peralex.com> | 2016-04-27 09:22:13 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-04-28 09:31:16 +0000 |
| commit | 43b4903db3e925c652e25c34362490f8adc9c5ec (patch) | |
| tree | af12777b72d42280467e8cc19b914b2c7f4f3816 /sd/qa | |
| parent | 7d6308dad9f4a079d57719a6e3a9c4cebb47d051 (diff) | |
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>
Diffstat (limited to 'sd/qa')
| -rw-r--r-- | sd/qa/unit/misc-tests.cxx | 16 | ||||
| -rw-r--r-- | sd/qa/unit/sdmodeltestbase.hxx | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/sd/qa/unit/misc-tests.cxx b/sd/qa/unit/misc-tests.cxx index 857fbdd2103c..f2ac807f1bab 100644 --- a/sd/qa/unit/misc-tests.cxx +++ b/sd/qa/unit/misc-tests.cxx @@ -111,12 +111,12 @@ void SdMiscTest::testTdf96206() sd::DrawDocShellRef xDocSh = Load(m_directories.getURLFromSrc("/sd/qa/unit/data/odp/tdf96206.odp"), ODP); sd::ViewShell *pViewShell = xDocSh->GetViewShell(); auto pSSVS = sd::slidesorter::SlideSorterViewShell::GetSlideSorter(pViewShell->GetViewShellBase()); - auto& xSSController = pSSVS->GetSlideSorter().GetController(); + auto& rSSController = pSSVS->GetSlideSorter().GetController(); const sal_uInt16 nMasterPageCnt1 = xDocSh->GetDoc()->GetMasterSdPageCount(PageKind::PK_STANDARD); CPPUNIT_ASSERT_EQUAL(sal_uInt16(2), nMasterPageCnt1); - xSSController.GetClipboard().DoCopy(); - xSSController.GetClipboard().DoPaste(); + rSSController.GetClipboard().DoCopy(); + rSSController.GetClipboard().DoPaste(); const sal_uInt16 nMasterPageCnt2 = xDocSh->GetDoc()->GetMasterSdPageCount(PageKind::PK_STANDARD); CPPUNIT_ASSERT_EQUAL(nMasterPageCnt1, nMasterPageCnt2); @@ -128,19 +128,19 @@ void SdMiscTest::testTdf96708() sd::DrawDocShellRef xDocSh = Load(m_directories.getURLFromSrc("/sd/qa/unit/data/odp/tdf96708.odp"), ODP); sd::ViewShell *pViewShell = xDocSh->GetViewShell(); auto pSSVS = sd::slidesorter::SlideSorterViewShell::GetSlideSorter(pViewShell->GetViewShellBase()); - auto& xSSController = pSSVS->GetSlideSorter().GetController(); - auto& xPageSelector = xSSController.GetPageSelector(); + auto& rSSController = pSSVS->GetSlideSorter().GetController(); + auto& rPageSelector = rSSController.GetPageSelector(); const sal_uInt16 nMasterPageCnt1 = xDocSh->GetDoc()->GetMasterSdPageCount(PageKind::PK_STANDARD); CPPUNIT_ASSERT_EQUAL(sal_uInt16(4), nMasterPageCnt1); - xPageSelector.SelectAllPages(); - xSSController.GetClipboard().DoCopy(); + rPageSelector.SelectAllPages(); + rSSController.GetClipboard().DoCopy(); // Now wait for timers to trigger creation of auto-layout osl::Thread::wait(std::chrono::milliseconds(100)); Scheduler::ProcessTaskScheduling(true); - xSSController.GetClipboard().DoPaste(); + rSSController.GetClipboard().DoPaste(); const sal_uInt16 nMasterPageCnt2 = xDocSh->GetDoc()->GetMasterSdPageCount(PageKind::PK_STANDARD); CPPUNIT_ASSERT_EQUAL(nMasterPageCnt1, nMasterPageCnt2); diff --git a/sd/qa/unit/sdmodeltestbase.hxx b/sd/qa/unit/sdmodeltestbase.hxx index f40efa6f82a4..edf11f949384 100644 --- a/sd/qa/unit/sdmodeltestbase.hxx +++ b/sd/qa/unit/sdmodeltestbase.hxx @@ -224,7 +224,7 @@ protected: uno::Reference< drawing::XDrawPages > xDrawPages = xDrawPagesSupplier->getDrawPages(); CPPUNIT_ASSERT(xDrawPages.is()); - XShapeDumper xShapeDumper; + XShapeDumper aShapeDumper; sal_Int32 nLength = xDrawPages->getCount(); for (sal_Int32 i = 0; i < nLength; ++i) { |