From 234422706914191e90a44130de42e302812a9fe1 Mon Sep 17 00:00:00 2001
From: "cmanske%netscape.com" <cmanske%netscape.com>
Date: Tue, 25 Aug 1998 20:24:04 +0000
Subject: [PATCH] Backed out change intended for testing only

---
 lib/layout/layedit.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/lib/layout/layedit.c b/lib/layout/layedit.c
index de671eb048e..61b8ae73f79 100644
--- a/lib/layout/layedit.c
+++ b/lib/layout/layedit.c
@@ -698,18 +698,17 @@ void lo_MergeElements( MWContext *context, lo_DocState *old_state, int32 iStartL
 	}
 	else
 	{
-//#if 0
-		eptr = /*start_element*/ old_line_array[iStartLine];
-
-		if( eptr )
-		{
-			*pRetHeight = eptr->lo_any.y - *pRetY + eptr->lo_any.line_height;
+#if 0
+		eptr = start_element;
+  		if( eptr )
+  		{
+  			*pRetHeight = eptr->lo_any.y - *pRetY + eptr->lo_any.line_height;
 		}
 		else 
 		{
 			*pRetHeight = -1;
 		}
-#if 0 //#else
+#else
 		XP_ASSERT(0);
 		*pRetHeight = -1;
 #endif