(cherry picked from commit 2b179313)

Conflicts:
	svgio/inc/svgio/svgreader/svgstyleattributes.hxx
	svgio/inc/svgio/svgreader/svgtoken.hxx
	svgio/inc/svgio/svgreader/svgtools.hxx
	svgio/source/svgreader/svgdocumenthandler.cxx
	svgio/source/svgreader/svgnode.cxx
	svgio/source/svgreader/svgstyleattributes.cxx
	svgio/source/svgreader/svgtoken.cxx
	svgio/source/svgreader/svgtools.cxx

Change-Id: I8bac5a185feb0c7a54aa7bf816ab7aabd71a2e19