Conflicts:

        drawinglayer/source/primitive2d/svggradientprimitive2d.cxx

Change-Id: I04c148303e7153a5376eae79803c540f6eba0b00