diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-07-20 16:08:56 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-07-21 08:40:33 +0200 |
| commit | 70b7bbc41299b65560f3339adc6a15fa9152f635 (patch) | |
| tree | 054d20d5e902f78c7f936e2f52544ea4aeb0c6c3 /include | |
| parent | 8286014d9d3b96cd69e462a19d666488f66a89c9 (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 'include')
| -rw-r--r-- | include/sfx2/shell.hxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/sfx2/shell.hxx b/include/sfx2/shell.hxx index 3266c989a7d4..0a2d1f7682d5 100644 --- a/include/sfx2/shell.hxx +++ b/include/sfx2/shell.hxx @@ -28,6 +28,7 @@ #include <svl/SfxBroadcaster.hxx> #include <o3tl/typed_flags_set.hxx> #include <o3tl/strong_int.hxx> +#include <optional> namespace com::sun::star::embed { struct VerbDescriptor; } namespace com::sun::star::uno { template <class E> class Sequence; } @@ -437,7 +438,7 @@ public: void SetDisableFlags( SfxDisableFlags nFlags ); SfxDisableFlags GetDisableFlags() const; - virtual std::unique_ptr<SfxItemSet> CreateItemSet( sal_uInt16 nId ); + virtual std::optional<SfxItemSet> CreateItemSet( sal_uInt16 nId ); virtual void ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ); /** Set the name of the sidebar context that is broadcast on calls |