[Libreoffice-commits] core.git: avmedia/source include/sfx2 sd/source sfx2/source svx/source sw/source
Caolán McNamara
caolanm at redhat.com
Fri Sep 1 14:59:02 UTC 2017
avmedia/source/viewer/mediawindow.cxx | 2 +-
include/sfx2/filedlghelper.hxx | 6 +++---
sd/source/ui/dlg/filedlg.cxx | 6 +++---
sfx2/source/appl/opengrf.cxx | 2 +-
sfx2/source/appl/shutdownicon.cxx | 4 ++--
sfx2/source/dialog/filedlghelper.cxx | 12 ++++++------
sfx2/source/dialog/filedlgimpl.hxx | 2 +-
sfx2/source/doc/docinsert.cxx | 2 +-
sfx2/source/doc/guisaveas.cxx | 2 +-
svx/source/core/graphichelper.cxx | 6 +++---
sw/source/ui/chrdlg/chardlg.cxx | 4 ++--
sw/source/ui/dbui/createaddresslistdialog.cxx | 4 ++--
sw/source/ui/dbui/mmdocselectpage.cxx | 4 ++--
sw/source/ui/frmdlg/frmpage.cxx | 6 +++---
sw/source/ui/index/cnttab.cxx | 4 ++--
sw/source/ui/misc/glossary.cxx | 4 ++--
sw/source/uibase/app/docsh2.cxx | 6 +++---
sw/source/uibase/dbui/dbmgr.cxx | 4 ++--
sw/source/uibase/dbui/mailmergehelper.cxx | 4 ++--
sw/source/uibase/uiview/srcview.cxx | 4 ++--
sw/source/uibase/uiview/view2.cxx | 2 +-
21 files changed, 45 insertions(+), 45 deletions(-)
New commits:
commit ef8341f05ec79fcdac3b05b45659f5c98ff05edf
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Sep 1 10:50:27 2017 +0100
bump FileDialogHelper to XFilePicker3
Change-Id: I726676aaa8944bc3b6418abe305ad03f8ec96c59
Reviewed-on: https://gerrit.libreoffice.org/41783
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx
index 62fd5ee9349e..93774aab821f 100644
--- a/avmedia/source/viewer/mediawindow.cxx
+++ b/avmedia/source/viewer/mediawindow.cxx
@@ -257,7 +257,7 @@ bool MediaWindow::executeMediaURLDialog(OUString& rURL, bool *const o_pbLink)
// add filter for all types
aDlg.AddFilter( AvmResId( AVMEDIA_STR_ALL_FILES ), "*.*" );
- uno::Reference<ui::dialogs::XFilePicker2> const xFP(aDlg.GetFilePicker());
+ uno::Reference<ui::dialogs::XFilePicker3> const xFP(aDlg.GetFilePicker());
uno::Reference<ui::dialogs::XFilePickerControlAccess> const xCtrlAcc(xFP,
uno::UNO_QUERY_THROW);
if (o_pbLink)
diff --git a/include/sfx2/filedlghelper.hxx b/include/sfx2/filedlghelper.hxx
index 44e673a3778f..052285cbd614 100644
--- a/include/sfx2/filedlghelper.hxx
+++ b/include/sfx2/filedlghelper.hxx
@@ -46,7 +46,7 @@ namespace com
{
namespace dialogs
{
- class XFilePicker2;
+ class XFilePicker3;
class XFilePickerListener;
struct FilePickerEvent;
struct DialogClosedEvent;
@@ -189,7 +189,7 @@ public:
with the following differences:
<ul><li>The FileDialogHelper remembers the given file name, and upon execution,
strips its extension if the dialog is set up for "automatic file name extension".</li>
- <li>Exceptions thrown from the <code>XFilePicker2</code> are caught and silenced.</li>
+ <li>Exceptions thrown from the <code>XFilePicker3</code> are caught and silenced.</li>
</ul>
*/
void SetFileName( const OUString& _rFileName );
@@ -198,7 +198,7 @@ public:
OUString GetDisplayDirectory() const;
ErrCode GetGraphic( Graphic& rGraphic ) const;
- const css::uno::Reference < css::ui::dialogs::XFilePicker2 >& GetFilePicker() const;
+ const css::uno::Reference < css::ui::dialogs::XFilePicker3 >& GetFilePicker() const;
// XFilePickerListener methods
void SAL_CALL FileSelectionChanged();
diff --git a/sd/source/ui/dlg/filedlg.cxx b/sd/source/ui/dlg/filedlg.cxx
index 0286accd5ec4..852dcad4fecc 100644
--- a/sd/source/ui/dlg/filedlg.cxx
+++ b/sd/source/ui/dlg/filedlg.cxx
@@ -28,7 +28,7 @@
#include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp>
#include <com/sun/star/ui/dialogs/XFilePickerListener.hpp>
#include <com/sun/star/ui/dialogs/XFilePickerNotifier.hpp>
-#include <com/sun/star/ui/dialogs/XFilePicker2.hpp>
+#include <com/sun/star/ui/dialogs/XFilePicker3.hpp>
#include <vcl/msgbox.hxx>
#include <vcl/idle.hxx>
#include <sal/types.h>
@@ -182,7 +182,7 @@ SdFileDialog_Imp::SdFileDialog_Imp() :
maUpdateIdle.SetInvokeHandler(LINK(this, SdFileDialog_Imp, IsMusicStoppedHdl));
maUpdateIdle.SetDebugName( "SdFileDialog_Imp maUpdateIdle" );
- css::uno::Reference < css::ui::dialogs::XFilePicker2 > xFileDlg = GetFilePicker();
+ css::uno::Reference < css::ui::dialogs::XFilePicker3 > xFileDlg = GetFilePicker();
// get the control access
mxControlAccess.set( xFileDlg, css::uno::UNO_QUERY );
@@ -262,7 +262,7 @@ void SdOpenSoundFileDialog::SetPath( const OUString& rPath )
bool SdOpenSoundFileDialog::IsInsertAsLinkSelected()
{
bool bInsertAsLinkSelected = false;
- css::uno::Reference<css::ui::dialogs::XFilePicker2> const xFilePicker(mpImpl->GetFilePicker());
+ css::uno::Reference<css::ui::dialogs::XFilePicker3> const xFilePicker(mpImpl->GetFilePicker());
css::uno::Reference<css::ui::dialogs::XFilePickerControlAccess> const xControlAccess(xFilePicker, css::uno::UNO_QUERY_THROW);
xControlAccess->getValue(css::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_LINK, 0) >>= bInsertAsLinkSelected;
return bInsertAsLinkSelected;
diff --git a/sfx2/source/appl/opengrf.cxx b/sfx2/source/appl/opengrf.cxx
index cb6681beeddd..56ff31c2a357 100644
--- a/sfx2/source/appl/opengrf.cxx
+++ b/sfx2/source/appl/opengrf.cxx
@@ -83,7 +83,7 @@ SvxOpenGrf_Impl::SvxOpenGrf_Impl()
: aFileDlg(ui::dialogs::TemplateDescription::FILEOPEN_LINK_PREVIEW,
FileDialogFlags::Graphic)
{
- uno::Reference < XFilePicker2 > xFP = aFileDlg.GetFilePicker();
+ uno::Reference < XFilePicker3 > xFP = aFileDlg.GetFilePicker();
xCtrlAcc.set(xFP, UNO_QUERY);
}
diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx
index 6d5204809ad3..4a0582d03d2e 100644
--- a/sfx2/source/appl/shutdownicon.cxx
+++ b/sfx2/source/appl/shutdownicon.cxx
@@ -39,7 +39,7 @@
#include <com/sun/star/util/URLTransformer.hpp>
#include <com/sun/star/util/XURLTransformer.hpp>
#include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp>
-#include <com/sun/star/ui/dialogs/XFilePicker2.hpp>
+#include <com/sun/star/ui/dialogs/XFilePicker3.hpp>
#include <com/sun/star/ui/dialogs/XFilterManager.hpp>
#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
#include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
@@ -340,7 +340,7 @@ IMPL_LINK( ShutdownIcon, DialogClosedHdl_Impl, FileDialogHelper*, /*unused*/, vo
// use constructor for filling up filters automatically!
if ( ERRCODE_NONE == m_pFileDlg->GetError() )
{
- css::uno::Reference< XFilePicker2 > xPicker = m_pFileDlg->GetFilePicker();
+ css::uno::Reference< XFilePicker3 > xPicker = m_pFileDlg->GetFilePicker();
try
{
diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx
index a4a6847deeea..07e90a772a3a 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -33,7 +33,7 @@
#include <com/sun/star/ui/dialogs/XFilePreview.hpp>
#include <com/sun/star/ui/dialogs/XFilterManager.hpp>
#include <com/sun/star/ui/dialogs/XFilterGroupManager.hpp>
-#include <com/sun/star/ui/dialogs/XFilePicker2.hpp>
+#include <com/sun/star/ui/dialogs/XFilePicker3.hpp>
#include <com/sun/star/ui/dialogs/XAsynchronousExecutableDialog.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
@@ -797,7 +797,7 @@ ErrCode FileDialogHelper_Impl::getGraphic( Graphic& rGraphic ) const
return nRet;
}
-static bool lcl_isSystemFilePicker( const uno::Reference< XFilePicker2 >& _rxFP )
+static bool lcl_isSystemFilePicker( const uno::Reference< XFilePicker3 >& _rxFP )
{
try
{
@@ -1334,7 +1334,7 @@ void FileDialogHelper_Impl::implGetAndCacheFiles(const uno::Reference< XInterfac
}
// a) the new way (optional!)
- uno::Reference< XFilePicker2 > xPickNew(xPicker, UNO_QUERY);
+ uno::Reference< XFilePicker3 > xPickNew(xPicker, UNO_QUERY);
if (xPickNew.is())
{
Sequence< OUString > lFiles = xPickNew->getSelectedFiles();
@@ -1346,7 +1346,7 @@ void FileDialogHelper_Impl::implGetAndCacheFiles(const uno::Reference< XInterfac
// b) the olde way ... non optional.
else
{
- uno::Reference< XFilePicker2 > xPickOld(xPicker, UNO_QUERY_THROW);
+ uno::Reference< XFilePicker3 > xPickOld(xPicker, UNO_QUERY_THROW);
Sequence< OUString > lFiles = xPickOld->getFiles();
::sal_Int32 nFiles = lFiles.getLength();
if ( nFiles == 1 )
@@ -2436,7 +2436,7 @@ Sequence< OUString > FileDialogHelper::GetSelectedFiles() const
{
// a) the new way (optional!)
uno::Sequence< OUString > aResultSeq;
- uno::Reference< XFilePicker2 > xPickNew(mpImpl->mxFileDlg, UNO_QUERY);
+ uno::Reference< XFilePicker3 > xPickNew(mpImpl->mxFileDlg, UNO_QUERY);
if (xPickNew.is())
{
aResultSeq = xPickNew->getSelectedFiles();
@@ -2565,7 +2565,7 @@ void FileDialogHelper::SetCurrentFilter( const OUString& rFilter )
mpImpl->setFilter( sFilter );
}
-const uno::Reference < XFilePicker2 >& FileDialogHelper::GetFilePicker() const
+const uno::Reference < XFilePicker3 >& FileDialogHelper::GetFilePicker() const
{
return mpImpl->mxFileDlg;
}
diff --git a/sfx2/source/dialog/filedlgimpl.hxx b/sfx2/source/dialog/filedlgimpl.hxx
index 595afd2fca39..8568974571f6 100644
--- a/sfx2/source/dialog/filedlgimpl.hxx
+++ b/sfx2/source/dialog/filedlgimpl.hxx
@@ -44,7 +44,7 @@ namespace sfx2
{
friend class FileDialogHelper;
- css::uno::Reference < css::ui::dialogs::XFilePicker2 > mxFileDlg;
+ css::uno::Reference < css::ui::dialogs::XFilePicker3 > mxFileDlg;
css::uno::Reference < css::container::XNameAccess > mxFilterCFG;
std::vector< css::beans::StringPair > maFilters;
diff --git a/sfx2/source/doc/docinsert.cxx b/sfx2/source/doc/docinsert.cxx
index 1a155967a5d9..e6b2504bfae3 100644
--- a/sfx2/source/doc/docinsert.cxx
+++ b/sfx2/source/doc/docinsert.cxx
@@ -195,7 +195,7 @@ IMPL_LINK_NOARG(DocumentInserter, DialogClosedHdl, sfx2::FileDialogHelper*, void
if ( ERRCODE_NONE == m_nError )
impl_FillURLList( m_pFileDlg.get(), m_pURLList );
- Reference < XFilePicker2 > xFP = m_pFileDlg->GetFilePicker();
+ Reference < XFilePicker3 > xFP = m_pFileDlg->GetFilePicker();
Reference < XFilePickerControlAccess > xCtrlAccess( xFP, UNO_QUERY );
if ( xCtrlAccess.is() )
{
diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx
index d6eb070dea0f..885c801aef15 100644
--- a/sfx2/source/doc/guisaveas.cxx
+++ b/sfx2/source/doc/guisaveas.cxx
@@ -876,7 +876,7 @@ bool ModelData_Impl::OutputFileDialog( sal_Int8 nStoreMode,
pFileDlg->CreateMatcher( aDocServiceName );
- uno::Reference< ui::dialogs::XFilePicker2 > xFilePicker = pFileDlg->GetFilePicker();
+ uno::Reference< ui::dialogs::XFilePicker3 > xFilePicker = pFileDlg->GetFilePicker();
uno::Reference< ui::dialogs::XFilePickerControlAccess > xControlAccess =
uno::Reference< ui::dialogs::XFilePickerControlAccess >( xFilePicker, uno::UNO_QUERY );
diff --git a/svx/source/core/graphichelper.cxx b/svx/source/core/graphichelper.cxx
index 5aa82122c969..e5f09eda0622 100644
--- a/svx/source/core/graphichelper.cxx
+++ b/svx/source/core/graphichelper.cxx
@@ -42,7 +42,7 @@
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/io/XInputStream.hpp>
#include <com/sun/star/ucb/SimpleFileAccess.hpp>
-#include <com/sun/star/ui/dialogs/XFilePicker2.hpp>
+#include <com/sun/star/ui/dialogs/XFilePicker3.hpp>
#include <com/sun/star/ui/dialogs/XFilterManager.hpp>
#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
@@ -185,7 +185,7 @@ OUString GraphicHelper::ExportGraphic( const Graphic& rGraphic, const OUString&
OUString sGraphicsPath( aPathOpt.GetGraphicPath() );
FileDialogHelper aDialogHelper( TemplateDescription::FILESAVE_AUTOEXTENSION );
- Reference < XFilePicker2 > xFilePicker = aDialogHelper.GetFilePicker();
+ Reference < XFilePicker3 > xFilePicker = aDialogHelper.GetFilePicker();
INetURLObject aPath;
aPath.SetSmartURL( sGraphicsPath );
@@ -347,7 +347,7 @@ void GraphicHelper::SaveShapeAsGraphic( const Reference< drawing::XShape >& xSha
OUString sGraphicPath( aPathOpt.GetGraphicPath() );
FileDialogHelper aDialogHelper( TemplateDescription::FILESAVE_AUTOEXTENSION );
- Reference < XFilePicker2 > xFilePicker = aDialogHelper.GetFilePicker();
+ Reference < XFilePicker3 > xFilePicker = aDialogHelper.GetFilePicker();
aDialogHelper.SetTitle( SvxResId(RID_SVXSTR_SAVEAS_IMAGE) );
diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx
index bdf33691b0c3..43a93c135b34 100644
--- a/sw/source/ui/chrdlg/chardlg.cxx
+++ b/sw/source/ui/chrdlg/chardlg.cxx
@@ -45,7 +45,7 @@
#include <strings.hrc>
#include <chrdlgmodes.hxx>
#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
-#include <com/sun/star/ui/dialogs/XFilePicker2.hpp>
+#include <com/sun/star/ui/dialogs/XFilePicker3.hpp>
#include <SwStyleNameMapper.hxx>
#include <sfx2/filedlghelper.hxx>
#include <sfx2/viewfrm.hxx>
@@ -308,7 +308,7 @@ IMPL_LINK_NOARG(SwCharURLPage, InsertFileHdl, Button*, void)
FileDialogHelper aDlgHelper( TemplateDescription::FILEOPEN_SIMPLE );
if( aDlgHelper.Execute() == ERRCODE_NONE )
{
- Reference < XFilePicker2 > xFP = aDlgHelper.GetFilePicker();
+ Reference < XFilePicker3 > xFP = aDlgHelper.GetFilePicker();
m_pURLED->SetText(xFP->getSelectedFiles().getConstArray()[0]);
}
}
diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx b/sw/source/ui/dbui/createaddresslistdialog.cxx
index 1ef08e5b52bd..1303d8da3207 100644
--- a/sw/source/ui/dbui/createaddresslistdialog.cxx
+++ b/sw/source/ui/dbui/createaddresslistdialog.cxx
@@ -38,7 +38,7 @@
#include <sfx2/docfile.hxx>
#include <rtl/textenc.h>
#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
-#include <com/sun/star/ui/dialogs/XFilePicker2.hpp>
+#include <com/sun/star/ui/dialogs/XFilePicker3.hpp>
#include <com/sun/star/ui/dialogs/XFilterManager.hpp>
#include <tools/urlobj.hxx>
#include <dbui.hrc>
@@ -624,7 +624,7 @@ IMPL_LINK_NOARG(SwCreateAddressListDialog, OkHdl_Impl, Button*, void)
if(m_sURL.isEmpty())
{
sfx2::FileDialogHelper aDlgHelper( TemplateDescription::FILESAVE_SIMPLE );
- uno::Reference < XFilePicker2 > xFP = aDlgHelper.GetFilePicker();
+ uno::Reference < XFilePicker3 > xFP = aDlgHelper.GetFilePicker();
const OUString sPath( SvtPathOptions().SubstituteVariable("$(userurl)/database") );
aDlgHelper.SetDisplayDirectory( sPath );
diff --git a/sw/source/ui/dbui/mmdocselectpage.cxx b/sw/source/ui/dbui/mmdocselectpage.cxx
index e35b8e51b0b5..4a9184446dbb 100644
--- a/sw/source/ui/dbui/mmdocselectpage.cxx
+++ b/sw/source/ui/dbui/mmdocselectpage.cxx
@@ -35,7 +35,7 @@
#include <dbui.hrc>
#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
-#include <com/sun/star/ui/dialogs/XFilePicker2.hpp>
+#include <com/sun/star/ui/dialogs/XFilePicker3.hpp>
#include <com/sun/star/ui/dialogs/XFilterManager.hpp>
using namespace ::com::sun::star::ui::dialogs;
@@ -136,7 +136,7 @@ IMPL_LINK(SwMailMergeDocSelectPage, FileSelectHdl, Button*, pButton, void)
if(!bTemplate)
{
sfx2::FileDialogHelper aDlgHelper( TemplateDescription::FILEOPEN_SIMPLE );
- Reference < XFilePicker2 > xFP = aDlgHelper.GetFilePicker();
+ Reference < XFilePicker3 > xFP = aDlgHelper.GetFilePicker();
xFP->setDisplayDirectory( SvtPathOptions().GetWorkPath() );
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index 48617f50e596..443adad9e538 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -64,7 +64,7 @@
#include <strings.hrc>
#include <sfx2/filedlghelper.hxx>
#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
-#include <com/sun/star/ui/dialogs/XFilePicker2.hpp>
+#include <com/sun/star/ui/dialogs/XFilePicker3.hpp>
#include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp>
#include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
#include <vcl/graphicfilter.hxx>
@@ -2578,7 +2578,7 @@ IMPL_LINK_NOARG(SwGrfExtPage, BrowseHdl, Button*, void)
pGrfDlg->SetTitle(get<VclFrame>("linkframe")->get_label());
}
pGrfDlg->SetDisplayDirectory( m_pConnectED->GetText() );
- uno::Reference < ui::dialogs::XFilePicker2 > xFP = pGrfDlg->GetFilePicker();
+ uno::Reference < ui::dialogs::XFilePicker3 > xFP = pGrfDlg->GetFilePicker();
uno::Reference < ui::dialogs::XFilePickerControlAccess > xCtrlAcc(xFP, uno::UNO_QUERY);
xCtrlAcc->setValue( ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_LINK, 0, uno::makeAny(true) );
@@ -2841,7 +2841,7 @@ VclPtr<SfxTabPage> SwFrameURLPage::Create(vcl::Window *pParent, const SfxItemSet
IMPL_LINK_NOARG(SwFrameURLPage, InsertFileHdl, Button*, void)
{
FileDialogHelper aDlgHelper( ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE );
- uno::Reference < ui::dialogs::XFilePicker2 > xFP = aDlgHelper.GetFilePicker();
+ uno::Reference < ui::dialogs::XFilePicker3 > xFP = aDlgHelper.GetFilePicker();
try
{
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index eacc2b8e9510..f0d957f99f7d 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -37,7 +37,7 @@
#include <svx/svxdlg.hxx>
#include <svx/flagsdef.hxx>
#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
-#include <com/sun/star/ui/dialogs/XFilePicker2.hpp>
+#include <com/sun/star/ui/dialogs/XFilePicker3.hpp>
#include <com/sun/star/ui/dialogs/XFilterManager.hpp>
#include <svtools/indexentryres.hxx>
#include <editeng/unolingu.hxx>
@@ -99,7 +99,7 @@ static OUString lcl_CreateAutoMarkFileDlg( const OUString& rURL,
FileDialogHelper aDlgHelper( bOpen ?
TemplateDescription::FILEOPEN_SIMPLE : TemplateDescription::FILESAVE_AUTOEXTENSION );
- uno::Reference < XFilePicker2 > xFP = aDlgHelper.GetFilePicker();
+ uno::Reference < XFilePicker3 > xFP = aDlgHelper.GetFilePicker();
uno::Reference<XFilterManager> xFltMgr(xFP, UNO_QUERY);
xFltMgr->appendFilter( rFileString, "*.sdi" );
diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx
index 8f5eaf264086..3fc4a6c093c0 100644
--- a/sw/source/ui/misc/glossary.cxx
+++ b/sw/source/ui/misc/glossary.cxx
@@ -40,7 +40,7 @@
#include <comphelper/string.hxx>
#include <ucbhelper/content.hxx>
#include <com/sun/star/text/AutoTextContainer.hpp>
-#include <com/sun/star/ui/dialogs/XFilePicker2.hpp>
+#include <com/sun/star/ui/dialogs/XFilePicker3.hpp>
#include <com/sun/star/ui/dialogs/XFilterManager.hpp>
#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
#include <svl/urihelper.hxx>
@@ -556,7 +556,7 @@ IMPL_LINK( SwGlossaryDlg, MenuHdl, Menu *, pMn, bool )
{
// call the FileOpenDialog do find WinWord - Files with templates
FileDialogHelper aDlgHelper( TemplateDescription::FILEOPEN_SIMPLE );
- uno::Reference < XFilePicker2 > xFP = aDlgHelper.GetFilePicker();
+ uno::Reference < XFilePicker3 > xFP = aDlgHelper.GetFilePicker();
SvtPathOptions aPathOpt;
xFP->setDisplayDirectory(aPathOpt.GetWorkPath() );
diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx
index eec8f29ab834..88ddfca433c1 100644
--- a/sw/source/uibase/app/docsh2.cxx
+++ b/sw/source/uibase/app/docsh2.cxx
@@ -108,7 +108,7 @@
#include <app.hrc>
#include <strings.hrc>
#include <globals.hrc>
-#include <com/sun/star/ui/dialogs/XFilePicker2.hpp>
+#include <com/sun/star/ui/dialogs/XFilePicker3.hpp>
#include <com/sun/star/ui/dialogs/XFilterManager.hpp>
#include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp>
#include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
@@ -504,7 +504,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
if(RET_TEMPLATE_LOAD == nRet)
{
FileDialogHelper aDlgHelper( TemplateDescription::FILEOPEN_SIMPLE );
- uno::Reference < XFilePicker2 > xFP = aDlgHelper.GetFilePicker();
+ uno::Reference < XFilePicker3 > xFP = aDlgHelper.GetFilePicker();
xFP->setDisplayDirectory( aPathOpt.GetWorkPath() );
@@ -917,7 +917,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
};
aDlgHelper.SetControlHelpIds( nControlIds, aMasterHelpIds );
}
- uno::Reference < XFilePicker2 > xFP = aDlgHelper.GetFilePicker();
+ uno::Reference < XFilePicker3 > xFP = aDlgHelper.GetFilePicker();
std::shared_ptr<const SfxFilter> pFlt;
const char* pStrId;
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index 1d691bff3bed..a08a6a923cdc 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -36,7 +36,7 @@
#include <com/sun/star/frame/XStorable.hpp>
#include <com/sun/star/task/InteractionHandler.hpp>
#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
-#include <com/sun/star/ui/dialogs/XFilePicker2.hpp>
+#include <com/sun/star/ui/dialogs/XFilePicker3.hpp>
#include <com/sun/star/ui/dialogs/XFilterManager.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <vcl/errinf.hxx>
@@ -2558,7 +2558,7 @@ uno::Sequence<OUString> SwDBManager::GetExistingDatabaseNames()
OUString SwDBManager::LoadAndRegisterDataSource(SwDocShell* pDocShell)
{
sfx2::FileDialogHelper aDlgHelper( ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE );
- uno::Reference < ui::dialogs::XFilePicker2 > xFP = aDlgHelper.GetFilePicker();
+ uno::Reference < ui::dialogs::XFilePicker3 > xFP = aDlgHelper.GetFilePicker();
OUString sHomePath(SvtPathOptions().GetWorkPath());
aDlgHelper.SetDisplayDirectory( sHomePath );
diff --git a/sw/source/uibase/dbui/mailmergehelper.cxx b/sw/source/uibase/dbui/mailmergehelper.cxx
index a1579a8a3311..2e3d9b25ed0d 100644
--- a/sw/source/uibase/dbui/mailmergehelper.cxx
+++ b/sw/source/uibase/dbui/mailmergehelper.cxx
@@ -30,7 +30,7 @@
#include <com/sun/star/sdb/XColumn.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
-#include <com/sun/star/ui/dialogs/XFilePicker2.hpp>
+#include <com/sun/star/ui/dialogs/XFilePicker3.hpp>
#include <com/sun/star/mail/MailServiceProvider.hpp>
#include <com/sun/star/mail/XSmtpService.hpp>
#include <comphelper/processfactory.hxx>
@@ -65,7 +65,7 @@ OUString CallSaveAsDialog(OUString& rFilter)
}
rFilter = aDialog.GetRealFilter();
- uno::Reference < ui::dialogs::XFilePicker2 > xFP = aDialog.GetFilePicker();
+ uno::Reference < ui::dialogs::XFilePicker3 > xFP = aDialog.GetFilePicker();
return xFP->getSelectedFiles().getConstArray()[0];
}
diff --git a/sw/source/uibase/uiview/srcview.cxx b/sw/source/uibase/uiview/srcview.cxx
index aedeb257963a..3147acf9e962 100644
--- a/sw/source/uibase/uiview/srcview.cxx
+++ b/sw/source/uibase/uiview/srcview.cxx
@@ -74,7 +74,7 @@
#include <helpids.h>
#include <globals.hrc>
#include <strings.hrc>
-#include <com/sun/star/ui/dialogs/XFilePicker2.hpp>
+#include <com/sun/star/ui/dialogs/XFilePicker3.hpp>
#include <com/sun/star/ui/dialogs/XFilterManager.hpp>
#include <sfx2/filedlghelper.hxx>
#define SwSrcView
@@ -293,7 +293,7 @@ void SwSrcView::Execute(SfxRequest& rReq)
// filesave dialog with autoextension
FileDialogHelper aDlgHelper(
TemplateDescription::FILESAVE_AUTOEXTENSION );
- uno::Reference < XFilePicker2 > xFP = aDlgHelper.GetFilePicker();
+ uno::Reference < XFilePicker3 > xFP = aDlgHelper.GetFilePicker();
uno::Reference<XFilterManager> xFltMgr(xFP, UNO_QUERY);
// search for an html filter for export
diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx
index 1aa16d537050..27d6f29f4b0b 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -289,7 +289,7 @@ bool SwView::InsertGraphicDlg( SfxRequest& rReq )
FileDialogFlags::Graphic ));
pFileDlg->SetTitle(SwResId(STR_INSERT_GRAPHIC ));
pFileDlg->SetContext( FileDialogHelper::SW_INSERT_GRAPHIC );
- uno::Reference < XFilePicker2 > xFP = pFileDlg->GetFilePicker();
+ uno::Reference < XFilePicker3 > xFP = pFileDlg->GetFilePicker();
uno::Reference < XFilePickerControlAccess > xCtrlAcc(xFP, UNO_QUERY);
if(nHtmlMode & HTMLMODE_ON)
{
More information about the Libreoffice-commits
mailing list