(cherry picked from commit 3454d186)

Conflicts:
	filter/source/svg/svgwriter.cxx

Change-Id: I2f9d96ffce0d51695a665b58a776807bab5d277e