diff options
Diffstat (limited to 'sd/source/ui/slidesorter/controller/SlsPageSelector.cxx')
-rw-r--r-- | sd/source/ui/slidesorter/controller/SlsPageSelector.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx b/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx index f2603e4f0af3..d47c26f15c81 100644 --- a/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx +++ b/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx @@ -132,7 +132,7 @@ void PageSelector::SetCoreSelection() void PageSelector::SelectPage (int nPageIndex) { SharedPageDescriptor pDescriptor (mrModel.GetPageDescriptor(nPageIndex)); - if (pDescriptor.get() != NULL) + if (pDescriptor.get() != nullptr) SelectPage(pDescriptor); } @@ -140,13 +140,13 @@ void PageSelector::SelectPage (const SdPage* pPage) { const sal_Int32 nPageIndex (mrModel.GetIndex(pPage)); SharedPageDescriptor pDescriptor (mrModel.GetPageDescriptor(nPageIndex)); - if (pDescriptor.get()!=NULL && pDescriptor->GetPage()==pPage) + if (pDescriptor.get()!=nullptr && pDescriptor->GetPage()==pPage) SelectPage(pDescriptor); } void PageSelector::SelectPage (const SharedPageDescriptor& rpDescriptor) { - if (rpDescriptor.get()!=NULL + if (rpDescriptor.get()!=nullptr && mrSlideSorter.GetView().SetState(rpDescriptor, PageDescriptor::ST_Selected, true)) { ++mnSelectedPageCount; @@ -154,7 +154,7 @@ void PageSelector::SelectPage (const SharedPageDescriptor& rpDescriptor) mrSlideSorter.GetView().RequestRepaint(rpDescriptor); mpMostRecentlySelectedPage = rpDescriptor; - if (mpSelectionAnchor == 0) + if (mpSelectionAnchor == nullptr) mpSelectionAnchor = rpDescriptor; if (mnBroadcastDisableLevel > 0) @@ -172,7 +172,7 @@ void PageSelector::DeselectPage ( const bool bUpdateCurrentPage) { model::SharedPageDescriptor pDescriptor (mrModel.GetPageDescriptor(nPageIndex)); - if (pDescriptor.get() != NULL) + if (pDescriptor.get() != nullptr) DeselectPage(pDescriptor, bUpdateCurrentPage); } @@ -180,7 +180,7 @@ void PageSelector::DeselectPage ( const SharedPageDescriptor& rpDescriptor, const bool bUpdateCurrentPage) { - if (rpDescriptor.get()!=NULL + if (rpDescriptor.get()!=nullptr && mrSlideSorter.GetView().SetState(rpDescriptor, PageDescriptor::ST_Selected, false)) { --mnSelectedPageCount; @@ -222,7 +222,7 @@ void PageSelector::CheckConsistency() const bool PageSelector::IsPageSelected (int nPageIndex) { SharedPageDescriptor pDescriptor (mrModel.GetPageDescriptor(nPageIndex)); - if (pDescriptor.get() != NULL) + if (pDescriptor.get() != nullptr) return pDescriptor->HasState(PageDescriptor::ST_Selected); else return false; @@ -270,7 +270,7 @@ std::shared_ptr<PageSelector::PageSelection> PageSelector::GetPageSelection() co for (int nIndex=0; nIndex<nPageCount; nIndex++) { SharedPageDescriptor pDescriptor (mrModel.GetPageDescriptor(nIndex)); - if (pDescriptor.get()!=NULL && pDescriptor->HasState(PageDescriptor::ST_Selected)) + if (pDescriptor.get()!=nullptr && pDescriptor->HasState(PageDescriptor::ST_Selected)) pSelection->push_back(pDescriptor->GetPage()); } @@ -353,14 +353,14 @@ PageSelector::UpdateLock::~UpdateLock() void PageSelector::UpdateLock::Release() { - if (mpSelector != NULL) + if (mpSelector != nullptr) { --mpSelector->mnUpdateLockCount; OSL_ASSERT(mpSelector->mnUpdateLockCount >= 0); if (mpSelector->mnUpdateLockCount == 0) mpSelector->UpdateCurrentPage(true); - mpSelector = NULL; + mpSelector = nullptr; } } |