backport fix for bug #7973

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40631 a592a061-630c-0410-9148-cb99ea01b6c8

src/support/FileName.cpp

@@ -813,6 +813,9 @@ string FileName::guessFormatFromContents() const
 	// PKZIP
 	static string const zipStamp = "PK";
 
+	// ZIP containers (koffice, openoffice.org etc).
+	static string const nonzipStamp = "\008\0\0\0mimetypeapplication/";
+
 	// compress
 	static string const compressStamp = "\037\235";
 
@@ -840,7 +843,8 @@ string FileName::guessFormatFromContents() const
 			if (prefixIs(str, gzipStamp)) {
 				format =  "gzip";
 
-			} else if (stamp == zipStamp) {
+			} else if (stamp == zipStamp &&
+			           !contains(str, nonzipStamp)) {
 				format =  "zip";
 
 			} else if (stamp == compressStamp) {

status.20x

@@ -137,6 +137,8 @@ What's new
 - Do not use \inputencoding for translated names of theorem-like environments
   if they can be actually encoded in the chosen document encoding (bug 7800).
 
+- Do mot misdetect office file formats as zip (bug 7973).
+
 
 * TEX2LYX