summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2021-06-21 12:30:34 +0100
committerCaolán McNamara <caolanm@redhat.com>2021-06-21 15:29:59 +0200
commita8f97e5fca148804056295db2e3910aaa5c68ce8 (patch)
tree594c079c6552ccf49e833158f07be2892e2d8622 /sw
parentefacb4bc357761f5d849a4905eff981aa14eb366 (diff)
bundle the FolderPicker instantiations behind a single call
in prep to add parent support Change-Id: I2aa4b9343f895ae866f600dd3260b7fdc4e1efec Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117579 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw')
-rw-r--r--sw/source/ui/envelp/mailmrge.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx
index acd73a741757..27621d74e0ef 100644
--- a/sw/source/ui/envelp/mailmrge.cxx
+++ b/sw/source/ui/envelp/mailmrge.cxx
@@ -34,6 +34,7 @@
#include <mailmergehelper.hxx>
#include <mailmrge.hxx>
#include <sfx2/docfile.hxx>
+#include <sfx2/filedlghelper.hxx>
#include <comphelper/documentconstants.hxx>
#include <comphelper/sequenceashashmap.hxx>
#include <com/sun/star/container/XContainerQuery.hpp>
@@ -570,7 +571,7 @@ OUString SwMailMergeDlg::GetTargetURL() const
IMPL_LINK_NOARG(SwMailMergeDlg, InsertPathHdl, weld::Button&, void)
{
uno::Reference< XComponentContext > xContext( ::comphelper::getProcessComponentContext() );
- uno::Reference < XFolderPicker2 > xFP = FolderPicker::create(xContext);
+ uno::Reference < XFolderPicker2 > xFP = sfx2::createFolderPicker(xContext, m_xDialog.get());
xFP->setDisplayDirectory( GetURLfromPath() );
if( xFP->execute() == RET_OK ) {
INetURLObject aURL(xFP->getDirectory());