separate character and old document dialog building to stop a segfault

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

diff --git a/ChangeLog b/ChangeLog
index 2ee3918fd12d80fd867eddfd4e6269cc740ce492..6a8fd9b7da912ebd5ee7c877518994bc26bc1add 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-08-31  Allan Rae  <rae@lyx.org>
+
+       * src/lyx_gui.C (create_forms): build combo_language2 which is part of
+       character dialog separately from old document dialogs combo_language.
+       Stops a segfault.
+
 2000-08-30  Dekel Tsur  <dekel@math.tau.ac.il>
 
        * src/converter.[Ch]: New file for converting between different

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 09d91b127c380d5dfe256102c05f08272b5f9bce..d1e99e609ac1422ce6449b19716b959ad8c140d8 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -19,9 +19,11 @@ src/bullet_forms_cb.C
 src/Chktex.C
 src/ColorHandler.C
 src/combox.C
+src/converter.C
 src/credits.C
 src/credits_form.C
 src/CutAndPaste.C
+src/exporter.C
 src/ext_l10n.h
 src/filedlg.C
 src/FontLoader.C

diff --git a/src/ext_l10n.h b/src/ext_l10n.h
index 5d10a75809a1a569d724d40a42b36226992e4dae..254529e6ff82a2bc208a8f6344db48621bf9e8c3 100644 (file)
--- a/src/ext_l10n.h
+++ b/src/ext_l10n.h
@@ -18,8 +18,10 @@ _("Save As|A");
 _("Revert to saved|R");
 _("View dvi|d");
 _("View Postscript|w");
+_("View");
 _("Update dvi|v");
 _("Update Postscript|U");
+_("Update");
 _("Build program|B");
 _("Print...|P");
 _("Fax...|F");
@@ -165,18 +167,17 @@ _("Credits...|e");
 _("Version...|V");
 _("");
 _("A&A");
-_("ACT");
-_("AT_RISE:");
 _("Abstract");
 _("Accepted");
 _("Acknowledgement");
-_("Acknowledgement(s)");
 _("Acknowledgement*");
 _("Acknowledgement-numbered");
-_("Acknowledgement-unnumbered");
+_("Acknowledgement(s)");
 _("Acknowledgements");
+_("Acknowledgement-unnumbered");
 _("Acknowledgments");
 _("Acnowledgement");
+_("ACT");
 _("Addchap");
 _("Addchap*");
 _("Addition");
@@ -194,15 +195,15 @@ _("Anlagen");
 _("Anrede");
 _("Appendices");
 _("Appendix");
+_("AT_RISE:");
 _("Author");
-_("AuthorRunning");
 _("Author_Email");
 _("Author_Running");
+_("AuthorRunning");
 _("Author_URL");
 _("Axiom");
 _("Axiom-numbered");
 _("Axiom-plain");
-_("BLZ");
 _("Backaddress");
 _("Bank");
 _("BankAccount");
@@ -210,12 +211,13 @@ _("BankCode");
 _("Betreff");
 _("Bibliography");
 _("Biography");
+_("BLZ");
 _("Brieftext");
-_("CC");
-_("CURTAIN");
 _("Caption");
 _("Case");
 _("Case-numbered");
+_("CC");
+_("cc");
 _("CenteredCaption");
 _("Chapter");
 _("Chapter*");
@@ -255,6 +257,7 @@ _("Criterion-plain");
 _("CrossList");
 _("Current");
 _("Current_Address");
+_("CURTAIN");
 _("Customer");
 _("Data");
 _("Date");
@@ -269,10 +272,10 @@ _("Definition-unnumbered");
 _("Description");
 _("Dialogue");
 _("EMail");
-_("EXT.");
 _("Email");
 _("Encl");
 _("Encl.");
+_("encl");
 _("End_All_Slides");
 _("Enumerate");
 _("Example");
