Merge branch '2.3.2-staging' into 2.3.x

[lyx.git] / src / Format.cpp

diff --git a/src/Format.cpp b/src/Format.cpp
index d0f83a20046ebb04eed7be53c1ed9feefb98fab5..3b3a10da527d713dfb792a1a5d3fa133536b4a51 100644 (file)
--- a/src/Format.cpp
+++ b/src/Format.cpp
@@ -102,7 +102,7 @@ private:
 };
 
 
-} //namespace anon
+} // namespace
 
 bool Format::formatSorter(Format const * lhs, Format const * rhs)
 {
@@ -232,7 +232,7 @@ string guessFormatFromContents(FileName const & fn)
        static string const zipStamp = "PK";
 
        // ZIP containers (koffice, openoffice.org etc).
-       static string const nonzipStamp = "\008\0\0\0mimetypeapplication/";
+       static string const nonzipStamp = "\010\0\0\0mimetypeapplication/";
 
        // compress
        static string const compressStamp = "\037\235";
@@ -397,7 +397,7 @@ string guessFormatFromContents(FileName const & fn)
        return string();
 }
 
-}
+} // namespace
 
 
 string Formats::getFormatFromFile(FileName const & filename) const
@@ -857,7 +857,7 @@ FlavorTranslator const & flavorTranslator()
        return translator;
 }
 
-}
+} // namespace
 
 
 std::string flavor2format(OutputParams::FLAVOR flavor)
@@ -872,9 +872,4 @@ OutputParams::FLAVOR format2flavor(std::string fmt)
        return flavorTranslator().find(fmt);
 } */
 
-Formats formats;
-
-Formats system_formats;
-
-
 } // namespace lyx