summaryrefslogtreecommitdiff
path: root/svx/source
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2018-07-25 17:02:21 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2018-07-27 11:21:07 +0200
commit2038ab9d4cbb7282172a65352e4ed1a852404b29 (patch)
tree7255150ec03ec9a8d3fcf6c50112f93f8309760a /svx/source
parentda12ffb0eca94c1a1af7f4545d0521dd47146f09 (diff)
tdf#118860 svx opengl: avoid SalBitmap creation without solar mutex
The bugdoc has 2 slides. When switching to the second slide, the graphic is loaded in the background, but OpenGLSalBitmap::Create() can't work correctly if the caller doesn't own the solar mutex. This already asserts in OpenGLContext::prepareForYield() in a less obvious way. Focus on the correctness, so just hold the solar mutex during the whole ImportGrpahic() call. If it turns out that the purpose of running this on a thread is to avoid synchronous network traffic, then the data could be first copied to a memory stream, and only then take the lock + import the graphic. (cherry picked from commit 919ccaba419531d689231b76a43ab29c6a9ec65a) Change-Id: I88203c12b4e7a5f2b689928c01e2ba953c5b13c5 Reviewed-on: https://gerrit.libreoffice.org/58126 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx/source')
-rw-r--r--svx/source/svdraw/svdograf.cxx3
1 files changed, 3 insertions, 0 deletions
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index 3eb3abfe0953..ab179960f88c 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -93,6 +93,9 @@ const Graphic ImpLoadLinkedGraphic( const OUString& aFileName, const OUString& a
aFilterData[ 0 ].Name = "CreateNativeLink";
aFilterData[ 0 ].Value <<= true;
+ // Need to own the solar mutex while creating a SalBitmap.
+ SolarMutexGuard aGuard;
+
// #i123042# for e.g SVG the path is needed, so hand it over here. I have no real idea
// what consequences this may have; maybe this is not handed over by purpose here. Not
// handing it over means that any GraphicFormat that internally needs a path as base