diff options
author | Chris Sherlock <chris.sherlock79@gmail.com> | 2017-05-07 17:03:35 +1000 |
---|---|---|
committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2017-05-07 17:03:35 +1000 |
commit | 97eb00c75e173d4c8d0b483a7941ad3d2f23783e (patch) | |
tree | 7974a8b9423c56982646366b0859dfb2a1a88d50 /sd/source/ui/sidebar | |
parent | d0a99cc2ed76be220f7e868e332ba19f6e48a440 (diff) |
revert OSL_ASSERT changes
Change-Id: I365d140446bd2a62cf8256acbfdd53fe72987380
Diffstat (limited to 'sd/source/ui/sidebar')
-rw-r--r-- | sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/sidebar/DocumentHelper.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/sidebar/MasterPageContainer.cxx | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx index 3e59d9e4aa14..0512139aaf90 100644 --- a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx @@ -90,7 +90,7 @@ void CurrentMasterPagesSelector::dispose() } else { - assert(mrDocument.GetDocSh() != nullptr); + OSL_ASSERT(mrDocument.GetDocSh() != nullptr); } Link<sd::tools::EventMultiplexerEvent&,void> aLink (LINK(this,CurrentMasterPagesSelector,EventMultiplexerListener)); @@ -109,7 +109,7 @@ void CurrentMasterPagesSelector::LateInit() } else { - assert(mrDocument.GetDocSh() != nullptr); + OSL_ASSERT(mrDocument.GetDocSh() != nullptr); } } diff --git a/sd/source/ui/sidebar/DocumentHelper.cxx b/sd/source/ui/sidebar/DocumentHelper.cxx index 4cc72acb2189..d6d7c9fd7585 100644 --- a/sd/source/ui/sidebar/DocumentHelper.cxx +++ b/sd/source/ui/sidebar/DocumentHelper.cxx @@ -311,7 +311,7 @@ void DocumentHelper::AssignMasterPageToPageList ( ::std::vector<SdPage*> aCleanedList; for (iPage=rpPageList->begin(); iPage!=rpPageList->end(); ++iPage) { - assert(*iPage!=nullptr && (*iPage)->GetModel() == &rTargetDocument); + OSL_ASSERT(*iPage!=nullptr && (*iPage)->GetModel() == &rTargetDocument); if (*iPage != nullptr && (*iPage)->GetLayoutName() != sFullLayoutName) { aCleanedList.push_back(*iPage); @@ -477,7 +477,7 @@ SdPage* DocumentHelper::ProvideMasterPage ( if (pMasterPage == nullptr) { // The caller should make sure that the master page is valid. - assert(pMasterPage != nullptr); + OSL_ASSERT(pMasterPage != nullptr); return nullptr; } SdDrawDocument* pSourceDocument = static_cast<SdDrawDocument*>(pMasterPage->GetModel()); diff --git a/sd/source/ui/sidebar/MasterPageContainer.cxx b/sd/source/ui/sidebar/MasterPageContainer.cxx index 72f1aa1d5a1a..9deef401d79e 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) { - assert(pDescriptor->mnUseCount>0); + OSL_ASSERT(pDescriptor->mnUseCount>0); --pDescriptor->mnUseCount; if (pDescriptor->mnUseCount <= 0) { @@ -527,7 +527,7 @@ void MasterPageContainer::Implementation::LateInit() { meInitializationState = INITIALIZING; - assert(Instance().get()==this); + OSL_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()); - assert(aPageSize.Width() > 0 && aPageSize.Height() > 0); + OSL_ASSERT(aPageSize.Width() > 0 && aPageSize.Height() > 0); if (aPageSize.Width() > 0) nWidth = aPageSize.Width(); if (aPageSize.Height() > 0) |