diff options
| author | Chr. Rossmanith <ChrRossmanith@gmx.de> | 2014-02-13 22:30:53 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2014-02-14 10:42:24 +0100 |
| commit | 047913ea8f0cb8b03f78be0780c5e828be9ef323 (patch) | |
| tree | c3b501bdb5febaadbd54f02bd3958feaa1f75dab /sw/source/core/graphic/ndgrf.cxx | |
| parent | d5fba1856ff1f939a9ebd523da3aa6578fbc3a25 (diff) | |
fdo#50763: handle inlined base64 images
Signed-off-by: Andras Timar <andras.timar@collabora.com>
Conflicts:
sw/source/filter/html/htmlgrin.cxx
Change-Id: I2e9d17dafcf91872d8ea19089e68d8fe652b3e4e
Signed-off-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'sw/source/core/graphic/ndgrf.cxx')
| -rw-r--r-- | sw/source/core/graphic/ndgrf.cxx | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx index 21cc72a4c6d9..725296ffd57b 100644 --- a/sw/source/core/graphic/ndgrf.cxx +++ b/sw/source/core/graphic/ndgrf.cxx @@ -76,7 +76,14 @@ SwGrfNode::SwGrfNode( bFrameInPaint = bScaleImageMap = sal_False; bGrafikArrived = sal_True; - ReRead(rGrfName,rFltName, pGraphic, 0, sal_False); + + // fdo#50763 inline image has already been read into memory + if (rGrfName.startsWith("data:")) { + maGrfObj.SetGraphic( *pGraphic, rGrfName ); + } + else { + ReRead(rGrfName,rFltName, pGraphic, 0, sal_False); + } } SwGrfNode::SwGrfNode( const SwNodeIndex & rWhere, |