diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2016-10-27 18:21:47 +0200 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2016-10-29 21:47:12 +0000 |
| commit | a86144696df87cd81795e071a30b74af127c7948 (patch) | |
| tree | 6758d6167811ca96c133ffa1655532f05f929d80 | |
| parent | 6d68b2bbc9e52f92f1af025f360553646c6a598a (diff) | |
surpress automatic scaling / conversion for document shadow
Change-Id: Ib020161db8d5e241e923dcd629a9a4e4bb4c23da
Reviewed-on: https://gerrit.libreoffice.org/30342
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Tested-by: Tomaž Vajngerl <quikee@gmail.com>
| -rw-r--r-- | sw/source/core/layout/paintfrm.cxx | 9 |
1 files 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 <view.hxx> #include <paintfrm.hxx> +#include <vcl/BitmapTools.hxx> + #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<drawinglayer::primitive2d::DiscreteShadow> 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 ); |