return early.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30936 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/Cursor.cpp b/src/Cursor.cpp
index 2fcca3b556d50650e6b2156c82f35c6b04ff7736..b4aee4cf6942b1b7b8cc8564ab425c97b425e5ef 100644 (file)
--- a/src/Cursor.cpp
+++ b/src/Cursor.cpp
@@ -1931,51 +1931,47 @@ docstring Cursor::selectionAsString(bool with_label) const
        if (!selection())
                return docstring();
 
+       if (inMathed())
+               return cap::grabSelection(*this);
+
        int const label = with_label
                ? AS_STR_LABEL | AS_STR_INSETS : AS_STR_INSETS;
 
-       if (inTexted()) {
-               idx_type const startidx = selBegin().idx();
-               idx_type const endidx = selEnd().idx();
-               if (startidx != endidx) {
-                       // multicell selection
-                       InsetTabular * table = inset().asInsetTabular();
-                       LASSERT(table, return docstring());
-                       return table->asString(startidx, endidx);
-               }
-               
-               ParagraphList const & pars = text()->paragraphs();
-
-               pit_type const startpit = selBegin().pit();
-               pit_type const endpit = selEnd().pit();
-               size_t const startpos = selBegin().pos();
-               size_t const endpos = selEnd().pos();
-
-               if (startpit == endpit)
-                       return pars[startpit].asString(startpos, endpos, label);
-
-               // First paragraph in selection
-               docstring result = pars[startpit].
-                       asString(startpos, pars[startpit].size(), label)
-                                + parbreak(inset().lyxCode());
-
-               // The paragraphs in between (if any)
-               for (pit_type pit = startpit + 1; pit != endpit; ++pit) {
-                       Paragraph const & par = pars[pit];
-                       result += par.asString(0, par.size(), label)
-                                 + parbreak(inset().lyxCode());
-               }
+       idx_type const startidx = selBegin().idx();
+       idx_type const endidx = selEnd().idx();
+       if (startidx != endidx) {
+               // multicell selection
+               InsetTabular * table = inset().asInsetTabular();
+               LASSERT(table, return docstring());
+               return table->asString(startidx, endidx);
+       }
 
-               // Last paragraph in selection
-               result += pars[endpit].asString(0, endpos, label);
+       ParagraphList const & pars = text()->paragraphs();
 
-               return result;
+       pit_type const startpit = selBegin().pit();
+       pit_type const endpit = selEnd().pit();
+       size_t const startpos = selBegin().pos();
+       size_t const endpos = selEnd().pos();
+
+       if (startpit == endpit)
+               return pars[startpit].asString(startpos, endpos, label);
+
+       // First paragraph in selection
+       docstring result = pars[startpit].
+               asString(startpos, pars[startpit].size(), label)
+               + parbreak(inset().lyxCode());
+
+       // The paragraphs in between (if any)
+       for (pit_type pit = startpit + 1; pit != endpit; ++pit) {
+               Paragraph const & par = pars[pit];
+               result += par.asString(0, par.size(), label)
+                       + parbreak(inset().lyxCode());
        }
 
-       if (inMathed())
-               return cap::grabSelection(*this);
+       // Last paragraph in selection
+       result += pars[endpit].asString(0, endpos, label);
 
-       return docstring();
+       return result;
 }