(cherry picked from commit 27cfcb1e)

Conflicts:
	desktop/test/deployment/active/active_native.cxx
	desktop/test/deployment/passive/Dispatch.java
	desktop/test/deployment/passive/passive_native.cxx
	odk/examples/DevelopersGuide/Charts/SelectionChangeListener.java
	odk/examples/DevelopersGuide/GUI/MessageBox.java
	odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx
	odk/examples/java/Inspector/Inspector.java
	offapi/com/sun/star/awt/MessageBoxButtons.idl
	offapi/com/sun/star/awt/MessageBoxResults.idl
	offapi/com/sun/star/awt/XMessageBox.idl
	offapi/com/sun/star/awt/XMessageBoxFactory.idl
	offapi/com/sun/star/awt/makefile.mk
	offapi/type_reference/types.rdb
	sdext/source/minimizer/unodialog.cxx
	toolkit/inc/toolkit/awt/vclxtoolkit.hxx
	toolkit/source/awt/vclxtoolkit.cxx
	toolkit/source/layout/core/root.cxx

Change-Id: I170b494fb96362bb25ba8d0f2518d4e46934dd67

Related: #i121544# - Clean-up MessageBox API (post fix)

(cherry picked from commit c9f7a06e)

Conflicts:
	sw/inc/pch/precompiled_sw.hxx

Change-Id: Ib8b1e7aaac769feff5206fcdd238c487a6130dd1

Related: #i121544# - Fix header guards

Found by: Tsutomu Uchino

(cherry picked from commit 82194a19)

Conflicts:
	offapi/com/sun/star/awt/MessageBoxType.idl

Change-Id: Ide8ba697fbc80395d2f30a068a0820a6afa3332f