fix crash with "save as"

[lyx.git] / src / frontends / xforms / xforms_helpers.C

diff --git a/src/frontends/xforms/xforms_helpers.C b/src/frontends/xforms/xforms_helpers.C
index eccfa54a185968e333e9630b873aa1904000bc8f..fab98d9d8d704ed4687613ab726da3918fc93d3f 100644 (file)
--- a/src/frontends/xforms/xforms_helpers.C
+++ b/src/frontends/xforms/xforms_helpers.C
@@ -29,18 +29,25 @@
 #include <algorithm>
 #include <fstream>
 #include <vector>
+
 #include FORMS_H_LOCATION
 
 using std::ofstream;
 using std::pair;
 using std::vector;
 
+bool isActive(FL_OBJECT * ob)
+{
+       return ob && ob->active > 0;
+}
+
+
 // Set an FL_OBJECT to activated or deactivated
 void setEnabled(FL_OBJECT * ob, bool enable)
 {
        if (enable) {
                fl_activate_object(ob);
-               fl_set_object_lcol(ob, FL_BLACK);
+               fl_set_object_lcol(ob, FL_LCOL);
        } else {
                fl_deactivate_object(ob);
                fl_set_object_lcol(ob, FL_INACTIVE);
@@ -77,15 +84,17 @@ vector<string> const getVector(FL_OBJECT * ob)
 ///
 string const getString(FL_OBJECT * ob, int line)
 {
-       char const * tmp = 0;
+       // Negative line value does not make sense.
+       lyx::Assert(line >= 0);
 
+       char const * tmp = 0;
        switch (ob->objclass) {
        case FL_INPUT:
-               lyx::Assert(line == -1);
                tmp = fl_get_input(ob);
                break;
+
        case FL_BROWSER:
-               if (line == -1)
+               if (line == 0)
                        line = fl_get_browser(ob);
 
                if (line >= 1 && line <= fl_get_browser_maxline(ob))
@@ -93,7 +102,7 @@ string const getString(FL_OBJECT * ob, int line)
                break;
 
        case FL_CHOICE:
-               if (line == -1)
+               if (line == 0)
                        line = fl_get_choice(ob);
 
                if (line >= 1 && line <= fl_get_choice_maxitems(ob))
@@ -104,7 +113,7 @@ string const getString(FL_OBJECT * ob, int line)
                lyx::Assert(0);
        }
 
-       return (tmp) ? trim(tmp) : string();
+       return tmp ? trim(tmp) : string();
 }
 
 string getLengthFromWidgets(FL_OBJECT * input, FL_OBJECT * choice)
@@ -117,7 +126,7 @@ string getLengthFromWidgets(FL_OBJECT * input, FL_OBJECT * choice)
        if (length.empty())
                return string();
 
-       //don't return unit-from-choice if the input(field) contains a unit
+       // don't return unit-from-choice if the input(field) contains a unit
        if (isValidGlueLength(length))
                return length;
 
@@ -137,7 +146,7 @@ void updateWidgetsFromLengthString(FL_OBJECT * input, FL_OBJECT * choice,
                fl_set_input(input, str.c_str());
                // we assume that "default_unit" is in the choice as "we"
                // have control over that!
-               // No need to check for it's precence in the choice, therefore.
+               // No need to check for its presence in the choice, therefore.
                fl_set_choice_text(choice, default_unit.c_str());
        } else {
                updateWidgetsFromLength(input, choice,
@@ -189,7 +198,7 @@ string formatted(string const & sin, int w, int size, int style)
        for(;;) {
                string::size_type const nxtpos1 = sin.find(' ',  curpos);
                string::size_type const nxtpos2 = sin.find('\n', curpos);
-               string::size_type const nxtpos = std::min(nxtpos1, nxtpos1);
+               string::size_type const nxtpos = std::min(nxtpos1, nxtpos2);
 
                string const word = nxtpos == string::npos ?
                        sin.substr(curpos) : sin.substr(curpos, nxtpos-curpos);