filter/source/msfilter/msdffimp.cxx | 2 ++ 1 file changed, 2 insertions(+)
New commits: commit 5043707fef2f6961487f37099bfa5ec0549685ba Author: Herbert Dürr <[email protected]> Date: Wed Jun 6 11:58:45 2012 +0000 Resolves: #i119513# fix loading of CMYK JPEG in PPT import Patch By: Lei Debin Found By: [email protected] Extended for better Debug Info by: Herbert Duerr Conflicts: filter/source/msfilter/msdffimp.cxx (cherry picked from commit 393ca6dde9de8f66ed55dc5d0a7885ad06f22301) Conflicts: filter/source/msfilter/msdffimp.cxx Change-Id: Ibb2e7daae425a711b5b6cadfa81446e9adeb68f1 Reviewed-on: https://gerrit.libreoffice.org/2584 Reviewed-by: Fridrich Strba <[email protected]> Tested-by: Fridrich Strba <[email protected]> diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 204ff4e..3813112 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -6113,6 +6113,7 @@ sal_Bool SvxMSDffManager::GetBLIPDirect( SvStream& rBLIPStream, Graphic& rData, 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; @@ -6147,6 +6148,7 @@ sal_Bool SvxMSDffManager::GetBLIPDirect( SvStream& rBLIPStream, Graphic& rData, case 0x542 : aFileName.Append( String( RTL_CONSTASCII_USTRINGPARAM( ".pct" ) ) ); break; case 0x46a : aFileName.Append( String( RTL_CONSTASCII_USTRINGPARAM( ".jpg" ) ) ); break; case 0x6e0 : aFileName.Append( String( RTL_CONSTASCII_USTRINGPARAM( ".png" ) ) ); break; + case 0x6e2 : aFileName.Append( String( RTL_CONSTASCII_USTRINGPARAM( ".jpg" ) ) ); break; case 0x7a8 : aFileName.Append( String( RTL_CONSTASCII_USTRINGPARAM( ".bmp" ) ) ); break; }
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
