From 2292b739a2c62b40f17b30fd32910c76ea40cbe2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Lars=20Gullik=20Bj=C3=B8nnes?= Date: Tue, 3 Jul 2001 15:39:17 +0000 Subject: [PATCH] use CutAndPaste static methods directly git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2176 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/ChangeLog | 3 +++ src/frontends/xforms/ChangeLog | 3 +++ src/frontends/xforms/FormDocument.C | 3 +-- src/insets/ChangeLog | 5 +++++ src/insets/insettext.C | 3 +-- src/text2.C | 16 +++++----------- 6 files changed, 18 insertions(+), 15 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 4f0f214f78..1330897434 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -4,6 +4,9 @@ in NEW_INSETS (redoDrawingOfParagraph): ditto (redoParagraphs): ditto + (cutSelection): don't create a object for CutAndPaste use the + static method directly + (pasteSelection): ditto * bufferview_funcs.[Ch]: move ProhibitInput and AllowInput to LyXview (+ rename) diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog index d8a556c6c1..f63debfc0d 100644 --- a/src/frontends/xforms/ChangeLog +++ b/src/frontends/xforms/ChangeLog @@ -1,5 +1,8 @@ 2001-07-03 Lars Gullik Bjønnes + * FormDocument.C (class_apply): call CutAndPaste::'s staitc method + directly. + * Toolbar_pimpl.h: make owner be a XFormsView, small changes because of this. diff --git a/src/frontends/xforms/FormDocument.C b/src/frontends/xforms/FormDocument.C index 75c418227e..828295fd02 100644 --- a/src/frontends/xforms/FormDocument.C +++ b/src/frontends/xforms/FormDocument.C @@ -382,8 +382,7 @@ bool FormDocument::class_apply() // successfully loaded redo = true; setMinibuffer(lv_, _("Converting document to new document class...")); - CutAndPaste cap; - int ret = cap.SwitchLayoutsBetweenClasses( + int ret = CutAndPaste::SwitchLayoutsBetweenClasses( params.textclass, new_class, lv_->buffer()->paragraph); if (ret) { diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog index 61fcbab7e8..72bf3900de 100644 --- a/src/insets/ChangeLog +++ b/src/insets/ChangeLog @@ -1,3 +1,8 @@ +2001-07-03 Lars Gullik Bjønnes + + * insettext.C (localDispatch): call CutAndPaste::'s static method + directly. + 2001-07-03 Jean-Marc Lasgouttes * insetbib.C: no meed to include forms.h here. diff --git a/src/insets/insettext.C b/src/insets/insettext.C index ff1d911919..23913b27a4 100644 --- a/src/insets/insettext.C +++ b/src/insets/insettext.C @@ -993,9 +993,8 @@ InsetText::localDispatch(BufferView * bv, } case LFUN_PASTE: if (!autoBreakRows) { - CutAndPaste cap; - if (cap.nrOfParagraphs() > 1) { + if (CutAndPaste::nrOfParagraphs() > 1) { WriteAlert(_("Impossible operation"), _("Cannot include more than one paragraph!"), _("Sorry.")); diff --git a/src/text2.C b/src/text2.C index 83c8261a99..749911ab15 100644 --- a/src/text2.C +++ b/src/text2.C @@ -1708,22 +1708,20 @@ void LyXText::cutSelection(BufferView * bview, bool doclear) selection.start.par()->previous(), undoendpar); - CutAndPaste cap; - // there are two cases: cut only within one paragraph or // more than one paragraph if (selection.start.par() == selection.end.par()) { // only within one paragraph endpar = selection.end.par(); int pos = selection.end.pos(); - cap.cutSelection(selection.start.par(), &endpar, + CutAndPaste::cutSelection(selection.start.par(), &endpar, selection.start.pos(), pos, bview->buffer()->params.textclass, doclear); selection.end.pos(pos); } else { endpar = selection.end.par(); int pos = selection.end.pos(); - cap.cutSelection(selection.start.par(), &endpar, + CutAndPaste::cutSelection(selection.start.par(), &endpar, selection.start.pos(), pos, bview->buffer()->params.textclass, doclear); cursor.par(endpar); @@ -1778,9 +1776,7 @@ void LyXText::copySelection(BufferView * bview) || selection.start.pos() < selection.end.pos())) selection.start.pos(selection.start.pos() + 1); - CutAndPaste cap; - - cap.copySelection(selection.start.par(), selection.end.par(), + CutAndPaste::copySelection(selection.start.par(), selection.end.par(), selection.start.pos(), selection.end.pos(), bview->buffer()->params.textclass); } @@ -1788,10 +1784,8 @@ void LyXText::copySelection(BufferView * bview) void LyXText::pasteSelection(BufferView * bview) { - CutAndPaste cap; - // this does not make sense, if there is nothing to paste - if (!cap.checkPastePossible(cursor.par())) + if (!CutAndPaste::checkPastePossible(cursor.par())) return; setUndo(bview->buffer(), Undo::INSERT, @@ -1802,7 +1796,7 @@ void LyXText::pasteSelection(BufferView * bview) Paragraph * actpar = cursor.par(); int pos = cursor.pos(); - cap.pasteSelection(&actpar, &endpar, pos, + CutAndPaste::pasteSelection(&actpar, &endpar, pos, bview->buffer()->params.textclass); redoParagraphs(bview, cursor, endpar); -- 2.39.2