X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFormat.cpp;h=3b3a10da527d713dfb792a1a5d3fa133536b4a51;hb=bcb002039b1a0e4893f18a032e02b6f6368924f9;hp=d0f83a20046ebb04eed7be53c1ed9feefb98fab5;hpb=a2bfe0042d740da64c1daf60f145211cfc1396ed;p=lyx.git diff --git a/src/Format.cpp b/src/Format.cpp index d0f83a2004..3b3a10da52 100644 --- 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