sc/source/core/data/table1.cxx | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit acee46facef9f3eb3406159d6eb03e72a8f41ab0
Author: Caolán McNamara <caol...@redhat.com>
Date: Sun Feb 2 10:48:36 2014 +0000
fix dbgutil build (probably)
Change-Id: Ic60f00d6b9aa450bb749e8ef8d680c4b9abbaa4a
diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx
index 6d60bde..1aff4ab 100644
--- a/sc/source/core/data/table1.cxx
+++ b/sc/source/core/data/table1.cxx
@@ -456,7 +456,8 @@ bool ScTable::SetOptimalHeight(
sc::RowHeightContext& rCxt, SCROW nStartRow, SCROW nEndRow,
ScProgress* pOuterProgress, sal_uLong nProgressStart )
{
- OSL_ENSURE( nExtra==0 || bForce, "automatic OptimalHeight with Extra" );
+ OSL_ENSURE( rCtx.getExtraHeight() == 0 || rCtx.isForceAutoSize(),
+ "automatic OptimalHeight with Extra" );
if ( !pDocument->IsAdjustHeightEnabled() )
{
@@ -485,7 +486,8 @@ void ScTable::SetOptimalHeightOnly(
sc::RowHeightContext& rCxt, SCROW nStartRow, SCROW nEndRow,
ScProgress* pOuterProgress, sal_uLong nProgressStart )
{
- OSL_ENSURE( nExtra==0 || bForce, "automatic OptimalHeight with Extra" );
+ OSL_ENSURE( rCtx.getExtraHeight() == 0 || rCtx.isForceAutoSize(),
+ "automatic OptimalHeight with Extra" );
if ( !pDocument->IsAdjustHeightEnabled() )
return;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
