]> git.lyx.org Git - features.git/commitdiff
Backport fix for bug #7547.
authorRichard Heck <rgheck@comcast.net>
Wed, 11 May 2011 14:14:09 +0000 (14:14 +0000)
committerRichard Heck <rgheck@comcast.net>
Wed, 11 May 2011 14:14:09 +0000 (14:14 +0000)
We need to check whether we are in a multirow here.
Otherwise, we were asking to construct strings of random size at a
certain point, e.g., two 2GB strings, in one case I saw.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@38705 a592a061-630c-0410-9148-cb99ea01b6c8

src/insets/InsetTabular.cpp

index ad97053bb1b6609203ac86c27f32a55d829a941d..4686862826697d1a2d0c471f80eb8b19b524f378 100644 (file)
@@ -3177,7 +3177,7 @@ void Tabular::plaintext(odocstream & os,
                if (!onlydata && plaintextTopHLine(os, r, clen))
                        os << docstring(depth * 2, ' ');
                for (col_type c = 0; c < ncols(); ++c) {
-                       if (isPartOfMultiColumn(r, c))
+                       if (isPartOfMultiColumn(r, c) || isPartOfMultiRow(r,c))
                                continue;
                        if (onlydata && c > 0)
                                // we don't use operator<< for single UCS4 character.