mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

set parent for insert media file dialog

Browse Source 
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>
This commit is contained in:
Caolán McNamara
2017-09-02 21:30:40 +01:00
parent b625d790bf
commit 1abd3b0e00
6 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
avmedia/source/framework/mediacontrol.cxx
View File

@@ -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 );

7
avmedia/source/viewer/mediawindow.cxx
View File

@@ -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[] = ";";

2
include/avmedia/mediawindow.hxx
View File

@@ -98,7 +98,7 @@ namespace avmedia
static void getMediaFilters( FilterNameVector& rFilterNameVector );
/// @param o_pbLink if not 0, this is an "insert" dialog: display link
/// checkbox and store its state in *o_pbLink
static bool executeMediaURLDialog( OUString& rURL, bool *const o_pbLink );
static bool executeMediaURLDialog(const vcl::Window* pParent, OUString& rURL, bool *const o_pbLink);
static void executeFormatErrorBox( vcl::Window* pParent );
static bool isMediaURL( const OUString& rURL, const OUString& rReferer, bool bDeep = false, Size* pPreferredSizePixel = nullptr );

5
sc/source/ui/drawfunc/fuins1.cxx
View File

@@ -290,7 +290,7 @@ FuInsertGraphic::~FuInsertGraphic()
}
FuInsertMedia::FuInsertMedia( ScTabViewShell* pViewSh,
vcl::Window* pWin,
vcl::Window* pWin,
ScDrawView* pViewP,
SdrModel* pDoc,
const SfxRequest& rReq ) :
@@ -312,8 +312,7 @@ FuInsertMedia::FuInsertMedia( ScTabViewShell* pViewSh,
}
bool bLink(true);
if (bAPI ||
::avmedia::MediaWindow::executeMediaURLDialog(aURL, & bLink))
if (bAPI || ::avmedia::MediaWindow::executeMediaURLDialog(pWin, aURL, &bLink))
{
Size aPrefSize;

3
sd/source/ui/func/fuinsert.cxx
View File

@@ -708,8 +708,7 @@ void FuInsertAVMedia::DoExecute( SfxRequest& rReq )
}
bool bLink(true);
if (bAPI ||
::avmedia::MediaWindow::executeMediaURLDialog(aURL, & bLink))
if (bAPI || ::avmedia::MediaWindow::executeMediaURLDialog(mpWindow, aURL, & bLink))
{
Size aPrefSize;

3
sw/source/uibase/shells/grfshex.cxx
View File

@@ -74,8 +74,7 @@ bool SwTextShell::InsertMediaDlg( SfxRequest const & rReq )
}
bool bLink(true);
if (bAPI ||
::avmedia::MediaWindow::executeMediaURLDialog(aURL, & bLink))
if (bAPI || ::avmedia::MediaWindow::executeMediaURLDialog(pWindow, aURL, & bLink))
{
Size aPrefSize;