(cherry picked from commit fa109b46)

Conflicts:
	cppcanvas/source/mtfrenderer/emfplus.cxx

Change-Id: If8d7c210e437a041f3202c09f3d26d621b5af748

ops, fix build

(cherry picked from commit ebebb309)

Conflicts:
	cppcanvas/source/mtfrenderer/emfplus.cxx

Change-Id: If72f3c1e0d7a14779074d898c4d1eb0fe8f07871
Reviewed-on: https://gerrit.libreoffice.org/2751Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>