diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2019-01-15 17:31:16 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2019-01-15 23:22:11 +0100 |
| commit | 8b461713c0c86bc19af739aada4b1345cfa5dfbe (patch) | |
| tree | eafdd348ccc19071ee1390dc587486b0a7027639 /vcl/source/outdev/map.cxx | |
| parent | 744dfaa8ebb65346d58da8a4331848f9ee5d07f4 (diff) | |
vcl: protect more outdev functions for disposed state
This is similar to commit c612c3b0aed9ad7f7f42b4313f821b71995ead15
(protect more printer code-paths., 2015-03-20), but handles more
OutputDevice member functions.
The user-level problem was that in case a macro creates a dialog with an
embedded Chart document and the user clicks on e.g. the chart title (so
an sdr::overlay::OverlayManager is created), then it can happen during
closing the dialog that the overlay manager calls these functions after
the output device is disposed.
Change-Id: I8021fb795704f19e52d70505804d68725c636ce0
Reviewed-on: https://gerrit.libreoffice.org/66403
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
Diffstat (limited to 'vcl/source/outdev/map.cxx')
| -rw-r--r-- | vcl/source/outdev/map.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/source/outdev/map.cxx b/vcl/source/outdev/map.cxx index 4c12160e19e7..0c8292b3dd93 100644 --- a/vcl/source/outdev/map.cxx +++ b/vcl/source/outdev/map.cxx @@ -856,7 +856,7 @@ void OutputDevice::SetRelativeMapMode( const MapMode& rNewMapMode ) // #i75163# basegfx::B2DHomMatrix OutputDevice::GetViewTransformation() const { - if(mbMap) + if(mbMap && mpOutDevData) { if(!mpOutDevData->mpViewTransform) { @@ -884,7 +884,7 @@ basegfx::B2DHomMatrix OutputDevice::GetViewTransformation() const // #i75163# basegfx::B2DHomMatrix OutputDevice::GetInverseViewTransformation() const { - if(mbMap) + if(mbMap && mpOutDevData) { if(!mpOutDevData->mpInverseViewTransform) { |