diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-01-12 13:27:21 +0000 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2015-01-12 16:53:05 +0000 |
| commit | c2d8b640793f665b15b42cda4ad2dcb9d843216d (patch) | |
| tree | dc8aac47a3e02b83d109675316ace5acbe42bb69 /filter/source/msfilter | |
| parent | 4b6c9a6918238441f63222d4fc9e9db94bed6f0d (diff) | |
Resolves: fdo#87015 image missing from doc
regression from
commit e0cce521f1ad0cc384d30ce2f1077ea229fffe62
Author: Armin Le Grand <alg@apache.org>
AuthorDate: Thu Jan 10 16:28:40 2013 +0000
Commit: Caolán McNamara <caolanm@redhat.com>
CommitDate: Thu Jun 13 14:50:46 2013 +0100
Resolves: #i121504# Support for alpha channel in clipboard for all systems
(cherry picked from commit ef3931ff410117e1237b3bef7bc090e8b83b9519)
which blindly just bulldozed out the bMSOFormat branch
Change-Id: Iec354f1fb585f0803b9df472bc9ec9e103aa5847
(cherry picked from commit 470fcca594ba4f6bf473d4d44b415c2ba151b0d9)
Reviewed-on: https://gerrit.libreoffice.org/13874
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'filter/source/msfilter')
| -rw-r--r-- | filter/source/msfilter/mstoolbar.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/filter/source/msfilter/mstoolbar.cxx b/filter/source/msfilter/mstoolbar.cxx index 328b828318d8..2e13d3b66ced 100644 --- a/filter/source/msfilter/mstoolbar.cxx +++ b/filter/source/msfilter/mstoolbar.cxx @@ -724,7 +724,7 @@ bool TBCBitMap::Read( SvStream& rS) nOffSet = rS.Tell(); rS.ReadInt32( cbDIB ); // cbDIB = sizeOf(biHeader) + sizeOf(colors) + sizeOf(bitmapData) + 10 - return ReadDIB(mBitMap, rS, false); + return ReadDIB(mBitMap, rS, false, true); } #if OSL_DEBUG_LEVEL > 1 |