diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-05-15 09:43:56 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-05-15 12:55:40 +0200 |
| commit | d15c240434d61422e718a08db7d184d86f2b5f15 (patch) | |
| tree | d92a23bfe4748dc7a5b2e114f9f8937572edca89 | |
| parent | a09888adcd1de54dcf90968ed447d196ebf0429a (diff) | |
OSL_ENSURE->assert
Change-Id: I6b93a221bc00fd92ef01135727c7e50560fb4517
Reviewed-on: https://gerrit.libreoffice.org/54357
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | sw/source/core/docnode/ndcopy.cxx | 2 | ||||
| -rw-r--r-- | sw/source/core/table/swtable.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/core/docnode/ndcopy.cxx b/sw/source/core/docnode/ndcopy.cxx index e68183af8ef0..0463edeaef2a 100644 --- a/sw/source/core/docnode/ndcopy.cxx +++ b/sw/source/core/docnode/ndcopy.cxx @@ -180,7 +180,7 @@ static void lcl_CopyTableBox( SwTableBox* pBox, CopyTable* pCT ) else { SwNodeIndex aNewIdx(*pCT->m_pTableNd, pBox->GetSttIdx() - pCT->m_nOldTableSttIdx); - OSL_ENSURE( aNewIdx.GetNode().IsStartNode(), "Index is not on the start node" ); + assert(aNewIdx.GetNode().IsStartNode() && "Index is not on the start node"); pNewBox = new SwTableBox(pBoxFormat, aNewIdx, pCT->m_pInsLine); pNewBox->setRowSpan( pBox->getRowSpan() ); diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx index 2b69e6fe6302..fdc1633e7c73 100644 --- a/sw/source/core/table/swtable.cxx +++ b/sw/source/core/table/swtable.cxx @@ -1628,7 +1628,7 @@ SwTableBox::SwTableBox( SwTableBoxFormat* pFormat, const SwNodeIndex &rIdx, // insert into the table const SwTableNode* pTableNd = m_pStartNode->FindTableNode(); - OSL_ENSURE( pTableNd, "In which table is that box?" ); + assert(pTableNd && "In which table is that box?"); SwTableSortBoxes& rSrtArr = const_cast<SwTableSortBoxes&>(pTableNd->GetTable(). GetTabSortBoxes()); SwTableBox* p = this; // error: &this |