summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2021-07-20 16:08:56 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2021-07-21 08:40:33 +0200
commit70b7bbc41299b65560f3339adc6a15fa9152f635 (patch)
tree054d20d5e902f78c7f936e2f52544ea4aeb0c6c3 /sfx2
parent8286014d9d3b96cd69e462a19d666488f66a89c9 (diff)
can pass SfxItemSet around by value in SfxShell
Change-Id: I80ee25c56da437d778e11f2dab3d07845ebd9597 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119274 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/control/shell.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx
index a3bcc266f5e4..ab3f7e86933c 100644
--- a/sfx2/source/control/shell.cxx
+++ b/sfx2/source/control/shell.cxx
@@ -698,9 +698,9 @@ SfxDisableFlags SfxShell::GetDisableFlags() const
return pImpl->nDisableFlags;
}
-std::unique_ptr<SfxItemSet> SfxShell::CreateItemSet( sal_uInt16 )
+std::optional<SfxItemSet> SfxShell::CreateItemSet( sal_uInt16 )
{
- return nullptr;
+ return {};
}
void SfxShell::ApplyItemSet( sal_uInt16, const SfxItemSet& )