diff options
Diffstat (limited to 'sd/source/ui/slidesorter/model')
-rw-r--r-- | sd/source/ui/slidesorter/model/SlideSorterModel.cxx | 10 | ||||
-rw-r--r-- | sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx index cf51887bc5c5..0416857d716a 100644 --- a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx +++ b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx @@ -78,19 +78,19 @@ namespace { if ( ! pDescriptor) { PrintModel(rModel); - assert(pDescriptor); + OSL_ASSERT(pDescriptor); return false; } if (nIndex != pDescriptor->GetPageIndex()) { PrintModel(rModel); - assert(nIndex == pDescriptor->GetPageIndex()); + OSL_ASSERT(nIndex == pDescriptor->GetPageIndex()); return false; } if (nIndex != pDescriptor->GetVisualState().mnPageId) { PrintModel(rModel); - assert(nIndex == pDescriptor->GetVisualState().mnPageId); + OSL_ASSERT(nIndex == pDescriptor->GetVisualState().mnPageId); return false; } } @@ -462,7 +462,7 @@ void SlideSorterModel::UpdatePageList() default: // We should never get here. - assert(false); + OSL_ASSERT(false); break; } } @@ -618,7 +618,7 @@ void SlideSorterModel::UpdateIndices (const sal_Int32 nFirstIndex) { if (rpDescriptor->GetPageIndex()!=nDescriptorIndex) { - assert(rpDescriptor->GetPageIndex()==nDescriptorIndex); + OSL_ASSERT(rpDescriptor->GetPageIndex()==nDescriptorIndex); } } else diff --git a/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx b/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx index 0737d00cada6..39211e967b21 100644 --- a/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx +++ b/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx @@ -50,8 +50,8 @@ PageDescriptor::PageDescriptor ( mbIsMouseOver(false), mbHasTransition(false) { - assert(mpPage); - assert(mpPage == SdPage::getImplementation(rxPage)); + OSL_ASSERT(mpPage); + OSL_ASSERT(mpPage == SdPage::getImplementation(rxPage)); if (mpPage != nullptr) { if (mpPage->TRG_HasMasterPage()) @@ -125,7 +125,7 @@ bool PageDescriptor::HasState (const State eState) const return mpPage!=nullptr && mpPage->IsExcluded(); default: - assert(false); + OSL_ASSERT(false); return false; } } @@ -205,7 +205,7 @@ void PageDescriptor::SetCoreSelection() mpPage->SetSelected(false); else { - assert(mpPage!=nullptr); + OSL_ASSERT(mpPage!=nullptr); } } |