diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-01-14 20:35:20 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-01-14 21:28:05 +0100 |
| commit | d8bbe0ede2d5f07a92772dfa04ace97751128005 (patch) | |
| tree | 8b14800071f981d569ab89981d82a7128d2fa8af | |
| parent | 4ebeb52a234d4e5c8de0de4b02bf3def5351d735 (diff) | |
EndDialog takes long nResult, not bool
Change-Id: Ic6283b7a71a5d1c539ae99155f448e34e877080a
| -rw-r--r-- | cui/source/dialogs/thesdlg.cxx | 2 | ||||
| -rw-r--r-- | cui/source/options/certpath.cxx | 2 | ||||
| -rw-r--r-- | desktop/source/deployment/gui/license_dialog.cxx | 4 | ||||
| -rw-r--r-- | sfx2/source/dialog/inputdlg.cxx | 2 | ||||
| -rw-r--r-- | svx/source/tbxctrls/fontworkgallery.cxx | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx index 6ae616a43586..0aecd5210397 100644 --- a/cui/source/dialogs/thesdlg.cxx +++ b/cui/source/dialogs/thesdlg.cxx @@ -518,7 +518,7 @@ SvxThesaurusDialog::SvxThesaurusDialog( IMPL_LINK( SvxThesaurusDialog, ReplaceBtnHdl_Impl, Button *, EMPTYARG /*pBtn*/ ) { - EndDialog(true); + EndDialog(RET_OK); return 0; } diff --git a/cui/source/options/certpath.cxx b/cui/source/options/certpath.cxx index 89dc712fedb1..f1873b0ca15b 100644 --- a/cui/source/options/certpath.cxx +++ b/cui/source/options/certpath.cxx @@ -135,7 +135,7 @@ IMPL_LINK_NOARG(CertPathDialog, OKHdl_Impl) SAL_WARN("cui.options", "CertPathDialog::OKHdl_Impl(): caught exception" << e.Message); } - EndDialog(true); + EndDialog(RET_OK); return 0; } diff --git a/desktop/source/deployment/gui/license_dialog.cxx b/desktop/source/deployment/gui/license_dialog.cxx index da65564477b8..f67566164653 100644 --- a/desktop/source/deployment/gui/license_dialog.cxx +++ b/desktop/source/deployment/gui/license_dialog.cxx @@ -225,13 +225,13 @@ LicenseDialogImpl::LicenseDialogImpl( IMPL_LINK_NOARG(LicenseDialogImpl, AcceptHdl) { - EndDialog(true); + EndDialog(RET_OK); return 0; } IMPL_LINK_NOARG(LicenseDialogImpl, CancelHdl) { - EndDialog(false); + EndDialog(RET_CANCEL); return 0; } diff --git a/sfx2/source/dialog/inputdlg.cxx b/sfx2/source/dialog/inputdlg.cxx index b67f3897fd20..d46c9ae5265b 100644 --- a/sfx2/source/dialog/inputdlg.cxx +++ b/sfx2/source/dialog/inputdlg.cxx @@ -33,7 +33,7 @@ OUString InputDialog::getEntryText() const IMPL_LINK(InputDialog,ClickHdl,PushButton*, pButton) { - EndDialog(pButton == m_pOK ? true : false); + EndDialog(pButton == m_pOK ? RET_OK : RET_CANCEL); return 0; } diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx index 01b34f923724..2ec5104c06b7 100644 --- a/svx/source/tbxctrls/fontworkgallery.cxx +++ b/svx/source/tbxctrls/fontworkgallery.cxx @@ -247,7 +247,7 @@ void FontWorkGalleryDialog::insertSelectedFontwork() IMPL_LINK_NOARG(FontWorkGalleryDialog, ClickOKHdl) { insertSelectedFontwork(); - EndDialog( true ); + EndDialog( RET_OK ); return 0; } @@ -256,7 +256,7 @@ IMPL_LINK_NOARG(FontWorkGalleryDialog, ClickOKHdl) IMPL_LINK_NOARG(FontWorkGalleryDialog, DoubleClickFavoriteHdl) { insertSelectedFontwork(); - EndDialog( true ); + EndDialog( RET_OK ); return( 0L ); } |