fpicker/source/win32/VistaFilePickerImpl.cxx | 10 ++++------ fpicker/source/win32/vistatypes.h | 2 -- 2 files changed, 4 insertions(+), 8 deletions(-)
New commits: commit ed98a5519ea19d9ef427a7529ab94345b4bf5cc7 Author: Mike Kaganski <[email protected]> AuthorDate: Sat Jan 24 17:25:55 2026 +0100 Commit: Mike Kaganski <[email protected]> CommitDate: Sat Jan 24 18:49:15 2026 +0100 Drop some more typedefs Makes the code more clear. Change-Id: I5336503ab929b7d24701b831e3ad687fd84583bc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198047 Tested-by: Jenkins Reviewed-by: Mike Kaganski <[email protected]> diff --git a/fpicker/source/win32/VistaFilePickerImpl.cxx b/fpicker/source/win32/VistaFilePickerImpl.cxx index 5725070717b8..b055c67bdeb2 100644 --- a/fpicker/source/win32/VistaFilePickerImpl.cxx +++ b/fpicker/source/win32/VistaFilePickerImpl.cxx @@ -132,16 +132,16 @@ private: namespace { -template <class ComPtrDialog, REFCLSID CLSID> class TDialogImpl : public TDialogImplBase +template <class IDlg, REFCLSID CLSID> class TDialogImpl : public TDialogImplBase { public: TDialogImpl() - : TDialogImplBase(ComPtrDialog(CLSID).get()) + : TDialogImplBase(sal::systools::COMReference<IDlg>(CLSID).get()) { } }; -class TOpenDialogImpl : public TDialogImpl<TFileOpenDialog, CLSID_FileOpenDialog> +class TOpenDialogImpl : public TDialogImpl<IFileOpenDialog, CLSID_FileOpenDialog> { public: sal::systools::COMReference<IShellItemArray> getResult(bool bInExecute) override @@ -159,8 +159,6 @@ public: } -using TSaveDialogImpl = TDialogImpl<TFileSaveDialog, CLSID_FileSaveDialog>; - static OUString lcl_getURLFromShellItem (IShellItem* pItem) { @@ -499,7 +497,7 @@ void VistaFilePickerImpl::impl_sta_CreateOpenDialog(Request& rRequest) void VistaFilePickerImpl::impl_sta_CreateSaveDialog(Request& rRequest) { - impl_sta_CreateDialog<TSaveDialogImpl>(); + impl_sta_CreateDialog<TDialogImpl<IFileSaveDialog, CLSID_FileSaveDialog>>(); impl_sta_InitDialog(rRequest, FOS_FILEMUSTEXIST | FOS_OVERWRITEPROMPT); } diff --git a/fpicker/source/win32/vistatypes.h b/fpicker/source/win32/vistatypes.h index bae3e17eb85c..6ea9ce06efbb 100644 --- a/fpicker/source/win32/vistatypes.h +++ b/fpicker/source/win32/vistatypes.h @@ -31,8 +31,6 @@ namespace vista{ typedef sal::systools::COMReference<IFileDialog> TFileDialog; -typedef sal::systools::COMReference<IFileOpenDialog> TFileOpenDialog; -typedef sal::systools::COMReference<IFileSaveDialog> TFileSaveDialog; typedef sal::systools::COMReference<IFileDialogCustomize> TFileDialogCustomize; } // namespace vista
