Kaydet (Commit) 3893b922 authored tarafından Michael Stahl's avatar Michael Stahl

also convert assertions in previous commit

üst a8f3f3ee
...@@ -350,7 +350,7 @@ inline const SwXMLTableCell_Impl *SwXMLTableRow_Impl::GetCell( sal_uInt32 nCol ) ...@@ -350,7 +350,7 @@ inline const SwXMLTableCell_Impl *SwXMLTableRow_Impl::GetCell( sal_uInt32 nCol )
OSL_ENSURE( nCol < USHRT_MAX, OSL_ENSURE( nCol < USHRT_MAX,
"SwXMLTableRow_Impl::GetCell: column number is to big" ); "SwXMLTableRow_Impl::GetCell: column number is to big" );
// #i95726# - some fault tolerance // #i95726# - some fault tolerance
OSL_ENSURE( nCol < aCells.Count(), OSL_ENSURE( nCol < aCells.size(),
"SwXMLTableRow_Impl::GetCell: column number is out of bound" ); "SwXMLTableRow_Impl::GetCell: column number is out of bound" );
return nCol < aCells.size() ? &aCells[(sal_uInt16)nCol] : 0; return nCol < aCells.size() ? &aCells[(sal_uInt16)nCol] : 0;
} }
...@@ -360,7 +360,7 @@ inline SwXMLTableCell_Impl *SwXMLTableRow_Impl::GetCell( sal_uInt32 nCol ) ...@@ -360,7 +360,7 @@ inline SwXMLTableCell_Impl *SwXMLTableRow_Impl::GetCell( sal_uInt32 nCol )
OSL_ENSURE( nCol < USHRT_MAX, OSL_ENSURE( nCol < USHRT_MAX,
"SwXMLTableRow_Impl::GetCell: column number is to big" ); "SwXMLTableRow_Impl::GetCell: column number is to big" );
// #i95726# - some fault tolerance // #i95726# - some fault tolerance
OSL_ENSURE( nCol < aCells.Count(), OSL_ENSURE( nCol < aCells.size(),
"SwXMLTableRow_Impl::GetCell: column number is out of bound" ); "SwXMLTableRow_Impl::GetCell: column number is out of bound" );
return nCol < aCells.size() ? &aCells[(sal_uInt16)nCol] : 0; return nCol < aCells.size() ? &aCells[(sal_uInt16)nCol] : 0;
} }
...@@ -380,7 +380,7 @@ void SwXMLTableRow_Impl::Expand( sal_uInt32 nCells, sal_Bool bOneCell ) ...@@ -380,7 +380,7 @@ void SwXMLTableRow_Impl::Expand( sal_uInt32 nCells, sal_Bool bOneCell )
nColSpan--; nColSpan--;
} }
OSL_ENSURE( nCells<=aCells.Count(), OSL_ENSURE( nCells<=aCells.size(),
"SwXMLTableRow_Impl::Expand: wrong number of cells" ); "SwXMLTableRow_Impl::Expand: wrong number of cells" );
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment