diff options
| author | Ariel Constenla-Haile <arielch@apache.org> | 2012-12-24 08:07:25 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-07-11 13:16:58 +0100 |
| commit | 805c6101b3427cc98b53f1c48f22f705206c384d (patch) | |
| tree | 6319897b3ee481a664bd0ce3e38b55ad333f56e7 /swext | |
| parent | 5dd1b3da57862a6577717544dde56482add89170 (diff) | |
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
Diffstat (limited to 'swext')
| -rw-r--r-- | swext/mediawiki/src/com/sun/star/wiki/Helper.java | 7 | ||||
| -rw-r--r-- | swext/mediawiki/src/com/sun/star/wiki/MainThreadDialogExecutor.java | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/swext/mediawiki/src/com/sun/star/wiki/Helper.java b/swext/mediawiki/src/com/sun/star/wiki/Helper.java index 345be2c785ab..6b4044f505ae 100644 --- a/swext/mediawiki/src/com/sun/star/wiki/Helper.java +++ b/swext/mediawiki/src/com/sun/star/wiki/Helper.java @@ -19,6 +19,7 @@ package com.sun.star.wiki; import com.sun.star.awt.MessageBoxButtons; +import com.sun.star.awt.MessageBoxType; import com.sun.star.awt.XControl; import com.sun.star.awt.XControlContainer; import com.sun.star.awt.XDialog; @@ -980,8 +981,7 @@ public class Helper { xMB = xMBFactory.createMessageBox( xParentPeer, - new com.sun.star.awt.Rectangle(), - "querybox", + MessageBoxType.QUERYBOX, MessageBoxButtons.BUTTONS_YES_NO | MessageBoxButtons.DEFAULT_BUTTON_NO, sTitle, sError ); @@ -990,8 +990,7 @@ public class Helper { xMB = xMBFactory.createMessageBox( xParentPeer, - new com.sun.star.awt.Rectangle(), - "errorbox", + MessageBoxType.ERRORBOX, MessageBoxButtons.BUTTONS_OK, sTitle, sError ); diff --git a/swext/mediawiki/src/com/sun/star/wiki/MainThreadDialogExecutor.java b/swext/mediawiki/src/com/sun/star/wiki/MainThreadDialogExecutor.java index b0dfb38f51ee..4d25b79e6dbe 100644 --- a/swext/mediawiki/src/com/sun/star/wiki/MainThreadDialogExecutor.java +++ b/swext/mediawiki/src/com/sun/star/wiki/MainThreadDialogExecutor.java @@ -157,8 +157,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; |