diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2017-05-07 14:46:42 +1000 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2017-05-07 14:46:42 +1000 |
| commit | d0a99cc2ed76be220f7e868e332ba19f6e48a440 (patch) | |
| tree | 56addcedd12a0a4f16471e55c46a7835857d5555 /sd/source/ui/sidebar/MasterPageContainer.cxx | |
| parent | 3965f4cb28676133dc37a926e56b4d612e2a57ba (diff) | |
tdf#43157: convert sd module away from OSL_ASSERT to assert
Change-Id: I1e768d23da6adb1a3fe351a8105286b0cb5b5192
Diffstat (limited to 'sd/source/ui/sidebar/MasterPageContainer.cxx')
| -rw-r--r-- | sd/source/ui/sidebar/MasterPageContainer.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sd/source/ui/sidebar/MasterPageContainer.cxx b/sd/source/ui/sidebar/MasterPageContainer.cxx index 9deef401d79e..72f1aa1d5a1a 100644 --- a/sd/source/ui/sidebar/MasterPageContainer.cxx +++ b/sd/source/ui/sidebar/MasterPageContainer.cxx @@ -265,7 +265,7 @@ void MasterPageContainer::ReleaseToken (Token aToken) SharedMasterPageDescriptor pDescriptor = mpImpl->GetDescriptor(aToken); if (pDescriptor.get() != nullptr) { - OSL_ASSERT(pDescriptor->mnUseCount>0); + assert(pDescriptor->mnUseCount>0); --pDescriptor->mnUseCount; if (pDescriptor->mnUseCount <= 0) { @@ -527,7 +527,7 @@ void MasterPageContainer::Implementation::LateInit() { meInitializationState = INITIALIZING; - OSL_ASSERT(Instance().get()==this); + assert(Instance().get()==this); mpRequestQueue.reset(MasterPageContainerQueue::Create( std::shared_ptr<MasterPageContainerQueue::ContainerAdapter>(Instance()))); @@ -576,7 +576,7 @@ void MasterPageContainer::Implementation::UpdatePreviewSizePixel() if (*iDescriptor!=nullptr && (*iDescriptor)->mpMasterPage != nullptr) { Size aPageSize ((*iDescriptor)->mpMasterPage->GetSize()); - OSL_ASSERT(aPageSize.Width() > 0 && aPageSize.Height() > 0); + assert(aPageSize.Width() > 0 && aPageSize.Height() > 0); if (aPageSize.Width() > 0) nWidth = aPageSize.Width(); if (aPageSize.Height() > 0) |