Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

* commit 'ooo/DEV300_m101':
  impressdefaults1: #i113015# #i113017# new defaults for shape filling, outline and shadows
  impress202: #i35600# fixed some shape outlines (flower shape)
  impress202: #i35600# fixed heart + puzzle shape..

Conflicts:
	extras/source/palettes/standard.soc

extras/source/palettes/standard.soc

@@ -48,6 +48,7 @@
   <draw:color draw:name="Blue 6" draw:color="#0099ff"/>
   <draw:color draw:name="Blue 7" draw:color="#00b8ff"/>
   <draw:color draw:name="Blue 8" draw:color="#99ccff"/>
+ <draw:color draw:name="Blue 9" draw:color="#CFE7E5"/>
   <draw:color draw:name="Turquoise 1" draw:color="#00dcff"/>
   <draw:color draw:name="Turquoise 2" draw:color="#00cccc"/>
   <draw:color draw:name="Turquoise 3" draw:color="#23b8dc"/>