Angus insetindex patch + protect patch from Dekel

[lyx.git] / src / menus.C

diff --git a/src/menus.C b/src/menus.C
index 6a86739199780f229ced9db7bc5e3dcfd8b256ef..aacb3f007c323cc6359a068169fca8e53c22413a 100644 (file)
--- a/src/menus.C
+++ b/src/menus.C
@@ -725,13 +725,7 @@ void Menus::ShowFileMenu(FL_OBJECT * ob, long)
                break;
        case 43: tmpfunc->Dispatch(LFUN_EXPORT, "ascii");
                break;
-       case 44:
-               if (!LinuxDoc && !DocBook)
-                       tmpfunc->Dispatch(LFUN_EXPORT, "html");
-               else if(LinuxDoc)
-                       tmpfunc->Dispatch(LFUN_EXPORT, "html-linuxdoc");
-               else
-                       tmpfunc->Dispatch(LFUN_EXPORT, "html-docbook");
+       case 44: tmpfunc->Dispatch(LFUN_EXPORT, "html");
                break;
        case 45: tmpfunc->Dispatch(LFUN_EXPORT, "custom"); 
                break;
@@ -1905,9 +1899,9 @@ void Menus::ShowInsertMenu(FL_OBJECT * ob, long)
                case 12: tmpfunc->Dispatch(LFUN_INSERT_NOTE); break;
                case 13: tmpfunc->Dispatch(LFUN_INSERT_LABEL); break;
                case 14: tmpfunc->Dispatch(LFUN_INSERT_REF); break;
-               case 15: tmpfunc->Dispatch(LFUN_CREATE_CITATION); break;
-               case 16: tmpfunc->Dispatch(LFUN_INDEX_INSERT); break;
-               case 17: tmpfunc->Dispatch(LFUN_INDEX_INSERT_LAST); break;
+               case 15: tmpfunc->Dispatch(LFUN_CITATION_CREATE); break;
+               case 16: tmpfunc->Dispatch(LFUN_INDEX_CREATE); break;
+               case 17: tmpfunc->Dispatch(LFUN_INDEX_CREATE_LAST); break;
                case 18: tmpfunc->Dispatch(LFUN_URL); break;
                }
        }