sw/source/core/docnode/ndcopy.cxx | 2 +-
sw/source/core/table/swtable.cxx | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit d15c240434d61422e718a08db7d184d86f2b5f15
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue May 15 09:43:56 2018 +0100
OSL_ENSURE->assert
Change-Id: I6b93a221bc00fd92ef01135727c7e50560fb4517
Reviewed-on: https://gerrit.libreoffice.org/54357
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
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
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
