summaryrefslogtreecommitdiff
path: root/include/sfx2/bindings.hxx
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2021-07-01 10:11:40 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2021-07-01 14:24:44 +0200
commitc94d45cd08e2d5db5c007b9a77352f7621f84a09 (patch)
treef4907baaf10c2ae76fd410ca8ed9a776c205856c /include/sfx2/bindings.hxx
parent99a459dfdfd9f82ed3506708e131dd52a1a62384 (diff)
can pass this SfxItemSet around on the stack
Change-Id: Ie2e67ec19cfacdfdd0a6dd85c464cfa326b6500d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118209 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/sfx2/bindings.hxx')
-rw-r--r--include/sfx2/bindings.hxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/sfx2/bindings.hxx b/include/sfx2/bindings.hxx
index f4f44bd1af7a..47b904d6d113 100644
--- a/include/sfx2/bindings.hxx
+++ b/include/sfx2/bindings.hxx
@@ -23,6 +23,7 @@
#include <cstddef>
#include <memory>
+#include <optional>
#include <o3tl/typed_flags_set.hxx>
#include <sfx2/dllapi.h>
@@ -101,7 +102,7 @@ private:
SfxCallMode nCall, const SfxPoolItem **pInternalArgs, bool bGlobalOnly=false);
SAL_DLLPRIVATE void SetSubBindings_Impl( SfxBindings* );
SAL_DLLPRIVATE void UpdateSlotServer_Impl(); // Update SlotServer
- SAL_DLLPRIVATE std::unique_ptr<SfxItemSet> CreateSet_Impl(SfxStateCache& rCache, const SfxSlot* &pRealSlot,
+ SAL_DLLPRIVATE std::optional<SfxItemSet> CreateSet_Impl(SfxStateCache& rCache, const SfxSlot* &pRealSlot,
const SfxSlotServer**, SfxFoundCacheArr_Impl&);
SAL_DLLPRIVATE std::size_t GetSlotPos( sal_uInt16 nId, std::size_t nStartSearchAt = 0 );
SAL_DLLPRIVATE void Update_Impl(SfxStateCache& rCache);