From 805c6101b3427cc98b53f1c48f22f705206c384d Mon Sep 17 00:00:00 2001 From: Ariel Constenla-Haile Date: Mon, 24 Dec 2012 08:07:25 +0000 Subject: Resolves: #i121544# - Clean-up MessageBox API (cherry picked from commit 27cfcb1e9d103b3e49c1263b1fa59fee8b187b21) 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 c9f7a06e7798bcd5253844c49d210ea9345bd4b8) Conflicts: sw/inc/pch/precompiled_sw.hxx Change-Id: Ib8b1e7aaac769feff5206fcdd238c487a6130dd1 Related: #i121544# - Fix header guards Found by: Tsutomu Uchino (cherry picked from commit 82194a19ff4f29c8451c8e6ab6fe4f1b9d08df27) Conflicts: offapi/com/sun/star/awt/MessageBoxType.idl Change-Id: Ide8ba697fbc80395d2f30a068a0820a6afa3332f --- offapi/type_reference/offapi.rdb | Bin 6833664 -> 6824448 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'offapi/type_reference') diff --git a/offapi/type_reference/offapi.rdb b/offapi/type_reference/offapi.rdb index 06daf3b11647..7c06f1a2c131 100644 Binary files a/offapi/type_reference/offapi.rdb and b/offapi/type_reference/offapi.rdb differ -- cgit v1.2.3