From 104aed27d7e103097413c29dd18ef3eccbaa8adc Mon Sep 17 00:00:00 2001 From: =?utf8?q?Lars=20Gullik=20Bj=C3=B8nnes?= Date: Wed, 5 Dec 2001 23:09:26 +0000 Subject: [PATCH] apply layoutno.diff git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3160 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/ChangeLog | 6 ++++++ src/LyXAction.C | 1 - src/commandtags.h | 1 - src/lyxfunc.C | 20 -------------------- 4 files changed, 6 insertions(+), 22 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 9151492be4..703ab2769c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2001-12-05 John Levon + + * lyxfunc.C: + * commandtags.h: + * LyXAction.C: remove old LFUN_LAYOUTNO + 2001-12-05 John Levon * paragraph_pimpl.h: diff --git a/src/LyXAction.C b/src/LyXAction.C index a9df467c77..9d761f0ec1 100644 --- a/src/LyXAction.C +++ b/src/LyXAction.C @@ -252,7 +252,6 @@ void LyXAction::init() { LFUN_LAYOUT_COPY, "layout-copy", N_("Copy paragraph environment type"), Noop }, { LFUN_LAYOUT_DOCUMENT, "layout-document", "", ReadOnly }, - { LFUN_LAYOUTNO, "", "internal only", Noop }, { LFUN_LAYOUT_PARAGRAPH, "layout-paragraph", "", ReadOnly }, { LFUN_LAYOUT_PASTE, "layout-paste", N_("Paste paragraph environment type"), Noop }, diff --git a/src/commandtags.h b/src/commandtags.h index 640577c585..d6d2a8b2ad 100644 --- a/src/commandtags.h +++ b/src/commandtags.h @@ -158,7 +158,6 @@ enum kb_action { LFUN_MARK_OFF, LFUN_MARK_ON, LFUN_LAYOUT, - LFUN_LAYOUTNO, // 130 // Lgb 97-06-10 LFUN_LAYOUT_CHARACTER, LFUN_LAYOUT_PARAGRAPH, LFUN_LAYOUT_DOCUMENT, diff --git a/src/lyxfunc.C b/src/lyxfunc.C index ae28ce37f7..72b5f6d95d 100644 --- a/src/lyxfunc.C +++ b/src/lyxfunc.C @@ -1279,26 +1279,6 @@ string const LyXFunc::dispatch(int ac, owner->getDialogs()->showLogFile(); break; - case LFUN_LAYOUTNO: - { - lyxerr[Debug::INFO] << "LFUN_LAYOUTNO: (arg) " << argument << endl; - int sel = strToInt(argument); - lyxerr[Debug::INFO] << "LFUN_LAYOUTNO: (sel) "<< sel << endl; - - // Should this give a setMessage instead? - if (sel == 0) - return string(); // illegal argument - - --sel; // sel 1..., but layout 0... - - // Pretend we got the name instead. - dispatch(int(LFUN_LAYOUT), - textclasslist.NameOfLayout(owner->view() - ->buffer()->params.textclass, - sel)); - return string(); - } - case LFUN_LAYOUT_DOCUMENT: owner->getDialogs()->showDocument(); break; -- 2.39.2