diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-04-04 14:33:16 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-04-06 16:48:12 +0200 |
| commit | 8ed2fb306ffa8c7fef336b858fc5074c309c3c9f (patch) | |
| tree | 8699322ccfd3bfef66af56437bb9dabfa249a719 /sd/source/ui/dlg | |
| parent | 79ae6cc6b3b19252473f6987106ea7d8aa17a5ea (diff) | |
weld linkeditdialog
which enables changing FileDialogHelper over to welded
Change-Id: I988342a6574cb7ed09b2724929e8c7117474a56c
Reviewed-on: https://gerrit.libreoffice.org/52388
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sd/source/ui/dlg')
| -rw-r--r-- | sd/source/ui/dlg/PhotoAlbumDialog.cxx | 3 | ||||
| -rw-r--r-- | sd/source/ui/dlg/filedlg.cxx | 14 | ||||
| -rw-r--r-- | sd/source/ui/dlg/tpaction.cxx | 4 |
3 files changed, 10 insertions, 11 deletions
diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx b/sd/source/ui/dlg/PhotoAlbumDialog.cxx index 739548ce570d..513dc00781c5 100644 --- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx +++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx @@ -547,8 +547,7 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, FileHdl, Button*, void) { ::sfx2::FileDialogHelper aDlg( css::ui::dialogs::TemplateDescription::FILEOPEN_PREVIEW, - FileDialogFlags::Graphic | FileDialogFlags::MultiSelection, this - ); + FileDialogFlags::Graphic | FileDialogFlags::MultiSelection, GetFrameWeld()); // Read configuration OUString sUrl(officecfg::Office::Impress::Pictures::Path::get()); diff --git a/sd/source/ui/dlg/filedlg.cxx b/sd/source/ui/dlg/filedlg.cxx index 2b41dbb4886a..25f07dca28e3 100644 --- a/sd/source/ui/dlg/filedlg.cxx +++ b/sd/source/ui/dlg/filedlg.cxx @@ -57,7 +57,7 @@ private: DECL_LINK( IsMusicStoppedHdl, Timer *, void ); public: - explicit SdFileDialog_Imp(const vcl::Window *pParent); + explicit SdFileDialog_Imp(weld::Window *pParent); virtual ~SdFileDialog_Imp() override; // overwritten from FileDialogHelper, to receive user feedback @@ -172,10 +172,10 @@ IMPL_LINK_NOARG(SdFileDialog_Imp, IsMusicStoppedHdl, Timer *, void) } } -SdFileDialog_Imp::SdFileDialog_Imp(const vcl::Window* pParent) : - FileDialogHelper(css::ui::dialogs::TemplateDescription::FILEOPEN_LINK_PLAY, FileDialogFlags::NONE, pParent), - mnPlaySoundEvent( nullptr ), - mbLabelPlaying(false) +SdFileDialog_Imp::SdFileDialog_Imp(weld::Window* pParent) + : FileDialogHelper(css::ui::dialogs::TemplateDescription::FILEOPEN_LINK_PLAY, FileDialogFlags::NONE, pParent) + , mnPlaySoundEvent(nullptr) + , mbLabelPlaying(false) { maUpdateIdle.SetInvokeHandler(LINK(this, SdFileDialog_Imp, IsMusicStoppedHdl)); maUpdateIdle.SetDebugName( "SdFileDialog_Imp maUpdateIdle" ); @@ -210,8 +210,8 @@ SdFileDialog_Imp::~SdFileDialog_Imp() // ----------- SdOpenSoundFileDialog ----------------------- // these are simple forwarders -SdOpenSoundFileDialog::SdOpenSoundFileDialog(const vcl::Window *pParent) : - mpImpl( new SdFileDialog_Imp(pParent) ) +SdOpenSoundFileDialog::SdOpenSoundFileDialog(weld::Window *pParent) + : mpImpl(new SdFileDialog_Imp(pParent)) { OUString aDescr; aDescr = SdResId(STR_ALL_FILES); diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx index d0d31a001f26..643a7c6fa460 100644 --- a/sd/source/ui/dlg/tpaction.cxx +++ b/sd/source/ui/dlg/tpaction.cxx @@ -409,7 +409,7 @@ void SdTPAction::OpenFileDialog() if (bSound) { - SdOpenSoundFileDialog aFileDialog(this); + SdOpenSoundFileDialog aFileDialog(GetFrameWeld()); if( aFile.isEmpty() ) aFile = SvtPathOptions().GetWorkPath(); @@ -436,7 +436,7 @@ void SdTPAction::OpenFileDialog() { sfx2::FileDialogHelper aFileDialog( ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION, - FileDialogFlags::NONE, this); + FileDialogFlags::NONE, GetFrameWeld()); if (bDocument && aFile.isEmpty()) aFile = SvtPathOptions().GetWorkPath(); |