(cherry picked from commit 734b532f)

Conflicts:
	offapi/com/sun/star/awt/ImageScaleMode.idl
	oox/source/ole/axcontrol.cxx
	reportdesign/source/filter/xml/xmlHelper.cxx
	wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java

Change-Id: Ib5fa7b82edddb809129a4e5619a20ca7a7b2e38a