diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-08-24 14:33:06 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-08-24 15:11:44 +0100 |
| commit | db4154cc19c803707f34bdd5ce4e8a43eac528a6 (patch) | |
| tree | 6a55c6c5251c175d42772f54295aa97d76c4b70f /sw | |
| parent | Fix a11y logging with 10.6 SDK (diff) | |
| download | core-db4154cc19c803707f34bdd5ce4e8a43eac528a6.tar.gz core-db4154cc19c803707f34bdd5ce4e8a43eac528a6.zip | |
add gtk_message_dialog_new-alike ctor for MessageDialog
Change-Id: Ie422cd2c903cbd18353b1929c074574d452559ce
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/ui/dbui/mmaddressblockpage.cxx | 6 | ||||
| -rw-r--r-- | sw/source/ui/lingu/olmenu.cxx | 4 | ||||
| -rw-r--r-- | sw/source/ui/table/tautofmt.cxx | 12 |
3 files changed, 9 insertions, 13 deletions
diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx index 600e069dc928..804d76965fdf 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.cxx +++ b/sw/source/ui/dbui/mmaddressblockpage.cxx @@ -21,9 +21,9 @@ #include <mailmergewizard.hxx> #include <swtypes.hxx> #include <addresslistdialog.hxx> -#include <vcl/xtextedt.hxx> +#include <vcl/layout.hxx> #include <vcl/txtattr.hxx> -#include <vcl/msgbox.hxx> +#include <vcl/xtextedt.hxx> #include <mmconfigitem.hxx> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> @@ -185,7 +185,7 @@ IMPL_LINK_NOARG(SwMailMergeAddressBlockPage, AddressListHdl_Impl) catch (const uno::Exception& e) { OSL_FAIL(OUStringToOString(e.Message, osl_getThreadTextEncoding()).getStr()); - ErrorBox(this, WB_OK, e.Message).Execute(); + MessageDialog(this, e.Message).Execute(); } return 0; } diff --git a/sw/source/ui/lingu/olmenu.cxx b/sw/source/ui/lingu/olmenu.cxx index 1909479b1b62..ee4bece90798 100644 --- a/sw/source/ui/lingu/olmenu.cxx +++ b/sw/source/ui/lingu/olmenu.cxx @@ -70,7 +70,7 @@ #include <svx/dlgutil.hxx> #include <unotools/lingucfg.hxx> #include <unotools/linguprops.hxx> -#include <vcl/msgbox.hxx> +#include <vcl/layout.hxx> #include <vcl/settings.hxx> #include <vcl/svapp.hxx> #include <sal/macros.h> @@ -794,7 +794,7 @@ void SwSpellPopup::Execute( sal_uInt16 nId ) uno::Any exc( ::cppu::getCaughtException() ); OUString msg( ::comphelper::anyToString( exc ) ); const SolarMutexGuard guard; - ErrorBox aErrorBox( NULL, WB_OK, msg ); + MessageDialog aErrorBox(NULL, msg); aErrorBox.SetText( "Explanations" ); aErrorBox.Execute(); } diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx index 20b4589712a0..de31736cc40b 100644 --- a/sw/source/ui/table/tautofmt.cxx +++ b/sw/source/ui/table/tautofmt.cxx @@ -333,10 +333,8 @@ IMPL_LINK_NOARG(SwAutoFormatDlg, AddHdl) if( !bFmtInserted ) { - bOk = RET_CANCEL == ErrorBox( this, - WinBits( WB_OK_CANCEL | WB_DEF_OK), - aStrInvalidFmt - ).Execute(); + bOk = RET_CANCEL == MessageDialog(this, aStrInvalidFmt, VCL_MESSAGE_ERROR, VCL_BUTTONS_OK_CANCEL) + .Execute(); } } else @@ -437,10 +435,8 @@ IMPL_LINK_NOARG(SwAutoFormatDlg, RenameHdl) if( !bFmtRenamed ) { - bOk = RET_CANCEL == ErrorBox( this, - WinBits( WB_OK_CANCEL | WB_DEF_OK), - aStrInvalidFmt - ).Execute(); + bOk = RET_CANCEL == MessageDialog(this, aStrInvalidFmt, VCL_MESSAGE_ERROR, VCL_BUTTONS_OK_CANCEL) + .Execute(); } } else |