@@ -283,43 +286,48 @@ _("Example-unnumbered");
 _("Exercise");
 _("Exercise-numbered");
 _("Exercise-plain");
+_("EXT.");
 _("Extratitle");
-_("FADE_IN:");
-_("FADE_OUT:");
 _("Fact");
 _("Fact*");
 _("Fact-numbered");
 _("Fact-plain");
 _("Fact-unnumbered");
+_("FADE_IN:");
+_("FADE_OUT:");
 _("FigCaption");
+_("first");
 _("FirstAuthor");
 _("FirstName");
 _("FitBitmap");
 _("FitFigure");
 _("Foilhead");
+_("foilhead");
 _("Footernote");
 _("FourAffiliations");
 _("FourAuthors");
 _("Gruss");
-_("HTTP");
 _("Headnote");
-_("INT.");
+_("HTTP");
 _("Idea");
 _("IhrSchreiben");
 _("IhrZeichen");
 _("Institute");
 _("Institution");
+_("INT.");
 _("InvisibleText");
 _("Invoice");
 _("Itemize");
 _("Journal");
+_("journal");
 _("Keywords");
 _("Konto");
-_("LaTeX");
-_("LaTeX_Title");
 _("Labeling");
 _("Land");
+_("landscape");
 _("LandscapeSlide");
+_("LaTeX");
+_("LaTeX_Title");
 _("Lemma");
 _("Lemma*");
 _("Lemma-numbered");
@@ -338,8 +346,10 @@ _("MarkBoth");
 _("MathLetters");
 _("MeinZeichen");
 _("Minisec");
-_("MyRef");
+_("modying");
+_("msnumber");
 _("My_Address");
+_("MyRef");
 _("Myref");
 _("Name");
 _("Narrative");
@@ -349,18 +359,18 @@ _("Note");
 _("Note*");
 _("Note-numbered");
 _("Note-plain");
-_("Note-unnumbered");
 _("NoteToEditor");
 _("Notetoeditor");
+_("Note-unnumbered");
 _("Offprint");
 _("Offprints");
 _("Offsets");
+_("offsets");
 _("Oggetto");
 _("Opening");
 _("Ort");
 _("Overlay");
 _("PACS");
-_("PS");
 _("Paragraph");
 _("Paragraph*");
 _("Paragraph-numbered");
@@ -371,8 +381,8 @@ _("Petit");
 _("Phone");
 _("Place");
 _("PlaceFigure");
-_("PlaceTable");
 _("Placefigure");
+_("PlaceTable");
 _("Placetable");
 _("PortraitSlide");
 _("PostalCommend");
@@ -389,11 +399,12 @@ _("Proposition*");
 _("Proposition-numbered");
 _("Proposition-plain");
 _("Proposition-unnumbered");
+_("PS");
+_("ps");
 _("Publishers");
 _("Question");
 _("Quotation");
 _("Quote");
-_("REVTEX_Title");
 _("Received");
 _("Recieved");
 _("Recieved/Accepted");
@@ -403,17 +414,17 @@ _("Remark");
 _("Remark*");
 _("Remark-numbered");
 _("Remark-plain");
-_("Remark-unnumbered");
 _("Remarks");
+_("Remark-unnumbered");
 _("RetourAdresse");
 _("ReturnAddress");
-_("RightHeader");
+_("REVTEX_Title");
 _("Right_Address");
+_("RightHeader");
 _("Rotatefoilhead");
 _("Running_LaTeX_Title");
 _("SCENE");
 _("SCENE*");
-_("SGML");
 _("Scrap");
 _("Section");
 _("Section*");
@@ -421,10 +432,11 @@ _("Section-numbered");
 _("Send");
 _("Send_To_Address");
 _("Seriate");
+_("SGML");
 _("ShortFoilhead");
+_("Shortfoilhead");
 _("ShortRotatefoilhead");
 _("ShortTitle");
-_("Shortfoilhead");
 _("Signature");
 _("Slide");
 _("Slide*");
