* BufferParams:

[lyx.git] / src / insets / insettabular.C

diff --git a/src/insets/insettabular.C b/src/insets/insettabular.C
index f5593d526075d7b3c47c8a5bf9f6a8748b650728..eaa5a72488f83268c9d9017e097547b0388473ea 100644 (file)
--- a/src/insets/insettabular.C
+++ b/src/insets/insettabular.C
@@ -537,8 +537,13 @@ void InsetTabular::doDispatch(LCursor & cur, FuncRequest & cmd)
        case LFUN_MOUSE_RELEASE:
                //lyxerr << "# InsetTabular::MouseRelease\n" << bvcur << endl;
                if (cmd.button() == mouse_button::button1) {
-                       if (bvcur.selection() && !tablemode(bvcur))
-                               saveSelection(bvcur);
+                       if (bvcur.selection()) {
+                               // Bug3238: disable persistent selection for table cells for now
+                               if (tablemode(bvcur))
+                                       theSelection().haveSelection(true);
+                               else
+                                       saveSelection(bvcur);
+                       }
                } else if (cmd.button() == mouse_button::button3)
                        InsetTabularMailer(*this).showDialog(&cur.bv());
                break;
@@ -597,8 +602,13 @@ void InsetTabular::doDispatch(LCursor & cur, FuncRequest & cmd)
                                TextMetrics const & tm =
                                        cur.bv().textMetrics(cell(cur.idx())->getText(0));
                                cur.pos() = tm.x2pos(cur.pit(), 0, cur.targetX());
-                               if (cmd.action == LFUN_DOWN_SELECT && !tablemode(cur))
-                                       saveSelection(cur);
+                               if (cmd.action == LFUN_DOWN_SELECT) {
+                                       // Bug3238: disable persistent selection for table cells for now
+                                       if (tablemode(cur))
+                                               theSelection().haveSelection(true);
+                                       else
+                                               saveSelection(cur);
+                               }
                        }
                if (sl == cur.top()) {
                        // we trick it to go to the RIGHT after leaving the
@@ -624,8 +634,13 @@ void InsetTabular::doDispatch(LCursor & cur, FuncRequest & cmd)
                                ParagraphMetrics const & pm =
                                        tm.parMetrics(cur.lastpit());
                                cur.pos() = tm.x2pos(cur.pit(), pm.rows().size()-1, cur.targetX());
-                               if (cmd.action == LFUN_UP_SELECT && !tablemode(cur))
-                                       saveSelection(cur);
+                               if (cmd.action == LFUN_UP_SELECT) {
+                                       // Bug3238: disable persistent selection for table cells for now
+                                       if (tablemode(cur))
+                                               theSelection().haveSelection(true);
+                                       else
+                                               saveSelection(cur);
+                               }
                        }
                if (sl == cur.top()) {
                        cmd = FuncRequest(LFUN_FINISHED_UP);
@@ -1078,22 +1093,24 @@ bool InsetTabular::getStatus(LCursor & cur, FuncRequest const & cmd,
 
 
 int InsetTabular::latex(Buffer const & buf, odocstream & os,
-                       OutputParams const & runparams) const
+                        OutputParams const & runparams) const
 {
        return tabular.latex(buf, os, runparams);
 }
 
 
 int InsetTabular::plaintext(Buffer const & buf, odocstream & os,
-                       OutputParams const & runparams) const
+                            OutputParams const & runparams) const
 {
-       int const dp = runparams.linelen ? runparams.depth : 0;
-       return tabular.plaintext(buf, os, runparams, dp, false, 0);
+       os << '\n'; // output table on a new line
+       int const dp = runparams.linelen > 0 ? runparams.depth : 0;
+       tabular.plaintext(buf, os, runparams, dp, false, 0);
+       return PLAINTEXT_NEWLINE;
 }
 
 
 int InsetTabular::docbook(Buffer const & buf, odocstream & os,
-                         OutputParams const & runparams) const
+                          OutputParams const & runparams) const
 {
        int ret = 0;
        InsetBase * master = 0;
@@ -1811,7 +1828,7 @@ bool InsetTabular::copySelection(LCursor & cur)
                                    true, true);
 
        odocstringstream os;
-       OutputParams const runparams;
+       OutputParams const runparams(0);
        paste_tabular->plaintext(cur.buffer(), os, runparams, 0, true, '\t');
        // Needed for the "Edit->Paste recent" menu and the system clipboard.
        cap::copySelection(cur, os.str());