diff --git a/src/ChangeLog b/src/ChangeLog
index d03913f0fb..cafaf963bf 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2003-07-26  André Pönitz  <poenitz@gmx.net>
+
+	* text.C (setHeightOfRow): restrict scope of temporary variable
+
 2003-07-27  Asger Alstrup  <alstrup@local>
 
 	* text.C (fill): Optimise algorithm to exploit that we can reuse
diff --git a/src/text.C b/src/text.C
index 42667d24af..8faf098024 100644
--- a/src/text.C
+++ b/src/text.C
@@ -1055,8 +1055,6 @@ void LyXText::setHeightOfRow(RowList::iterator rit)
 	float layoutasc = 0;
 	float layoutdesc = 0;
 	float tmptop = 0;
-	LyXFont tmpfont;
-	InsetOld * tmpinset = 0;
 
 	// ok, let us initialize the maxasc and maxdesc value.
 	// This depends in LaTeX of the font of the last character
@@ -1103,8 +1101,8 @@ void LyXText::setHeightOfRow(RowList::iterator rit)
 		// Check if any insets are larger
 		for (pos_type pos = rit->pos(); pos <= pos_end; ++pos) {
 			if (pit->isInset(pos)) {
-				tmpfont = getFont(bv()->buffer(), pit, pos);
-				tmpinset = pit->getInset(pos);
+				LyXFont const & tmpfont = getFont(bv()->buffer(), pit, pos);
+				InsetOld * tmpinset = pit->getInset(pos);
 				if (tmpinset) {
 #if 1 // this is needed for deep update on initialitation
 #warning inset->update FIXME