From 9fe6d655f3a7089a4b47011f8a9704f212aaa8d5 Mon Sep 17 00:00:00 2001
From: Vincent van Ravesteijn <vfr@lyx.org>
Date: Thu, 25 Nov 2010 13:22:04 +0000
Subject: [PATCH] Reuse some code and simplify InsetTabular::cursorPos()

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36487 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/insets/InsetTabular.cpp | 24 +++++++++++++-----------
 src/insets/InsetTabular.h   |  2 ++
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp
index 7818b709cb..311143345a 100644
--- a/src/insets/InsetTabular.cpp
+++ b/src/insets/InsetTabular.cpp
@@ -4720,21 +4720,13 @@ void InsetTabular::cursorPos(BufferView const & bv,
 {
 	cell(sl.idx())->cursorPos(bv, sl, boundary, x, y);
 
-	int const row = tabular.cellRow(sl.idx());
-	int const col = tabular.cellColumn(sl.idx());
-
 	// y offset	correction
-	for (int r = 0;	r < row; ++r)
-		y += tabular.rowDescent(r) + tabular.rowAscent(r + 1) 
-			+ tabular.interRowSpace(r + 1);
-
+	y += cellYPos(sl.idx());
 	y += tabular.textVOffset(sl.idx());
 	y += offset_valign_;
 
 	// x offset correction
-	for (int c = 0; c < col; ++c)
-		x += tabular.column_info[c].width;
-	
+	x += cellXPos(sl.idx());
 	x += tabular.textHOffset(sl.idx());
 	x += ADD_TO_TABULAR_WIDTH;
 	x += scx_;
@@ -4807,13 +4799,23 @@ InsetTabular::idx_type InsetTabular::getNearestCell(BufferView & bv, int x, int
 }
 
 
+int InsetTabular::cellYPos(idx_type const cell) const
+{
+	row_type row = tabular.cellRow(cell);
+	int ly = 0;
+	for (row_type r = 0; r < row; ++r)
+		ly += tabular.rowDescent(r) + tabular.rowAscent(r + 1) 
+			+ tabular.interRowSpace(r + 1);
+	return ly;
+}
+
+
 int InsetTabular::cellXPos(idx_type const cell) const
 {
 	col_type col = tabular.cellColumn(cell);
 	int lx = 0;
 	for (col_type c = 0; c < col; ++c)
 		lx += tabular.column_info[c].width;
-
 	return lx;
 }
 
diff --git a/src/insets/InsetTabular.h b/src/insets/InsetTabular.h
index 2a7b23980f..0b192b83bd 100644
--- a/src/insets/InsetTabular.h
+++ b/src/insets/InsetTabular.h
@@ -928,6 +928,8 @@ private:
 	///
 	int cellXPos(idx_type cell) const;
 	///
+	int cellYPos(idx_type cell) const;
+	///
 	void resetPos(Cursor & cur) const;
 	///
 	bool copySelection(Cursor & cur);
-- 
2.39.2