From bb406680cebd6fa1e1bdb9e2de430cd9a1f44da0 Mon Sep 17 00:00:00 2001 From: Mike Kaganski Date: Wed, 20 Sep 2017 20:04:51 +0300 Subject: Put definition of _CRT_RAND_S into bin/update_pch so it doesn't get removed again from sal/inc/pch/precompiled_sal.hxx (see commit 4af9612f2be9e023e762831207cbdb1d5f25906f). Also make necessary changes to some of the files that start to fail building after running bin/update_pch.sh, so that the patch is self-contained and leaves the tree in fully functional state. tools namespace had to be prepended with :: to disambiguate from drawinglayer::tools vcl/inc/window.h includes were amended, because ExtTextInputAttr is from vcl/commandevent.hxx, and enum class ShowTrackFlags is from vcl/window.hxx Change-Id: I47179622350754cba2f95d26a1bafd3dfbbc935b Reviewed-on: https://gerrit.libreoffice.org/42559 Tested-by: Jenkins Reviewed-by: Mike Kaganski --- drawinglayer/source/processor2d/vclmetafileprocessor2d.hxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drawinglayer/source/processor2d/vclmetafileprocessor2d.hxx') diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.hxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.hxx index 50ab3ec33566..951510277c7b 100644 --- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.hxx +++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.hxx @@ -72,7 +72,7 @@ namespace drawinglayer { private: /// local helper(s) - tools::Rectangle impDumpToMetaFile( + ::tools::Rectangle impDumpToMetaFile( const primitive2d::Primitive2DContainer& rContent, GDIMetaFile& o_rContentMetafile); void impConvertFillGradientAttributeToVCLGradient( -- cgit