diff options
author | Ariel Constenla-Haile <arielch@apache.org> | 2012-12-25 03:17:31 +0000 |
---|---|---|
committer | Ariel Constenla-Haile <arielch@apache.org> | 2012-12-25 03:17:31 +0000 |
commit | c9f7a06e7798bcd5253844c49d210ea9345bd4b8 (patch) | |
tree | 9bf1c10a652ed175abb16f80deb0815f6bbd4861 | |
parent | f765a67c712ca3684d9cb5df0146856a257c7a80 (diff) |
i121544 - Clean-up MessageBox API (post fix)
Notes
Notes:
merged as: 805c6101b3427cc98b53f1c48f22f705206c384d
-rw-r--r-- | UnoControls/inc/basecontrol.hxx | 1 | ||||
-rw-r--r-- | UnoControls/source/inc/progressmonitor.hxx | 1 | ||||
-rw-r--r-- | sw/inc/pch/precompiled_sw.hxx | 1 | ||||
-rw-r--r-- | sw/source/ui/envelp/labimp.hxx | 1 | ||||
-rw-r--r-- | swext/mediawiki/src/com/sun/star/wiki/MainThreadDialogExecutor.java | 4 |
5 files changed, 2 insertions, 6 deletions
diff --git a/UnoControls/inc/basecontrol.hxx b/UnoControls/inc/basecontrol.hxx index 344e8fa85319..baaf1b20b82e 100644 --- a/UnoControls/inc/basecontrol.hxx +++ b/UnoControls/inc/basecontrol.hxx @@ -83,7 +83,6 @@ #include <com/sun/star/awt/XComboBox.hpp> #include <com/sun/star/awt/XControl.hpp> #include <com/sun/star/awt/XCheckBox.hpp> -#include <com/sun/star/awt/MessageBoxCommand.hpp> #include <com/sun/star/awt/XLayoutConstrains.hpp> #include <com/sun/star/awt/XProgressBar.hpp> #include <com/sun/star/awt/XTopWindow.hpp> diff --git a/UnoControls/source/inc/progressmonitor.hxx b/UnoControls/source/inc/progressmonitor.hxx index b8e9a85e7f0e..0cfed66fb45f 100644 --- a/UnoControls/source/inc/progressmonitor.hxx +++ b/UnoControls/source/inc/progressmonitor.hxx @@ -63,7 +63,6 @@ #include <com/sun/star/awt/XComboBox.hpp> #include <com/sun/star/awt/XControl.hpp> #include <com/sun/star/awt/XCheckBox.hpp> -#include <com/sun/star/awt/MessageBoxCommand.hpp> #include <com/sun/star/awt/XLayoutConstrains.hpp> #include <com/sun/star/awt/XProgressBar.hpp> diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx index 92f7a6a664b8..af807bf33e75 100644 --- a/sw/inc/pch/precompiled_sw.hxx +++ b/sw/inc/pch/precompiled_sw.hxx @@ -67,7 +67,6 @@ #include "com/sun/star/accessibility/XAccessibleTable.hpp" #include "com/sun/star/accessibility/XAccessibleTextAttributes.hpp" #include "com/sun/star/accessibility/XAccessibleValue.hpp" -#include "com/sun/star/awt/MessageBoxCommand.hpp" #include "com/sun/star/awt/PosSize.hpp" #include "com/sun/star/awt/ScrollBarOrientation.hpp" #include "com/sun/star/awt/Size.hpp" diff --git a/sw/source/ui/envelp/labimp.hxx b/sw/source/ui/envelp/labimp.hxx index 345798f2a7a3..7c8aa1c9996c 100644 --- a/sw/source/ui/envelp/labimp.hxx +++ b/sw/source/ui/envelp/labimp.hxx @@ -71,7 +71,6 @@ #include <com/sun/star/awt/XComboBox.hpp> #include <com/sun/star/awt/XControl.hpp> #include <com/sun/star/awt/XCheckBox.hpp> -#include <com/sun/star/awt/MessageBoxCommand.hpp> #include <com/sun/star/awt/XLayoutConstrains.hpp> #include <com/sun/star/awt/XProgressBar.hpp> #include <com/sun/star/container/XNameAccess.hpp> diff --git a/swext/mediawiki/src/com/sun/star/wiki/MainThreadDialogExecutor.java b/swext/mediawiki/src/com/sun/star/wiki/MainThreadDialogExecutor.java index dcfb6f3dd079..f679a068dbca 100644 --- a/swext/mediawiki/src/com/sun/star/wiki/MainThreadDialogExecutor.java +++ b/swext/mediawiki/src/com/sun/star/wiki/MainThreadDialogExecutor.java @@ -162,8 +162,8 @@ public class MainThreadDialogExecutor implements XCallback else if ( m_xMessageBox != null ) { int nRes = m_xMessageBox.execute(); - m_bResult = ( nRes == com.sun.star.awt.MessageBoxCommand.OK - || nRes == com.sun.star.awt.MessageBoxCommand.YES ); + m_bResult = ( nRes == com.sun.star.awt.MessageBoxResults.OK + || nRes == com.sun.star.awt.MessageBoxResults.YES ); } m_bCalled = true; |