X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetTabular.cpp;h=69f9e73e59f0f0f11e125f2c80e4ba5449048455;hb=8124e6c02ea1fd6779bb6c47ffe2bca2c8bd2d97;hp=163f162aa733c0b98e0d211d3855c2d6fcf89a36;hpb=fb70f89983c8ca3d263ce6e73f058c3fb2f41c8f;p=lyx.git

diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp
index 163f162aa7..69f9e73e59 100644
--- a/src/insets/InsetTabular.cpp
+++ b/src/insets/InsetTabular.cpp
@@ -7516,10 +7516,15 @@ docstring InsetTabular::asString(idx_type stidx, idx_type enidx,
 {
 	LASSERT(stidx <= enidx, return docstring());
 	docstring retval;
-	col_type const col1 = tabular.cellColumn(stidx);
-	col_type const col2 = tabular.cellColumn(enidx);
-	row_type const row1 = tabular.cellRow(stidx);
-	row_type const row2 = tabular.cellRow(enidx);
+	col_type col1 = tabular.cellColumn(stidx);
+	col_type col2 = tabular.cellColumn(enidx);
+	row_type row1 = tabular.cellRow(stidx);
+	row_type row2 = tabular.cellRow(enidx);
+	// stidx might be in a later column or row than enidx
+	if (col1 > col2)
+		swap(col1, col2);
+	if (row1 > row2)
+		swap(row1, row2);
 	bool first = true;
 	for (col_type col = col1; col <= col2; col++)
 		for (row_type row = row1; row <= row2; row++) {
@@ -7537,10 +7542,15 @@ ParagraphList InsetTabular::asParList(idx_type stidx, idx_type enidx)
 {
 	LASSERT(stidx <= enidx, return ParagraphList());
 	ParagraphList retval;
-	col_type const col1 = tabular.cellColumn(stidx);
-	col_type const col2 = tabular.cellColumn(enidx);
-	row_type const row1 = tabular.cellRow(stidx);
-	row_type const row2 = tabular.cellRow(enidx);
+	col_type col1 = tabular.cellColumn(stidx);
+	col_type col2 = tabular.cellColumn(enidx);
+	row_type row1 = tabular.cellRow(stidx);
+	row_type row2 = tabular.cellRow(enidx);
+	// stidx might be in a later column or row than enidx
+	if (col1 > col2)
+		swap(col1, col2);
+	if (row1 > row2)
+		swap(row1, row2);
 	for (col_type col = col1; col <= col2; col++)
 		for (row_type row = row1; row <= row2; row++)
 			for (auto const & par : tabular.cellInset(row, col)->paragraphs())