incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From h..@apache.org
Subject svn commit: r1346867 - /incubator/ooo/trunk/main/filter/source/msfilter/msdffimp.cxx
Date Wed, 06 Jun 2012 12:58:46 GMT
Author: hdu
Date: Wed Jun  6 12:58:45 2012
New Revision: 1346867

URL: http://svn.apache.org/viewvc?rev=1346867&view=rev
Log:
#i119513# fix loading of CMYK JPEG in PPT import

Patch By: Lei Debin
Found By: bjdujing@gmail.com
Extended for better Debug Info by: Herbert Duerr

Modified:
    incubator/ooo/trunk/main/filter/source/msfilter/msdffimp.cxx

Modified: incubator/ooo/trunk/main/filter/source/msfilter/msdffimp.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/filter/source/msfilter/msdffimp.cxx?rev=1346867&r1=1346866&r2=1346867&view=diff
==============================================================================
--- incubator/ooo/trunk/main/filter/source/msfilter/msdffimp.cxx (original)
+++ incubator/ooo/trunk/main/filter/source/msfilter/msdffimp.cxx Wed Jun  6 12:58:45 2012
@@ -6426,6 +6426,7 @@ sal_Bool SvxMSDffManager::GetBLIPDirect(
 			break;
 			case 0x46A :			// One byte tag then JPEG (= JFIF) data
 			case 0x6E0 :			// One byte tag then PNG data
+			case 0x6E2 :			// One byte tag then JPEG in CMYK color space
 			case 0x7A8 :
 				nSkip += 1;			// One byte tag then DIB data
 			break;
@@ -6461,6 +6462,7 @@ sal_Bool SvxMSDffManager::GetBLIPDirect(
 			case 0x542 : aFileName.Append( String( RTL_CONSTASCII_STRINGPARAM( ".pct" ) ) ); break;
 			case 0x46a : aFileName.Append( String( RTL_CONSTASCII_STRINGPARAM( ".jpg" ) ) ); break;
 			case 0x6e0 : aFileName.Append( String( RTL_CONSTASCII_STRINGPARAM( ".png" ) ) ); break;
+			case 0x6e2 : aFileName.Append( String( RTL_CONSTASCII_STRINGPARAM( ".jpg" ) ) ); break;
 			case 0x7a8 : aFileName.Append( String( RTL_CONSTASCII_STRINGPARAM( ".bmp" ) ) ); break;
 		}
 



Mime
View raw message