diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2015-10-05 23:27:44 +0200 |
|---|---|---|
| committer | Julien Nabet <serval2412@yahoo.fr> | 2015-10-07 05:05:47 +0000 |
| commit | 8273350ff48f198efc9dc9c5de5519b8cbdc0cb3 (patch) | |
| tree | d1587fc960b3b0a7bf30403f240d64b66de2a53d /sw/source/ui/frmdlg | |
| parent | f830600ece806ec365a4839e79afabe183c5e36d (diff) | |
Prefer getSelectedFiles to getFiles (sfx2+sw)
+ tweak files of other modules which needed it
Change-Id: Ibb673eba6609734addd233ac1477698c01b94678
Reviewed-on: https://gerrit.libreoffice.org/19180
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Diffstat (limited to 'sw/source/ui/frmdlg')
| -rw-r--r-- | sw/source/ui/frmdlg/frmpage.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index bc0ae4dc741b..9e3097c17db1 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -64,7 +64,7 @@ #include <frmui.hrc> #include <sfx2/filedlghelper.hxx> #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> -#include <com/sun/star/ui/dialogs/XFilePicker.hpp> +#include <com/sun/star/ui/dialogs/XFilePicker2.hpp> #include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp> #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp> #include <vcl/graphicfilter.hxx> @@ -2584,7 +2584,7 @@ IMPL_LINK_NOARG_TYPED(SwGrfExtPage, BrowseHdl, Button*, void) pGrfDlg->SetTitle(get<VclFrame>("linkframe")->get_label()); } pGrfDlg->SetDisplayDirectory( m_pConnectED->GetText() ); - uno::Reference < ui::dialogs::XFilePicker > xFP = pGrfDlg->GetFilePicker(); + uno::Reference < ui::dialogs::XFilePicker2 > xFP = pGrfDlg->GetFilePicker(); uno::Reference < ui::dialogs::XFilePickerControlAccess > xCtrlAcc(xFP, uno::UNO_QUERY); xCtrlAcc->setValue( ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_LINK, 0, uno::makeAny(true) ); @@ -2849,7 +2849,7 @@ VclPtr<SfxTabPage> SwFrmURLPage::Create(vcl::Window *pParent, const SfxItemSet * IMPL_LINK_NOARG_TYPED(SwFrmURLPage, InsertFileHdl, Button*, void) { FileDialogHelper aDlgHelper( ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, 0 ); - uno::Reference < ui::dialogs::XFilePicker > xFP = aDlgHelper.GetFilePicker(); + uno::Reference < ui::dialogs::XFilePicker2 > xFP = aDlgHelper.GetFilePicker(); try { @@ -2863,7 +2863,7 @@ IMPL_LINK_NOARG_TYPED(SwFrmURLPage, InsertFileHdl, Button*, void) } if( aDlgHelper.Execute() == ERRCODE_NONE ) { - pURLED->SetText( xFP->getFiles().getConstArray()[0] ); + pURLED->SetText( xFP->getSelectedFiles().getConstArray()[0] ); } } |