diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2022-08-17 08:40:31 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2022-08-17 11:59:38 +0200 |
| commit | b34577840b679b428490ae24fd644645ca5c76f0 (patch) | |
| tree | 33526d766cbdef36f57f04bd11ca6591cd236025 /test | |
| parent | 1433a0e3ebfe43d9f1aeb07d37facb4a529163df (diff) | |
Return std::optional instead of using bool* argument
Change-Id: I47f03411a6677f22291bea4dc06920ab9052349a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138399
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
(cherry picked from commit 364e8272329ba893af4141ac054fdc71816bd44a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138291
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Diffstat (limited to 'test')
| -rw-r--r-- | test/source/lokcallback.cxx | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/test/source/lokcallback.cxx b/test/source/lokcallback.cxx index 323ba4af1f10..c938e1e699a8 100644 --- a/test/source/lokcallback.cxx +++ b/test/source/lokcallback.cxx @@ -151,10 +151,9 @@ void TestLokCallbackWrapper::flushLOKData() for (int type : updatedTypes) { - bool ignore = false; - OString payload = viewShell->getLOKPayload(type, m_viewId, &ignore); - if (!ignore) - libreOfficeKitViewCallback(type, payload.getStr()); + std::optional<OString> payload = viewShell->getLOKPayload(type, m_viewId); + if (payload) + libreOfficeKitViewCallback(type, payload->getStr()); } for (const PerViewIdData& data : updatedTypesPerViewId) { @@ -162,10 +161,9 @@ void TestLokCallbackWrapper::flushLOKData() return shell->GetViewShellId().get() == data.sourceViewId; }); assert(viewShell != nullptr); - bool ignore = false; - OString payload = viewShell->getLOKPayload(data.type, data.viewId, &ignore); - if (!ignore) - libreOfficeKitViewCallbackWithViewId(data.type, payload.getStr(), data.viewId); + std::optional<OString> payload = viewShell->getLOKPayload(data.type, data.viewId); + if (payload) + libreOfficeKitViewCallbackWithViewId(data.type, payload->getStr(), data.viewId); } } |