include/sfx2/filedlghelper.hxx | 3 ++-
sfx2/source/appl/appopen.cxx | 4 ++--
sfx2/source/dialog/filedlghelper.cxx | 7 ++++---
3 files changed, 8 insertions(+), 6 deletions(-)
New commits:
commit 1d9b0dfb5c5519c9c54c10ea535aeea83db723f5
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri Sep 1 21:31:22 2017 +0100
set parent for open file dialog
Change-Id: Ic823085567afde211b3991ebb60199dd336f562d
Reviewed-on: https://gerrit.libreoffice.org/41819
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/include/sfx2/filedlghelper.hxx b/include/sfx2/filedlghelper.hxx
index 9c4534cf036b..acdf03f0b4b3 100644
--- a/include/sfx2/filedlghelper.hxx
+++ b/include/sfx2/filedlghelper.hxx
@@ -242,7 +242,8 @@ public:
#define SFX2_IMPL_DIALOG_OOO 2
#define SFX2_IMPL_DIALOG_REMOTE 3
-ErrCode FileOpenDialog_Impl( sal_Int16 nDialogType,
+ErrCode FileOpenDialog_Impl( const vcl::Window* pParent,
+ sal_Int16 nDialogType,
FileDialogFlags nFlags,
const OUString& rFact,
std::vector<OUString>& rpURLList,
diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
index 17564eed84ab..aed27292c7c3 100644
--- a/sfx2/source/appl/appopen.cxx
+++ b/sfx2/source/appl/appopen.cxx
@@ -639,10 +639,10 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
pBlackListItem->GetStringList( aBlackList );
- ErrCode nErr = sfx2::FileOpenDialog_Impl(
+ ErrCode nErr = sfx2::FileOpenDialog_Impl(GetTopWindow(),
nDialogType,
eDialogFlags, OUString(), aURLList,
- aFilter, pSet, &aPath, nDialog, sStandardDir, aBlackList );
+ aFilter, pSet, &aPath, nDialog, sStandardDir, aBlackList);
if ( nErr == ERRCODE_ABORT )
{
diff --git a/sfx2/source/dialog/filedlghelper.cxx
b/sfx2/source/dialog/filedlghelper.cxx
index 18ebb6e1495b..a4e05ce41483 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -2602,7 +2602,8 @@ void SAL_CALL FileDialogHelper::DialogClosed( const
DialogClosedEvent& _rEvent )
m_aDialogClosedLink.Call( this );
}
-ErrCode FileOpenDialog_Impl( sal_Int16 nDialogType,
+ErrCode FileOpenDialog_Impl( const vcl::Window* pParent,
+ sal_Int16 nDialogType,
FileDialogFlags nFlags,
const OUString& rFact,
std::vector<OUString>& rpURLList,
@@ -2619,9 +2620,9 @@ ErrCode FileOpenDialog_Impl( sal_Int16 nDialogType,
// read-only to discourage editing (which would invalidate existing
// signatures).
if (nFlags & FileDialogFlags::SignPDF)
- pDialog.reset(new FileDialogHelper(nDialogType, nFlags,
SfxResId(STR_SFX_FILTERNAME_PDF), "pdf", rStandardDir, rBlackList));
+ pDialog.reset(new FileDialogHelper(nDialogType, nFlags,
SfxResId(STR_SFX_FILTERNAME_PDF), "pdf", rStandardDir, rBlackList, pParent));
else
- pDialog.reset(new FileDialogHelper(nDialogType, nFlags, rFact,
nDialog, SfxFilterFlags::NONE, SfxFilterFlags::NONE, rStandardDir, rBlackList));
+ pDialog.reset(new FileDialogHelper(nDialogType, nFlags, rFact,
nDialog, SfxFilterFlags::NONE, SfxFilterFlags::NONE, rStandardDir, rBlackList,
pParent));
OUString aPath;
if ( pPath )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
