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 /sc | |
| 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 'sc')
| -rw-r--r-- | sc/source/ui/view/cellsh2.cxx | 3 | ||||
| -rw-r--r-- | sc/source/ui/view/tabvwshc.cxx | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx index 3083cf0fd18a..75f5b463a58c 100644 --- a/sc/source/ui/view/cellsh2.cxx +++ b/sc/source/ui/view/cellsh2.cxx @@ -66,6 +66,7 @@ #include <markdata.hxx> #include <documentlinkmgr.hxx> +#include <o3tl/make_shared.hxx> #include <memory> using namespace com::sun::star; @@ -793,7 +794,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) break; case SID_DATA_PROVIDER: { - std::shared_ptr<ScDocument> xDoc(new ScDocument, o3tl::default_delete<ScDocument>()); + auto xDoc = o3tl::make_shared<ScDocument>(); xDoc->InsertTab(0, "test"); ScDocument* pDoc = GetViewData()->GetDocument(); ScDataProviderDlg aDialog(pTabViewShell->GetDialogParent(), xDoc, pDoc); diff --git a/sc/source/ui/view/tabvwshc.cxx b/sc/source/ui/view/tabvwshc.cxx index 432bbb670675..19b99ec93aa8 100644 --- a/sc/source/ui/view/tabvwshc.cxx +++ b/sc/source/ui/view/tabvwshc.cxx @@ -71,6 +71,7 @@ #include <PivotLayoutDialog.hxx> #include <comphelper/lok.hxx> +#include <o3tl/make_shared.hxx> #include <LibreOfficeKit/LibreOfficeKitEnums.h> void ScTabViewShell::SetCurRefDlgId( sal_uInt16 nNew ) @@ -397,7 +398,7 @@ std::shared_ptr<SfxModelessDialogController> ScTabViewShell::CreateRefDialogCont if (!isLOKMobilePhone()) { // dialog checks, what is in the cell - xResult = std::make_shared<ScFormulaDlg>(pB, pCW, pParent, &GetViewData(),ScGlobal::GetStarCalcFunctionMgr()); + xResult = o3tl::make_shared<ScFormulaDlg>(pB, pCW, pParent, &GetViewData(),ScGlobal::GetStarCalcFunctionMgr()); } break; } |