* src/BufferView_pimpl.C (getStatus, dispatch): do not handle

	LFUN_GOTOERROR.

	* src/bufferview_funcs.C (findInset): exit early when at end of
	document (and avoid a crash).

	* src/insets/insetbase.[Ch]: remove ERROR_CODE

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14706 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/BufferView_pimpl.C b/src/BufferView_pimpl.C
index 067fa63660065593793186b3ba2993688ed275f9..c11601733d254970f32043a8b6675d976418149d 100644 (file)
--- a/src/BufferView_pimpl.C
+++ b/src/BufferView_pimpl.C
@@ -910,7 +910,6 @@ FuncStatus BufferView::Pimpl::getStatus(FuncRequest const & cmd)
        case LFUN_OUTLINE_DOWN:
        case LFUN_OUTLINE_IN:
        case LFUN_OUTLINE_OUT:
-       case LFUN_ERROR_NEXT:
        case LFUN_NOTE_NEXT:
        case LFUN_REFERENCE_NEXT:
        case LFUN_WORD_FIND:
@@ -1091,10 +1090,6 @@ bool BufferView::Pimpl::dispatch(FuncRequest const & cmd)
                updateLabels(*buffer_);
                break;
 
-       case LFUN_ERROR_NEXT:
-               bv_funcs::gotoInset(bv_, InsetBase::ERROR_CODE, false);
-               break;
-
        case LFUN_NOTE_NEXT:
                bv_funcs::gotoInset(bv_, InsetBase::NOTE_CODE, false);
                break;

diff --git a/src/bufferview_funcs.C b/src/bufferview_funcs.C
index 73644625f1ca01cec1795d7ec20d7667600f38fe..2125c5706b5eae0b73e56904c3b762aa0d0bd700 100644 (file)
--- a/src/bufferview_funcs.C
+++ b/src/bufferview_funcs.C
@@ -263,6 +263,8 @@ bool findInset(DocIterator & dit, vector<InsetBase_code> const & codes,
        string contents;
        DocIterator tmpdit = dit;
        tmpdit.forwardInset();
+       if (!tmpdit)
+               return false;
 
        if (same_content) {
                InsetBase const * inset = tmpdit.nextInset();

diff --git a/src/insets/insetbase.C b/src/insets/insetbase.C
index 4a9dcb280bddf8da4ab6ab0186865eabde61cbab..29fd67754d60dfe8bab1abd732369cad4f574d48 100644 (file)
--- a/src/insets/insetbase.C
+++ b/src/insets/insetbase.C
@@ -78,7 +78,6 @@ TranslatorMap const build_translator()
                InsetName("external", InsetBase::EXTERNAL_CODE),
                InsetName("caption", InsetBase::CAPTION_CODE),
                InsetName("mathmacro", InsetBase::MATHMACRO_CODE),
-               InsetName("error", InsetBase::ERROR_CODE),
                InsetName("cite", InsetBase::CITE_CODE),
                InsetName("float_list", InsetBase::FLOAT_LIST_CODE),
                InsetName("index_print", InsetBase::INDEX_PRINT_CODE),

diff --git a/src/insets/insetbase.h b/src/insets/insetbase.h
index c6dfd76b11da33d38a367f95c85292eaee5cdfe6..fc8907a223f89d3f854c397693941fb8afd1c860 100644 (file)
--- a/src/insets/insetbase.h
+++ b/src/insets/insetbase.h
@@ -295,8 +295,6 @@ public:
                ///
                MATHMACRO_CODE, // 30
                ///
-               ERROR_CODE,
-               ///
                CITE_CODE,
                ///
                FLOAT_LIST_CODE,