* src/LyXAction.C: mark goto-clear-bookmark as working without buffer

[lyx.git] / src / insets / ExternalTemplate.C

diff --git a/src/insets/ExternalTemplate.C b/src/insets/ExternalTemplate.C
index df79354da6c020d4ac90ebe7fa48731bb009f279..b27255d48dabffac411b0459834242459655f2eb 100644 (file)
--- a/src/insets/ExternalTemplate.C
+++ b/src/insets/ExternalTemplate.C
@@ -21,26 +21,33 @@
 #include "support/package.h"
 #include "support/path.h"
 
-namespace support = lyx::support;
-
 using std::endl;
 using std::for_each;
-
 using std::string;
 using std::ostream;
 using std::vector;
 
-
 namespace lyx {
 namespace external {
 
-namespace {
 
 typedef Translator<TransformID, string> TransformIDTranslator;
-TransformIDTranslator const & transformIDTranslator();
 
-} // namespace anon
+static TransformIDTranslator const initIDTranslator()
+{
+       TransformIDTranslator translator(TransformID(-1), "");
+       translator.addPair(Rotate, "Rotate");
+       translator.addPair(Resize, "Resize");
+       translator.addPair(Clip,   "Clip");
+       translator.addPair(Extra,  "Extra");
+       return translator;
+}
 
+static TransformIDTranslator const & transformIDTranslator()
+{
+       static TransformIDTranslator const translator = initIDTranslator();
+       return translator;
+}
 
 // We have to have dummy default commands for security reasons!
 Template::Template()
@@ -246,7 +253,7 @@ void TemplateManager::readTemplates(string const & path)
 
        LyXLex lex(templatetags, TM_TEMPLATE_END);
 
-       string filename = support::libFileSearch("", "external_templates");
+       support::FileName const filename = support::libFileSearch("", "external_templates");
        if (filename.empty() || !lex.setFile(filename)) {
                lex.printError("external::TemplateManager::readTemplates: "
                               "No template file");
@@ -556,26 +563,5 @@ void Template::Format::readFormat(LyXLex & lex)
        }
 }
 
-namespace {
-
-TransformIDTranslator const initIDTranslator()
-{
-       TransformIDTranslator translator(TransformID(-1), "");
-       translator.addPair(Rotate, "Rotate");
-       translator.addPair(Resize, "Resize");
-       translator.addPair(Clip,   "Clip");
-       translator.addPair(Extra,  "Extra");
-       return translator;
-}
-
-
-TransformIDTranslator const & transformIDTranslator()
-{
-       static TransformIDTranslator const translator = initIDTranslator();
-       return translator;
-}
-
-} // namespace anon
-
 } // namespace external
 } // namespace lyx