@@ -440,26 +452,26 @@ _("State");
 _("Strasse");
 _("Street");
 _("Style");
-_("SubSection");
-_("SubTitle");
+_("style");
 _("Subitle");
 _("Subject");
 _("Subjectclass");
 _("Subparagraph");
 _("Subparagraph*");
+_("SubSection");
 _("Subsection");
 _("Subsection*");
 _("Subsection-numbered");
 _("Subsubsection");
 _("Subsubsection*");
 _("Subsubsection-numbered");
+_("SubTitle");
 _("Subtitle");
 _("Suggested");
 _("Summary");
 _("Summary-numbered");
 _("Surname");
-_("TOC_Author");
-_("TOC_Title");
+_("surname");
 _("TableComments");
 _("TableRefs");
 _("Telefax");
@@ -471,8 +483,8 @@ _("Theorem");
 _("Theorem*");
 _("Theorem-numbered");
 _("Theorem-plain");
-_("Theorem-unnumbered");
 _("TheoremTemplate");
+_("Theorem-unnumbered");
 _("Thesaurus");
 _("ThickLine");
 _("This");
@@ -480,39 +492,29 @@ _("ThreeAffiliations");
 _("ThreeAuthors");
 _("TickList");
 _("Title");
-_("Title_Running");
 _("Titlehead");
+_("Title_Running");
+_("TOC_Author");
+_("TOC_Title");
 _("Town");
-_("Trans_Keywords");
 _("Transition");
+_("Trans_Keywords");
 _("Translated");
 _("TranslatedAbstract");
 _("Translated_Title");
 _("Translator");
 _("TwoAffiliations");
 _("TwoAuthors");
-_("URL");
 _("Unterschrift");
 _("Uppertitleback");
+_("URL");
 _("Use");
 _("Verbatim");
 _("Verse");
 _("Verteiler");
 _("VisibleText");
 _("YourMail");
-_("YourRef");
 _("Yourmail");
+_("YourRef");
 _("Yourref");
 _("Zusatz");
-_("cc");
-_("encl");
-_("first");
-_("foilhead");
-_("journal");
-_("landscape");
-_("modying");
-_("msnumber");
-_("offsets");
-_("ps");
-_("style");
-_("surname");

diff --git a/src/lyx_gui.C b/src/lyx_gui.C
index 3a90ea93fb146676f3d43cb3fbf4e860a3a53ff9..d9385d076bd4e1161cc6bb93c48fa2117188ccc9 100644 (file)
--- a/src/lyx_gui.C
+++ b/src/lyx_gui.C
@@ -374,6 +374,15 @@ void LyXGUI::create_forms()
        fl_end_form();
        lyxerr[Debug::INIT] << "Initializing form_character...done" << endl;
 
+       // build up the combox entries
+       combo_language2->addto(_("No change"));
+       combo_language2->addto(_("Reset"));
+       for(Languages::const_iterator cit = languages.begin();
+           cit != languages.end(); ++cit) {
+               combo_language2->addto((*cit).second.lang().c_str());
+       }
+       combo_language2->select_text(_("No change"));
+
 #ifdef USE_OLD_DOCUMENT_LAYOUT
        // the document form
        fd_form_document = create_form_form_document();
@@ -397,14 +406,10 @@ void LyXGUI::create_forms()
 
        // "default" is not part of the languages array any more.
        combo_language->addto("default");
-       combo_language2->addto(_("No change"));
-       combo_language2->addto(_("Reset"));
        for(Languages::const_iterator cit = languages.begin();
            cit != languages.end(); ++cit) {
                combo_language->addto((*cit).second.lang().c_str());
-               combo_language2->addto((*cit).second.lang().c_str());
        }
-       combo_language2->select_text(_("No change"));
 
        // not really necessary, but we can do it anyway.
        fl_addto_choice(fd_form_document->choice_fontsize, "default|10|11|12");