diff options
| author | Herbert Dürr <hdu@apache.org> | 2012-06-06 11:58:45 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-03-07 10:09:29 +0000 |
| commit | 393ca6dde9de8f66ed55dc5d0a7885ad06f22301 (patch) | |
| tree | 7760e28828688c5a01957d46c879e59d4cda794f | |
| parent | b7e51332a9cbd403703e7da99fe74230447163d9 (diff) | |
Resolves: #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
Conflicts:
filter/source/msfilter/msdffimp.cxx
Change-Id: Ibb2e7daae425a711b5b6cadfa81446e9adeb68f1
| -rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index eea3f99e475b..41fe692fb620 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -6098,6 +6098,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; @@ -6131,6 +6132,7 @@ sal_Bool SvxMSDffManager::GetBLIPDirect( SvStream& rBLIPStream, Graphic& rData, case 0x542 : aFileName += ".pct"; break; case 0x46a : aFileName += ".jpg"; break; case 0x6e0 : aFileName += ".png"; break; + case 0x6e2 : aFileName += ".jpg"; break; case 0x7a8 : aFileName += ".bmp"; break; } |