From: Angus Leeming <leeming@lyx.org>
Date: Sun, 17 Jun 2001 13:22:56 +0000 (+0000)
Subject: Fix for qt2 citation dialog crash when selecting first key
X-Git-Tag: 1.6.10~21173
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=11d542be6b03935f684805e6f15960544ab2328b;p=features.git

Fix for qt2 citation dialog crash when selecting first key
of available bibliography keys.


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

diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog
index 76669d5d32..5463cc9080 100644
--- a/src/frontends/qt2/ChangeLog
+++ b/src/frontends/qt2/ChangeLog
@@ -1,3 +1,13 @@
+2001-06-17  Angus Leeming  <a.leeming@ic.ac.uk>
+
+	* FormCitation.C (build): removed bc().refresh() call as the controller
+	should take care of this.
+	(update): removed noKeys stuff as you don't use it.
+
+	* FormCitationDialogImpl.C (slotBibSelected): Can't select bibkeys[-1]!
+	We were being bit by the xforms browser returns the browser line number
+	in Fortran style, but Qt uses C-style.
+
 2001-06-16  Angus Leeming  <a.leeming@ic.ac.uk>
 
 	* FormCitationDialogImpl.C: added using directive.
diff --git a/src/frontends/qt2/FormCitation.C b/src/frontends/qt2/FormCitation.C
index 4c6bd68f1c..82aa96b102 100644
--- a/src/frontends/qt2/FormCitation.C
+++ b/src/frontends/qt2/FormCitation.C
@@ -88,8 +88,6 @@ void FormCitation::build()
 	bc().addReadOnly(dialog_->citationStyleCO);
 	bc().addReadOnly(dialog_->textBeforeED);
 	bc().addReadOnly(dialog_->textAfterED);
-
-	bc().refresh();
 }	
 
 
@@ -108,11 +106,6 @@ void FormCitation::update()
 	setBibButtons(OFF);
 	setCiteButtons(OFF);
 
-	int noKeys = int(max(bibkeys.size(), citekeys.size()));
-
-	// Place bounds, so that 4 <= noKeys <= 10
-	noKeys = max(4, min(10, noKeys));
-
 	dialog_->textAfterED->setText( controller().params().getOptions().c_str());
 }
 
diff --git a/src/frontends/qt2/FormCitationDialogImpl.C b/src/frontends/qt2/FormCitationDialogImpl.C
index bf616e0658..891f7ba843 100644
--- a/src/frontends/qt2/FormCitationDialogImpl.C
+++ b/src/frontends/qt2/FormCitationDialogImpl.C
@@ -1,5 +1,5 @@
 /**
- * $Id: FormCitationDialogImpl.C,v 1.8 2001/06/16 14:48:12 leeming Exp $
+ * $Id: FormCitationDialogImpl.C,v 1.9 2001/06/17 13:22:55 leeming Exp $
  */
 
 #include <config.h>
@@ -73,7 +73,7 @@ void FormCitationDialogImpl::slotBibSelected( int sel )
     infoML->clear();
 
     infoML->setText( biblio::getInfo( theMap,
-				      form_->bibkeys[sel-1] ).c_str() );
+				      form_->bibkeys[sel] ).c_str() );
 
     // Highlight the selected browser_bib key in browser_cite if
     // present
diff --git a/src/frontends/xforms/FormCitation.C b/src/frontends/xforms/FormCitation.C
index c31010064b..a66ac30a0e 100644
--- a/src/frontends/xforms/FormCitation.C
+++ b/src/frontends/xforms/FormCitation.C
@@ -84,7 +84,6 @@ void FormCitation::build()
 	bc().addReadOnly(dialog_->choice_style);
 	bc().addReadOnly(dialog_->input_before);
 	bc().addReadOnly(dialog_->input_after);
-
 }