BufferParams.cpp: fix bug 3568:

[lyx.git] / src / Cursor.cpp

diff --git a/src/Cursor.cpp b/src/Cursor.cpp
index e0c507ecb1c85e05c6d60c6741bd6a829e374650..fd6bb6e7d8512e6a6dfb46993af2f5660a069e77 100644 (file)
--- a/src/Cursor.cpp
+++ b/src/Cursor.cpp
@@ -245,6 +245,16 @@ namespace {
                return true;
        }
 
+       docstring parbreak(Paragraph const & par)
+       {
+               odocstringstream ods;
+               ods << '\n';
+               // only add blank line if we're not in an ERT inset
+               if (par.ownerCode() != Inset::ERT_CODE)
+                       ods << '\n';
+               return ods.str();
+       }
+
 } // namespace anon
 
 
@@ -1176,21 +1186,16 @@ docstring Cursor::selectionAsString(bool label) const
                if (startpit == endpit)
                        return pars[startpit].asString(buffer, startpos, endpos, label);
 
-               odocstringstream ods;
-               ods << "\n";
-               // only add blank line if we're not in an ERT inset
-               if (pars[startpit].ownerCode() != Inset::ERT_CODE)
-                       ods << "\n";
-               docstring const parbreak = ods.str();
-
                // First paragraph in selection
                docstring result = pars[startpit].
-                       asString(buffer, startpos, pars[startpit].size(), label) + parbreak;
+                       asString(buffer, startpos, pars[startpit].size(), label)
+                                + parbreak(pars[startpit]);
 
                // The paragraphs in between (if any)
                for (pit_type pit = startpit + 1; pit != endpit; ++pit) {
                        Paragraph const & par = pars[pit];
-                       result += par.asString(buffer, 0, par.size(), label) + parbreak;
+                       result += par.asString(buffer, 0, par.size(), label)
+                                 + parbreak(pars[pit]);
                }
 
                // Last paragraph in selection