--- Revision 353338353339
+++ Revision 323664646231
@@ -16,9 +16,13 @@
 	sheet = ThisComponent.Sheets(address.Sheet)
 	For x = address.StartColumn To address.EndColumn
 		For y = address.StartRow To address.EndRow
-			cell = sheet.getCellByPosition(x, y)
+			cell = sheet.getCellByPosition(x, y)					
 			If (cell.String = "") Then
-				Exit For
+				If (y = address.StartRow) Then
+					Exit Sub
+				Else
+					Exit For
+				End If
 			End If
 			ReplaceHyperlink(cell)
 		Next