The reference dialog now disconnects from the inset on Apply. Its behaviour

[lyx.git] / src / frontends / controllers / helper_funcs.C

diff --git a/src/frontends/controllers/helper_funcs.C b/src/frontends/controllers/helper_funcs.C
index 341dcd78eacd38451f9086489aa873ece989cd35..60601b48c8ad1bc2b9fab9b5af7a94158b6084fc 100644 (file)
--- a/src/frontends/controllers/helper_funcs.C
+++ b/src/frontends/controllers/helper_funcs.C
@@ -23,6 +23,7 @@
 
 #include "frontends/FileDialog.h"
 #include "support/filetools.h" // OnlyPath, OnlyFilename
+#include "support/lstrings.h"
 #include "gettext.h" // _()
 #include "lyx_gui_misc.h" // WriteAlert
 
@@ -38,10 +39,11 @@ string const getStringFromVector(vector<string> const & vec,
        int i = 0;
        for (vector<string>::const_iterator it = vec.begin();
             it != vec.end(); ++it) {
-               if (it->empty()) continue;
+               string item = strip(frontStrip(*it));
+               if (item.empty()) continue;
 
                if (i++ > 0) str += delim;
-               str += *it;
+               str += item;
        }
        return str;
 }
@@ -53,16 +55,16 @@ vector<string> const getVectorFromString(string const & str,
        if (str.empty())
                return vec;
 
-       string keys(str);
+       string keys(strip(str));
 
        for(;;) {
                string::size_type const idx = keys.find(delim);
                if (idx == string::npos) {
-                       vec.push_back(keys);
+                       vec.push_back(frontStrip(keys));
                        break;
                }
 
-               string const key = keys.substr(0, idx);
+               string const key = strip(frontStrip(keys.substr(0, idx)));
                if (!key.empty())
                        vec.push_back(key);