diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-04-29 10:11:28 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2014-04-29 10:42:57 +0000 |
| commit | 3bedb85460b028500ff450eeeb80acf8278df39e (patch) | |
| tree | baa82da812e4fb244ad5890d7b29761bddd81727 | |
| parent | 8f28c7d373288a136b85aa70323c3fa2cf4680cb (diff) | |
Resolves: fdo#62038 EPS not rendered in drawinglayer code paths
It attempts to see if the outputdevice can draw the true EPS
but if the outputdevice is in record-only mode it just stashs a
new eps metaaction, and this time with no fallback image, and
happily returns ok so the drawing layer ends up with a new
replacement eps metaction, except with no preview anymore.
Perhaps DrawEPS should return false here, but its safer this way
Change-Id: I0e0b16e4b2be00802a1af1f8147500d816a3c5de
(cherry picked from commit 3db00c554b38ee6c1b6e969768da53db4dc2f92a)
Reviewed-on: https://gerrit.libreoffice.org/9192
Tested-by: David Tardon <dtardon@redhat.com>
Reviewed-by: David Tardon <dtardon@redhat.com>
| -rw-r--r-- | drawinglayer/source/processor2d/vclprocessor2d.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx b/drawinglayer/source/processor2d/vclprocessor2d.cxx index 7f2ab70ffc6e..0f580e8ff767 100644 --- a/drawinglayer/source/processor2d/vclprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx @@ -1351,12 +1351,14 @@ namespace drawinglayer if(!aRectangle.IsEmpty()) { + bool bWillReallyRender = mpOutputDevice->IsDeviceOutputNecessary(); // try to paint EPS directly without fallback visualisation - const bool bEPSPaintedDirectly(mpOutputDevice->DrawEPS( + const bool bEPSPaintedDirectly = bWillReallyRender && + mpOutputDevice->DrawEPS( aRectangle.TopLeft(), aRectangle.GetSize(), rEpsPrimitive2D.getGfxLink(), - 0)); + 0); if(!bEPSPaintedDirectly) { |