Import last layout translations

[lyx.git] / src / Converter.cpp

diff --git a/src/Converter.cpp b/src/Converter.cpp
index 1ab41a53d092892fc9c74600afd521d4c5f3b783..0f0f4b44eb77090b3085723e345fb08861f7501a 100644 (file)
--- a/src/Converter.cpp
+++ b/src/Converter.cpp
@@ -691,30 +691,14 @@ Converters::getReachableTo(string const & target, bool const clear_visited)
 
 vector<Format const *> const
 Converters::getReachable(string const & from, bool const only_viewable,
-                        bool const clear_visited, string const & exclude)
+                        bool const clear_visited, set<string> const & excludes)
 {
-       vector<int> const & reachables =
-               G_.getReachable(formats.getNumber(from),
-                               only_viewable,
-                               clear_visited,
-                               formats.getNumber(exclude));
-
-       return intToFormat(reachables);
-}
+       set<int> excluded_numbers;;
 
-
-vector<Format const *> const
-Converters::getReachable(string const & from, bool const only_viewable,
-                        bool const clear_visited, vector<string> const & excludes)
-{
-       vector<int> excluded_numbers(excludes.size());
-
-       vector<string>::const_iterator sit = excludes.begin();
-       vector<string>::const_iterator const end = excludes.end();
-       vector<int>::iterator it = excluded_numbers.begin();
-       for ( ; sit != end; ++sit, ++it) {
-               *it = formats.getNumber(*sit);
-       }
+       set<string>::const_iterator sit = excludes.begin();
+       set<string>::const_iterator const end = excludes.end();
+       for (; sit != end; ++sit)
+               excluded_numbers.insert(formats.getNumber(*sit));
 
        vector<int> const & reachables =
                G_.getReachable(formats.getNumber(from),