From: André Pönitz Date: Tue, 27 Aug 2002 15:00:59 +0000 (+0000) Subject: just move X-Git-Tag: 1.6.10~18448 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=b3d8d0d1a2cd346b2b64c8d72e7f1d90042505cc;p=features.git just move git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5121 a592a061-630c-0410-9148-cb99ea01b6c8 --- diff --git a/src/BufferView_pimpl.C b/src/BufferView_pimpl.C index 6e1f60e2ef..124f2e993e 100644 --- a/src/BufferView_pimpl.C +++ b/src/BufferView_pimpl.C @@ -40,7 +40,6 @@ #include "ParagraphParameters.h" #include "undo_funcs.h" #include "funcrequest.h" -#include "factory.h" #include "insets/insetbib.h" #include "insets/insettext.h" @@ -1541,42 +1540,6 @@ bool BufferView::Pimpl::dispatch(FuncRequest const & ev) } break; -#if 0 - case LFUN_INSET_LIST: - case LFUN_INSET_THEOREM: -#endif - case LFUN_INSERT_NOTE: - case LFUN_INSET_ERT: - case LFUN_INSET_EXTERNAL: - case LFUN_INSET_FLOAT: - case LFUN_INSET_FOOTNOTE: - case LFUN_INSET_MARGINAL: - case LFUN_INSET_MINIPAGE: - case LFUN_INSET_OPTARG: - case LFUN_INSET_WIDE_FLOAT: - { - FuncRequest cmd = ev; - cmd.setView(bv_); - Inset * inset = createInset(cmd); - if (inset) { - bool gotsel = false; - - if (bv_->getLyXText()->selection.set()) { - bv_->getLyXText()->cutSelection(bv_, true, false); - gotsel = true; - } - - if (insertInset(inset)) { - inset->edit(bv_); - if (gotsel) - owner_->dispatch(FuncRequest(LFUN_PASTESELECTION)); - } - else - delete inset; - } - break; - } - case LFUN_INSET_CAPTION: { // Do we have a locking inset... diff --git a/src/text3.C b/src/text3.C index 207bb5e0ca..bfb91a2cad 100644 --- a/src/text3.C +++ b/src/text3.C @@ -21,6 +21,7 @@ #include "buffer.h" #include "ParagraphParameters.h" #include "gettext.h" +#include "factory.h" #include "intl.h" #include "language.h" #include "support/lstrings.h" @@ -1056,6 +1057,37 @@ Inset::RESULT LyXText::dispatch(FuncRequest const & cmd) break; } +#if 0 + case LFUN_INSET_LIST: + case LFUN_INSET_THEOREM: +#endif + case LFUN_INSERT_NOTE: + case LFUN_INSET_ERT: + case LFUN_INSET_EXTERNAL: + case LFUN_INSET_FLOAT: + case LFUN_INSET_FOOTNOTE: + case LFUN_INSET_MARGINAL: + case LFUN_INSET_MINIPAGE: + case LFUN_INSET_OPTARG: + case LFUN_INSET_WIDE_FLOAT: { + Inset * inset = createInset(cmd); + if (inset) { + bool gotsel = false; + if (selection.set()) { + cutSelection(bv, true, false); + gotsel = true; + } + if (bv->insertInset(inset)) { + inset->edit(bv); + if (gotsel) + bv->owner()->dispatch(FuncRequest(LFUN_PASTESELECTION)); + } + else + delete inset; + } + break; + } + case LFUN_QUOTE: { Paragraph const * par = cursor.par(); lyx::pos_type pos = cursor.pos();