Trivial fixes to some warnings thrown up by MSVS.Net 2003.

[lyx.git] / src / CutAndPaste.C

diff --git a/src/CutAndPaste.C b/src/CutAndPaste.C
index 8483d004d0b9f2077288947b15d77bf07a608356..436113033ab1100cc78aa0a78dd4e21bcf4dd2a2 100644 (file)
--- a/src/CutAndPaste.C
+++ b/src/CutAndPaste.C
@@ -68,6 +68,11 @@ typedef limited_stack<pair<ParagraphList, textclass_type> > CutStack;
 
 CutStack theCuts(10);
 
+// store whether the tabular stack is newer than the normal copy stack
+// FIXME: this is a workaround for bug 1919. Should be removed for 1.5, 
+// when we (hopefully) have a one-for-all paste mechanism.
+bool dirty_tabular_stack_;
+
 class resetOwnerAndChanges : public std::unary_function<Paragraph, void> {
 public:
        void operator()(Paragraph & p) const {
@@ -365,7 +370,6 @@ string grabAndEraseSelection(LCursor & cur)
                return string();
        string res = grabSelection(cur);
        eraseSelection(cur);
-       cur.selection() = false;
        return res;
 }
 
@@ -468,14 +472,15 @@ std::vector<string> const availableSelections(Buffer const & buffer)
 }
 
 
-int nrOfParagraphs()
+void cutSelection(LCursor & cur, bool doclear, bool realcut)
 {
-       return theCuts.empty() ? 0 : theCuts[0].first.size();
-}
+       // This doesn't make sense, if there is no selection
+       if (!cur.selection())
+               return;
 
+       // OK, we have a selection. This is always between cur.selBegin()
+       // and cur.selEnd()
 
-void cutSelection(LCursor & cur, bool doclear, bool realcut)
-{
        if (cur.inTexted()) {
                LyXText * text = cur.text();
                BOOST_ASSERT(text);
@@ -489,13 +494,6 @@ void cutSelection(LCursor & cur, bool doclear, bool realcut)
                // calls to stuffClipboard. (Lgb)
 //             cur.bv().stuffClipboard(cur.selectionAsString(true));
 
-               // This doesn't make sense, if there is no selection
-               if (!cur.selection())
-                       return;
-
-               // OK, we have a selection. This is always between cur.selBegin()
-               // and cur.selEnd()
-
                // make sure that the depth behind the selection are restored, too
                recordUndoSelection(cur);
                pit_type begpit = cur.selBegin().pit();
@@ -531,14 +529,24 @@ void cutSelection(LCursor & cur, bool doclear, bool realcut)
                // need a valid cursor. (Lgb)
                cur.clearSelection();
                updateCounters(cur.buffer());
+
+               // tell tabular that a recent copy happened
+               dirtyTabularStack(false);
        }
 
        if (cur.inMathed()) {
-               lyxerr << "cutSelection in mathed" << endl;
-               LCursor tmp = cur;
-               copySelection(cur);
-               cur.selection() = false;
-               eraseSelection(tmp);
+               if (cur.selBegin().idx() != cur.selEnd().idx()) {
+                       // The current selection spans more than one cell.
+                       // Record all cells
+                       recordUndoInset(cur);
+               } else {
+                       // Record only the current cell to avoid a jumping
+                       // cursor after undo
+                       recordUndo(cur);
+               }
+               if (realcut)
+                       copySelection(cur);
+               eraseSelection(cur);
        }
 }
 
@@ -581,6 +589,8 @@ void copySelection(LCursor & cur)
                pars.back().insert(0, grabSelection(cur), LyXFont());
                theCuts.push(make_pair(pars, bp.textclass));
        }
+       // tell tabular that a recent copy happened
+       dirtyTabularStack(false);
 }
 
 
@@ -620,15 +630,13 @@ void pasteSelection(LCursor & cur, size_t sel_index)
                cur.bv().showErrorList(_("Paste"));
 
                cur.clearSelection();
-               cur.resetAnchor();
                text->setCursor(cur, ppp.first, ppp.second);
                cur.setSelection();
                updateCounters(cur.buffer());
        }
 
-       if (cur.inMathed()) {
-               lyxerr << "### should be handled in MathNest/GridInset" << endl;
-       }
+       // mathed is handled in MathNestInset/MathGridInset
+       BOOST_ASSERT(!cur.inMathed());
 }
 
 
@@ -700,6 +708,10 @@ void eraseSelection(LCursor & cur)
                cur.top() = i1;
                if (i1.idx() == i2.idx()) {
                        i1.cell().erase(i1.pos(), i2.pos());
+                       // We may have deleted i1.cell(cur.pos()).
+                       // Make sure that pos is valid.
+                       if (cur.pos() > cur.lastpos())
+                               cur.pos() = cur.lastpos();
                } else {
                        MathInset * p = i1.asMathInset();
                        InsetBase::row_type r1, r2;
@@ -711,7 +723,8 @@ void eraseSelection(LCursor & cur)
                        // We've deleted the whole cell. Only pos 0 is valid.
                        cur.pos() = 0;
                }
-               cur.resetAnchor();
+               // need a valid cursor. (Lgb)
+               cur.clearSelection();
        } else {
                lyxerr << "can't erase this selection 1" << endl;
        }
@@ -722,10 +735,8 @@ void eraseSelection(LCursor & cur)
 void selDel(LCursor & cur)
 {
        //lyxerr << "LCursor::selDel" << endl;
-       if (cur.selection()) {
+       if (cur.selection())
                eraseSelection(cur);
-               cur.selection() = false;
-       }
 }
 
 
@@ -739,11 +750,20 @@ void selClearOrDel(LCursor & cur)
 }
 
 
-string grabSelection(LCursor & cur)
+string grabSelection(LCursor const & cur)
 {
        if (!cur.selection())
                return string();
 
+       // FIXME: What is wrong with the following?
+#if 0
+       std::ostringstream os;
+       for (DocIterator dit = cur.selectionBegin();
+            dit != cur.selectionEnd(); dit.forwardPos())
+               os << asString(dit.cell());
+       return os.str();
+#endif
+
        CursorSlice i1 = cur.selBegin();
        CursorSlice i2 = cur.selEnd();
 
@@ -779,5 +799,17 @@ string grabSelection(LCursor & cur)
 }
 
 
+void dirtyTabularStack(bool b)
+{
+       dirty_tabular_stack_ = b;
+}
+
+
+bool tabularStackDirty()
+{
+       return dirty_tabular_stack_;
+}
+
+
 } // namespace cap
 } // namespace lyx