Fixed some lines that were too long. It compiled afterwards.

[lyx.git] / src / frontends / controllers / frontend_helpers.cpp

diff --git a/src/frontends/controllers/frontend_helpers.cpp b/src/frontends/controllers/frontend_helpers.cpp
index 3e1918b3c2aa370d8578960a944b1ad481bdbccd..25c1434641dfdca00f8c7db0d8e28c8a1a007a13 100644 (file)
--- a/src/frontends/controllers/frontend_helpers.cpp
+++ b/src/frontends/controllers/frontend_helpers.cpp
@@ -40,7 +40,6 @@
 
 #include <algorithm>
 #include <fstream>
-#include <locale>
 
 using std::string;
 using std::vector;
@@ -191,7 +190,7 @@ docstring const familyName(docstring const & name)
        if (idx != docstring::npos)
                return ltrim(fname.substr(0, idx));
        idx = fname.rfind('.');
-       if (idx != docstring::npos)
+       if (idx != docstring::npos && idx + 1 < fname.size())
                fname = ltrim(fname.substr(idx + 1));
        // test if we have a LaTeX Space in front
        if (fname[0] == '\\')
@@ -1108,13 +1107,20 @@ class Sorter
                                      LanguagePair, bool>
 {
 public:
-       Sorter() : loc_("") {};
        bool operator()(LanguagePair const & lhs,
                        LanguagePair const & rhs) const {
-               return loc_(lhs.first, rhs.first);
+               return lhs.first < rhs.first;
+       }
+};
+
+
+class ColorSorter
+{
+public:
+       bool operator()(Color::color const & lhs,
+                       Color::color const & rhs) const {
+               return lcolor.getGUIName(lhs) < lcolor.getGUIName(rhs);
        }
-private:
-       std::locale loc_;
 };
 
 } // namespace anon
@@ -1151,6 +1157,14 @@ vector<LanguagePair> const getLanguageData(bool character_dlg)
        return langs;
 }
 
+
+vector<Color_color> const getSortedColors(vector<Color_color> colors)
+{
+       // sort the colors
+       std::sort(colors.begin(), colors.end(), ColorSorter());
+       return colors;
+}
+
 } // namespace frontend
 
 using support::addName;