summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArmin Le Grand <Armin.Le.Grand@cib.de>2018-06-06 10:51:58 +0200
committerArmin Le Grand <Armin.Le.Grand@cib.de>2018-06-06 13:37:58 +0200
commitd84517a171a17dfa12f25ad4305a06b20f3b7c76 (patch)
treeda9cbe70dff40a46de6f523ea3465bea7c48274e
parent92026741ed7e83119f1de51528480c5a937c0e88 (diff)
tdf#117984 Make MapMode thread-safe
...using o3tl::ThreadSafeRefCountingPolicy due to being used indirectly (~Bitmap) in parallelized 3D renderer Change-Id: Ia5eab219c6844570a04c83f71cca5e7b7da4326d Reviewed-on: https://gerrit.libreoffice.org/55365 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Armin Le Grand <Armin.Le.Grand@cib.de>
-rw-r--r--include/vcl/mapmod.hxx4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/vcl/mapmod.hxx b/include/vcl/mapmod.hxx
index e3e1ede649ab..f09097c5d2bf 100644
--- a/include/vcl/mapmod.hxx
+++ b/include/vcl/mapmod.hxx
@@ -67,7 +67,9 @@ public:
friend VCL_DLLPUBLIC SvStream& ReadMapMode( SvStream& rIStm, MapMode& rMapMode );
friend VCL_DLLPUBLIC SvStream& WriteMapMode( SvStream& rOStm, const MapMode& rMapMode );
- typedef o3tl::cow_wrapper< ImplMapMode > ImplType;
+ // tdf#117984 needs to be thread-safe due to being used e.g. in Bitmaps
+ // vcl::ScopedBitmapAccess in parallelized 3D renderer
+ typedef o3tl::cow_wrapper< ImplMapMode, o3tl::ThreadSafeRefCountingPolicy > ImplType;
private:
ImplType mpImplMapMode;