diff options
Diffstat (limited to 'vcl/jsdialog')
| -rw-r--r-- | vcl/jsdialog/executor.cxx | 8 | ||||
| -rw-r--r-- | vcl/jsdialog/jsdialogbuilder.cxx | 35 |
2 files changed, 43 insertions, 0 deletions
diff --git a/vcl/jsdialog/executor.cxx b/vcl/jsdialog/executor.cxx index 8c76e77d8b37..3644dc1bcf9b 100644 --- a/vcl/jsdialog/executor.cxx +++ b/vcl/jsdialog/executor.cxx @@ -321,6 +321,14 @@ bool ExecuteAction(sal_uInt64 nWindowId, const OString& rWidget, StringMap& rDat pDialog->response(RET_CANCEL); return true; } + else if (sAction == "response") + { + OString nResponseString + = OUStringToOString(rData["data"], RTL_TEXTENCODING_ASCII_US); + int nResponse = std::atoi(nResponseString.getStr()); + pDialog->response(nResponse); + return true; + } } } else if (sControlType == "radiobutton") diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx index da0537893a35..c7c8c3735fd5 100644 --- a/vcl/jsdialog/jsdialogbuilder.cxx +++ b/vcl/jsdialog/jsdialogbuilder.cxx @@ -27,6 +27,23 @@ #include <cppuhelper/supportsservice.hxx> #include <utility> +namespace +{ +void response_help(vcl::Window* pWindow) +{ + ::Dialog* pDialog = dynamic_cast<::Dialog*>(pWindow); + if (!pDialog) + return; + + vcl::Window* pButtonWindow = pDialog->get_widget_for_response(RET_HELP); + ::Button* pButton = dynamic_cast<::Button*>(pButtonWindow); + if (!pButton) + return; + + pButton->Click(); +} +} + JSDialogNotifyIdle::JSDialogNotifyIdle(VclPtr<vcl::Window> aNotifierWindow, VclPtr<vcl::Window> aContentWindow, std::string sTypeOfJSON) : Idle("JSDialog notify") @@ -748,6 +765,12 @@ void JSDialog::undo_collapse() void JSDialog::response(int response) { + if (response == RET_HELP) + { + response_help(m_xWidget.get()); + return; + } + sendClose(); SalInstanceDialog::response(response); } @@ -922,6 +945,18 @@ void JSMessageDialog::set_secondary_text(const OUString& rText) sendFullUpdate(); } +void JSMessageDialog::response(int response) +{ + if (response == RET_HELP) + { + response_help(m_xWidget.get()); + return; + } + + sendClose(); + SalInstanceMessageDialog::response(response); +} + JSCheckButton::JSCheckButton(JSDialogSender* pSender, ::CheckBox* pCheckBox, SalInstanceBuilder* pBuilder, bool bTakeOwnership) : JSWidget<SalInstanceCheckButton, ::CheckBox>(pSender, pCheckBox, pBuilder, bTakeOwnership) |