From a86144696df87cd81795e071a30b74af127c7948 Mon Sep 17 00:00:00 2001 From: Tomaž Vajngerl Date: Thu, 27 Oct 2016 18:21:47 +0200 Subject: surpress automatic scaling / conversion for document shadow MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ib020161db8d5e241e923dcd629a9a4e4bb4c23da Reviewed-on: https://gerrit.libreoffice.org/30342 Reviewed-by: Tomaž Vajngerl Tested-by: Tomaž Vajngerl --- sw/source/core/layout/paintfrm.cxx | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index 7094b1632288..ea91cec4fed7 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -99,6 +99,8 @@ #include #include +#include + #define COL_NOTES_SIDEPANE RGB_COLORDATA(230,230,230) #define COL_NOTES_SIDEPANE_BORDER RGB_COLORDATA(200,200,200) #define COL_NOTES_SIDEPANE_SCROLLAREA RGB_COLORDATA(230,230,220) @@ -6093,8 +6095,11 @@ static void lcl_paintBitmapExToRect(vcl::RenderContext *pOut, const Point& aPoin // #i16816# tagged pdf support SwTaggedPDFHelper aTaggedPDFHelper( nullptr, nullptr, nullptr, *_pViewShell->GetOut() ); - static vcl::DeleteOnDeinit< drawinglayer::primitive2d::DiscreteShadow > shadowMaskObj - ( new drawinglayer::primitive2d::DiscreteShadow( SW_RES( BMP_PAGE_SHADOW_MASK ) )); + static vcl::DeleteOnDeinit shadowMaskObj( + new drawinglayer::primitive2d::DiscreteShadow( + vcl::bitmap::loadFromResource(SW_RES(BMP_PAGE_SHADOW_MASK), + ImageLoadFlags::IgnoreDarkTheme | ImageLoadFlags::IgnoreScalingFactor))); + drawinglayer::primitive2d::DiscreteShadow& shadowMask = *shadowMaskObj.get(); static vcl::DeleteOnDeinit< BitmapEx > aPageTopRightShadowObj( new BitmapEx ); static vcl::DeleteOnDeinit< BitmapEx > aPageBottomRightShadowObj( new BitmapEx ); -- cgit