[Libreoffice-commits] core.git: include/vcl

[Armin Le Grand]

 include/vcl/mapmod.hxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit d84517a171a17dfa12f25ad4305a06b20f3b7c76
Author: Armin Le Grand <Armin.Le.Grand at cib.de>
Date:   Wed Jun 6 10:51:58 2018 +0200

    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 at libreoffice.org>
    Reviewed-by: Armin Le Grand <Armin.Le.Grand at cib.de>

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;