diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-06-27 16:47:49 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-06-27 21:47:11 +0200 |
| commit | d1069a583dc1bcf4f1cf9b4bed12cb48bc757951 (patch) | |
| tree | bd4716714a9a67bc0e9d0c8808904c6162f3989a /fpicker | |
| parent | 22bacc8205e2a1ee5134dbbddbb75414ab5d12af (diff) | |
cid#1401342 Uncaught exception
Change-Id: Ia22ed8541f1148355d71cd5b90ad13e64c1b50c2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97289
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'fpicker')
| -rw-r--r-- | fpicker/source/office/OfficeFilePicker.cxx | 3 | ||||
| -rw-r--r-- | fpicker/source/office/OfficeFolderPicker.cxx | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/fpicker/source/office/OfficeFilePicker.cxx b/fpicker/source/office/OfficeFilePicker.cxx index d849326119f4..2c813d64c013 100644 --- a/fpicker/source/office/OfficeFilePicker.cxx +++ b/fpicker/source/office/OfficeFilePicker.cxx @@ -35,6 +35,7 @@ #include <com/sun/star/beans/NamedValue.hpp> #include <unotools/pathoptions.hxx> #include <cppuhelper/supportsservice.hxx> +#include <o3tl/make_shared.hxx> #include <vcl/svapp.hxx> using namespace ::com::sun::star::container; @@ -435,7 +436,7 @@ std::shared_ptr<SvtFileDialog_Base> SvtFilePicker::implCreateDialog( weld::Windo { PickerFlags nBits = getPickerFlags(); - auto dialog = std::make_shared<SvtFileDialog>(pParent, nBits); + auto dialog = o3tl::make_shared<SvtFileDialog>(pParent, nBits); // Set StandardDir if present if ( !m_aStandardDir.isEmpty()) diff --git a/fpicker/source/office/OfficeFolderPicker.cxx b/fpicker/source/office/OfficeFolderPicker.cxx index 424bf708cdb0..8413020df96f 100644 --- a/fpicker/source/office/OfficeFolderPicker.cxx +++ b/fpicker/source/office/OfficeFolderPicker.cxx @@ -24,6 +24,7 @@ #include <vector> #include <tools/urlobj.hxx> #include <cppuhelper/supportsservice.hxx> +#include <o3tl/make_shared.hxx> #include <unotools/pathoptions.hxx> using namespace ::com::sun::star::container; @@ -70,7 +71,7 @@ void SAL_CALL SvtFolderPicker::startExecuteModal( const Reference< css::ui::dial std::shared_ptr<SvtFileDialog_Base> SvtFolderPicker::implCreateDialog( weld::Window* pParent ) { - return std::make_shared<SvtFileDialog>(pParent, PickerFlags::PathDialog); + return o3tl::make_shared<SvtFileDialog>(pParent, PickerFlags::PathDialog); } sal_Int16 SvtFolderPicker::implExecutePicker( ) |