diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-09-02 21:30:40 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-09-03 16:14:42 +0200 |
| commit | 1abd3b0e00766a6674d965535bd18a4891bac06e (patch) | |
| tree | 3844111a7598c5c3c0d1e6a4d6315d2c31b4be15 /avmedia | |
| parent | b625d790bf1ccab1b4071ea7670a6e1ceab5fb64 (diff) | |
set parent for insert media file dialog
Change-Id: I71eace1995b229caa75e61df363fd8bad981bed1
Reviewed-on: https://gerrit.libreoffice.org/41851
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 | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx index b3dbf8f21cef..98706fc8a679 100644 --- a/avmedia/source/framework/mediacontrol.cxx +++ b/avmedia/source/framework/mediacontrol.cxx @@ -296,7 +296,7 @@ IMPL_LINK( MediaControl, implSelectHdl, ToolBox*, p, void ) { OUString aURL; - if (MediaWindow::executeMediaURLDialog(aURL, nullptr)) + if (MediaWindow::executeMediaURLDialog(this, aURL, nullptr)) { if( !MediaWindow::isMediaURL( aURL, ""/*TODO?*/, true ) ) MediaWindow::executeFormatErrorBox( this ); diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx index 93774aab821f..304384cb2761 100644 --- a/avmedia/source/viewer/mediawindow.cxx +++ b/avmedia/source/viewer/mediawindow.cxx @@ -209,11 +209,12 @@ void MediaWindow::getMediaFilters( FilterNameVector& rFilterNameVector ) } -bool MediaWindow::executeMediaURLDialog(OUString& rURL, bool *const o_pbLink) +bool MediaWindow::executeMediaURLDialog(const vcl::Window* pParent, OUString& rURL, bool *const o_pbLink) { - ::sfx2::FileDialogHelper aDlg( o_pbLink + ::sfx2::FileDialogHelper aDlg(o_pbLink ? ui::dialogs::TemplateDescription::FILEOPEN_LINK_PREVIEW - : ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE ); + : ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, + FileDialogFlags::NONE, pParent); static const char aWildcard[] = "*."; FilterNameVector aFilters; static const char aSeparator[] = ";"; |