diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2019-01-12 15:58:00 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2019-01-13 11:27:30 +0100 |
| commit | 73df1aea4f8a779241c053ab54f616f7b3a6dcb9 (patch) | |
| tree | 4692637c56cdf2b9e1c2a949503ccd26a0fb3ca5 /sd | |
| parent | c3e9d393ea10da48e8b9ab4742dbc5277b7c4882 (diff) | |
array_view was changed to span in upcoming C++20
...see <http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2018/p0122r7.pdf>
"span: bounds-safe views for sequences of objects". o3tl::span is still an
incomplete approximation of std::span; removed those o3tl::array_view members
that are not present in std::span (and were not used in the code).
Relies on C++17 __has_include to use standard <span> where available (e.g., in
LLVM 7 libc++).
Change-Id: I82a7e246b61b2456fa6183025d25eec4121ad3c9
Reviewed-on: https://gerrit.libreoffice.org/66215
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/inc/DrawDocShell.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sd/source/ui/inc/DrawDocShell.hxx b/sd/source/ui/inc/DrawDocShell.hxx index 84d6d277e40a..3d400c889974 100644 --- a/sd/source/ui/inc/DrawDocShell.hxx +++ b/sd/source/ui/inc/DrawDocShell.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_SD_SOURCE_UI_INC_DRAWDOCSHELL_HXX #define INCLUDED_SD_SOURCE_UI_INC_DRAWDOCSHELL_HXX -#include <o3tl/array_view.hxx> +#include <o3tl/span.hxx> #include <sfx2/docfac.hxx> #include <sfx2/objsh.hxx> @@ -146,7 +146,7 @@ public: */ bool CheckPageName(weld::Window* pWin, OUString& rName ); - void SetSlotFilter(bool bEnable = false, o3tl::array_view<sal_uInt16 const> pSIDs = o3tl::array_view<sal_uInt16 const>()) { mbFilterEnable = bEnable; mpFilterSIDs = pSIDs; } + void SetSlotFilter(bool bEnable = false, o3tl::span<sal_uInt16 const> pSIDs = o3tl::span<sal_uInt16 const>()) { mbFilterEnable = bEnable; mpFilterSIDs = pSIDs; } void ApplySlotFilter() const; SfxStyleFamily GetStyleFamily() const { return mnStyleFamily; } @@ -212,7 +212,7 @@ protected: rtl::Reference<FuPoor> mxDocShellFunction; DocumentType const meDocType; SfxStyleFamily mnStyleFamily; - o3tl::array_view<sal_uInt16 const> + o3tl::span<sal_uInt16 const> mpFilterSIDs; bool mbFilterEnable; bool const mbSdDataObj; |