include/vcl/abstdlg.hxx | 4 ++--
include/vcl/dialog.hxx | 5 ++---
sc/source/ui/view/tabvwsha.cxx | 2 +-
sd/source/ui/func/fuarea.cxx | 2 +-
sd/source/ui/func/fuline.cxx | 2 +-
sd/source/ui/func/futransf.cxx | 2 +-
sw/source/uibase/app/docst.cxx | 2 +-
sw/source/uibase/shells/textsh1.cxx | 4 ++--
sw/source/uibase/shells/txtnum.cxx | 2 +-
9 files changed, 12 insertions(+), 13 deletions(-)
New commits:
commit 92d7a58b8cafd80308b9a72bb7269e09f98d30db
Author: Noel Grandin <noel.gran...@collabora.co.uk>
Date: Mon Jan 22 10:44:20 2018 +0200
StartExecuteAsync doesn't need a second param
we can just use this to store a keep-alive reference in AsyncContext
Change-Id: I0152aef5386aa9753b48afdfc958790f10d13560
Reviewed-on: https://gerrit.libreoffice.org/48294
Reviewed-by: Michael Meeks <michael.me...@collabora.com>
Reviewed-by: Jan Holesovsky <ke...@collabora.com>
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-on: https://gerrit.libreoffice.org/48459
Tested-by: Jan Holesovsky <ke...@collabora.com>
diff --git a/include/vcl/abstdlg.hxx b/include/vcl/abstdlg.hxx
index 55260f51aef3..4ecf4df7087a 100644
--- a/include/vcl/abstdlg.hxx
+++ b/include/vcl/abstdlg.hxx
@@ -48,10 +48,10 @@ public:
bool isSet() { return !!maEndDialogFn; }
};
- bool StartExecuteAsync(const std::function<void(sal_Int32)> &rEndDialogFn,
VclPtr<VclReferenceBase> xOwner)
+ bool StartExecuteAsync(const std::function<void(sal_Int32)> &rEndDialogFn)
{
AsyncContext aCtx;
- aCtx.mxOwner = xOwner;
+ aCtx.mxOwner = this;
aCtx.maEndDialogFn = rEndDialogFn;
return StartExecuteAsync(aCtx);
}
diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx
index aa837f741c2c..7a69b6c48618 100644
--- a/include/vcl/dialog.hxx
+++ b/include/vcl/dialog.hxx
@@ -129,11 +129,10 @@ public:
// FIXME: Need to remove old StartExecuteModal in favour of this one.
/// Returns true of the dialog successfully starts
- bool StartExecuteAsync(const std::function<void(sal_Int32)> &rEndDialogFn,
- VclPtr<VclReferenceBase> xOwner =
VclPtr<VclReferenceBase>())
+ bool StartExecuteAsync(const std::function<void(sal_Int32)> &rEndDialogFn)
{
VclAbstractDialog::AsyncContext aCtx;
- aCtx.mxOwner = xOwner;
+ aCtx.mxOwner = this;
aCtx.maEndDialogFn = rEndDialogFn;
return StartExecuteAsync(aCtx);
}
diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx
index 97f2c252722f..fc305eda401b 100644
--- a/sc/source/ui/view/tabvwsha.cxx
+++ b/sc/source/ui/view/tabvwsha.cxx
@@ -565,7 +565,7 @@ void ScTabViewShell::ExecuteCellFormatDlg(SfxRequest& rReq,
const OString &rName
pRequest->Done(*pOutSet);
}
- }, pDlg);
+ });
}
bool ScTabViewShell::IsRefInputMode() const
diff --git a/sd/source/ui/func/fuarea.cxx b/sd/source/ui/func/fuarea.cxx
index b7764c4893d4..fa6c773b434c 100644
--- a/sd/source/ui/func/fuarea.cxx
+++ b/sd/source/ui/func/fuarea.cxx
@@ -90,7 +90,7 @@ void FuArea::DoExecute( SfxRequest& rReq )
mpViewShell->GetViewFrame()->GetBindings().Invalidate( SidArray );
}
- }, pDlg);
+ });
}
void FuArea::Activate()
diff --git a/sd/source/ui/func/fuline.cxx b/sd/source/ui/func/fuline.cxx
index 7e94d51dc806..7e804262cc98 100644
--- a/sd/source/ui/func/fuline.cxx
+++ b/sd/source/ui/func/fuline.cxx
@@ -107,7 +107,7 @@ void FuLine::DoExecute( SfxRequest& rReq )
mpViewShell->GetViewFrame()->GetBindings().Invalidate( SidArray );
}
mpViewShell->Cancel();
- }, pDlg);
+ });
}
void FuLine::Activate()
diff --git a/sd/source/ui/func/futransf.cxx b/sd/source/ui/func/futransf.cxx
index 1651ed5267bf..a9e05c9346df 100644
--- a/sd/source/ui/func/futransf.cxx
+++ b/sd/source/ui/func/futransf.cxx
@@ -153,7 +153,7 @@ void FuTransform::DoExecute( SfxRequest& rReq )
mpViewShell->Invalidate(SID_RULER_OBJECT);
mpViewShell->Cancel();
- }, pDlg);
+ });
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/app/docst.cxx b/sw/source/uibase/app/docst.cxx
index 41a21853194a..5b7f809a11a5 100644
--- a/sw/source/uibase/app/docst.cxx
+++ b/sw/source/uibase/app/docst.cxx
@@ -866,7 +866,7 @@ void SwDocShell::Edit(
if (pRequest)
pRequest->Done();
- }, pDlg);
+ });
}
else
{
diff --git a/sw/source/uibase/shells/textsh1.cxx
b/sw/source/uibase/shells/textsh1.cxx
index 08da7496a15c..51909fa43504 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -212,7 +212,7 @@ void sw_CharDialog(SwWrtShell &rWrtSh, bool bUseDialog,
sal_uInt16 nSlot, const
{
sw_CharDialogResult(pDlg->GetOutputItemSet(), rWrtSh,
pCoreSet, bSel, bSelectionPut, pRequest.get());
}
- }, pDlg);
+ });
}
else if (pArgs)
{
@@ -1139,7 +1139,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
sw_ParagraphDialogResult(pSet, rWrtSh, *pRequest,
pPaM);
}
- }, pDlg);
+ });
}
}
break;
diff --git a/sw/source/uibase/shells/txtnum.cxx
b/sw/source/uibase/shells/txtnum.cxx
index e9f87e30b950..394e9d361fb0 100644
--- a/sw/source/uibase/shells/txtnum.cxx
+++ b/sw/source/uibase/shells/txtnum.cxx
@@ -233,7 +233,7 @@ void SwTextShell::ExecEnterNum(SfxRequest &rReq)
}
else if (RET_USER == nResult)
GetShell().DelNumRules();
- }, pDlg);
+ });
}
break;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
