diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-04-04 14:33:16 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-04-06 16:48:12 +0200 |
| commit | 8ed2fb306ffa8c7fef336b858fc5074c309c3c9f (patch) | |
| tree | 8699322ccfd3bfef66af56437bb9dabfa249a719 /avmedia | |
| parent | 79ae6cc6b3b19252473f6987106ea7d8aa17a5ea (diff) | |
weld linkeditdialog
which enables changing FileDialogHelper over to welded
Change-Id: I988342a6574cb7ed09b2724929e8c7117474a56c
Reviewed-on: https://gerrit.libreoffice.org/52388
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'avmedia')
| -rw-r--r-- | avmedia/source/framework/mediacontrol.cxx | 2 | ||||
| -rw-r--r-- | avmedia/source/viewer/mediawindow.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx index 23cf4944e11c..dd9a02cb5c89 100644 --- a/avmedia/source/framework/mediacontrol.cxx +++ b/avmedia/source/framework/mediacontrol.cxx @@ -297,7 +297,7 @@ IMPL_LINK( MediaControl, implSelectHdl, ToolBox*, p, void ) { OUString aURL; - if (MediaWindow::executeMediaURLDialog(this, aURL, nullptr)) + if (MediaWindow::executeMediaURLDialog(GetFrameWeld(), aURL, nullptr)) { if( !MediaWindow::isMediaURL( aURL, ""/*TODO?*/, true ) ) MediaWindow::executeFormatErrorBox(GetFrameWeld()); diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx index b14148ea37e0..2b2f0937f562 100644 --- a/avmedia/source/viewer/mediawindow.cxx +++ b/avmedia/source/viewer/mediawindow.cxx @@ -209,7 +209,7 @@ void MediaWindow::getMediaFilters( FilterNameVector& rFilterNameVector ) } -bool MediaWindow::executeMediaURLDialog(const vcl::Window* pParent, OUString& rURL, bool *const o_pbLink) +bool MediaWindow::executeMediaURLDialog(weld::Window* pParent, OUString& rURL, bool *const o_pbLink) { ::sfx2::FileDialogHelper aDlg(o_pbLink ? ui::dialogs::TemplateDescription::FILEOPEN_LINK_PREVIEW @@ -295,7 +295,7 @@ bool MediaWindow::executeMediaURLDialog(const vcl::Window* pParent, OUString& rU return !rURL.isEmpty(); } -void MediaWindow::executeFormatErrorBox(weld::Widget* pParent) +void MediaWindow::executeFormatErrorBox(weld::Window* pParent) { std::unique_ptr<weld::MessageDialog> xBox(Application::CreateMessageDialog(pParent, VclMessageType::Warning, VclButtonsType::Ok, AvmResId(AVMEDIA_STR_ERR_URL))); |