diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-05-17 10:28:15 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-05-17 22:16:58 +0200 |
| commit | f9ecd0f47960c8975f01c4564228796342e19be1 (patch) | |
| tree | ab91a4d04195cae9f891fac44ed3225141c9f863 /uui/source/iahndl-errorhandler.cxx | |
| parent | bf09cd79d3414d88ea6c1d348ed191a77e8c413e (diff) | |
go through getParentXWindow
Change-Id: I1f52e1f9ff3fedf8996f72e671400c2549e74dfe
Reviewed-on: https://gerrit.libreoffice.org/54488
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'uui/source/iahndl-errorhandler.cxx')
| -rw-r--r-- | uui/source/iahndl-errorhandler.cxx | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/uui/source/iahndl-errorhandler.cxx b/uui/source/iahndl-errorhandler.cxx index 489d8bd0cc61..553d9cf51dbe 100644 --- a/uui/source/iahndl-errorhandler.cxx +++ b/uui/source/iahndl-errorhandler.cxx @@ -53,7 +53,7 @@ enum class MessageBoxStyle { DialogMask executeErrorDialog( - vcl::Window const * pParent, + weld::Window* pParent, task::InteractionClassification eClassification, OUString const & rContext, OUString const & rMessage, @@ -72,19 +72,19 @@ executeErrorDialog( switch (eClassification) { case task::InteractionClassification_ERROR: - xBox.reset(Application::CreateMessageDialog(pParent ? pParent->GetFrameWeld() : nullptr, + xBox.reset(Application::CreateMessageDialog(pParent, VclMessageType::Error, VclButtonsType::NONE, aText.makeStringAndClear())); break; case task::InteractionClassification_WARNING: - xBox.reset(Application::CreateMessageDialog(pParent ? pParent->GetFrameWeld() : nullptr, + xBox.reset(Application::CreateMessageDialog(pParent, VclMessageType::Warning, VclButtonsType::NONE, aText.makeStringAndClear())); break; case task::InteractionClassification_INFO: - xBox.reset(Application::CreateMessageDialog(pParent ? pParent->GetFrameWeld() : nullptr, + xBox.reset(Application::CreateMessageDialog(pParent, VclMessageType::Info, VclButtonsType::NONE, aText.makeStringAndClear())); break; case task::InteractionClassification_QUERY: - xBox.reset(Application::CreateMessageDialog(pParent ? pParent->GetFrameWeld() : nullptr, + xBox.reset(Application::CreateMessageDialog(pParent, VclMessageType::Question, VclButtonsType::NONE, aText.makeStringAndClear())); break; default: @@ -245,8 +245,9 @@ UUIInteractionHelper::handleErrorHandlerRequest( } } - DialogMask nResult = executeErrorDialog( - getParentProperty(), eClassification, aContext, aMessage, nButtonMask ); + uno::Reference<awt::XWindow> xParent = getParentXWindow(); + DialogMask nResult = executeErrorDialog(Application::GetFrameWeld(xParent), + eClassification, aContext, aMessage, nButtonMask ); switch (nResult) { |