Squash a bug spotted by Udo M��ller in the XForms find & replace dialog.

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

diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index c927ce69a68294ea63ec2360f7651f830e0db3f9..0e6097bf282e4d2a4c6c89bcc09260357457537c 100644 (file)
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,3 +1,7 @@
+2005-07-22  Angus Leeming  <leeming@lyx.org>
+
+       * FormSearch.C (input): do not trim the find and replace strings.
+
 2005-07-20  Jürgen Spitzmüller  <j.spitzmueller@gmx.de>
 
        * FormDocument.C:
@@ -15,7 +19,7 @@
        "List"
        * forms/form_preferences.fd: remove spaces from messages
        * FormPreferences.C: simplify/clarify messages
-       
+
 2005-07-18  José Matos  <jamatos@fc.up.pt>
 
        * FormDocument.C: new file format, remove support for a4.sty,

diff --git a/src/frontends/xforms/FormSearch.C b/src/frontends/xforms/FormSearch.C
index 375dc0e21e6c97e5d880869269efa78410b50f0a..d6c0dc4a67eae196f0c64a178bd70c4db193e0d1 100644 (file)
--- a/src/frontends/xforms/FormSearch.C
+++ b/src/frontends/xforms/FormSearch.C
@@ -15,7 +15,6 @@
 #include "forms/form_search.h"
 
 #include "Tooltips.h"
-#include "xforms_helpers.h"
 #include "xformsBC.h"
 
 #include "lyx_forms.h"
@@ -71,10 +70,24 @@ void FormSearch::update()
 }
 
 
+namespace {
+
+string const getUntrimmedString(FL_OBJECT * ob)
+{
+       BOOST_ASSERT(ob->objclass == FL_INPUT);
+
+       char const * const tmp = fl_get_input(ob);
+       return tmp ? tmp : string();
+}
+
+} // namespace anon
+
+
+
 ButtonPolicy::SMInput FormSearch::input(FL_OBJECT * ob, long)
 {
        if (ob == dialog_->button_findnext) {
-               controller().find(getString(dialog_->input_search),
+               controller().find(getUntrimmedString(dialog_->input_search),
                                  fl_get_button(dialog_->check_casesensitive),
                                  fl_get_button(dialog_->check_matchword),
                                  !fl_get_button(dialog_->check_searchbackwards));
@@ -82,8 +95,8 @@ ButtonPolicy::SMInput FormSearch::input(FL_OBJECT * ob, long)
        } else if (ob == dialog_->button_replace || ob == dialog_->button_replaceall) {
                bool const all = (ob == dialog_->button_replaceall);
 
-               controller().replace(getString(dialog_->input_search),
-                                    getString(dialog_->input_replace),
+               controller().replace(getUntrimmedString(dialog_->input_search),
+                                    getUntrimmedString(dialog_->input_replace),
                                     fl_get_button(dialog_->check_casesensitive),
                                     fl_get_button(dialog_->check_matchword),
                                     !fl_get_button(dialog_->check_searchbackwards),