diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2023-10-11 13:27:51 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2023-10-11 21:53:13 +0200 |
| commit | 6d1b241ab7b2edf3f3eef26f4cc514c22849caf5 (patch) | |
| tree | 3c8c3b278b5fe084434b0bee682575d4a41c0adb /vcl/source/outdev | |
| parent | 432e34fd1e0309038d0765f2497b7925c16a8ed2 (diff) | |
Drop o3tl::span, can use C++20 std::span directly now
Change-Id: Ic21ff7bf48f07f7277979d52e99d2c5c268de83f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157825
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'vcl/source/outdev')
| -rw-r--r-- | vcl/source/outdev/text.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx index 6e9aacbb4567..c2978d971659 100644 --- a/vcl/source/outdev/text.cxx +++ b/vcl/source/outdev/text.cxx @@ -922,7 +922,7 @@ float OutputDevice::approximate_digit_width() const void OutputDevice::DrawTextArray( const Point& rStartPt, const OUString& rStr, KernArraySpan pDXAry, - o3tl::span<const sal_Bool> pKashidaAry, + std::span<const sal_Bool> pKashidaAry, sal_Int32 nIndex, sal_Int32 nLen, SalLayoutFlags flags, const SalLayoutGlyphs* pSalLayoutCache ) { @@ -1293,7 +1293,7 @@ std::unique_ptr<SalLayout> OutputDevice::ImplLayout(const OUString& rOrigStr, sal_Int32 nMinIndex, sal_Int32 nLen, const Point& rLogicalPos, tools::Long nLogicalWidth, KernArraySpan pDXArray, - o3tl::span<const sal_Bool> pKashidaArray, + std::span<const sal_Bool> pKashidaArray, SalLayoutFlags flags, vcl::text::TextLayoutCache const* pLayoutCache, const SalLayoutGlyphs* pGlyphs) const @@ -2308,7 +2308,7 @@ bool OutputDevice::GetTextBoundRect( tools::Rectangle& rRect, const OUString& rStr, sal_Int32 nBase, sal_Int32 nIndex, sal_Int32 nLen, sal_uLong nLayoutWidth, KernArraySpan pDXAry, - o3tl::span<const sal_Bool> pKashidaAry, + std::span<const sal_Bool> pKashidaAry, const SalLayoutGlyphs* pGlyphs ) const { bool bRet = false; @@ -2359,7 +2359,7 @@ bool OutputDevice::GetTextOutlines( basegfx::B2DPolyPolygonVector& rVector, sal_Int32 nIndex, sal_Int32 nLen, sal_uLong nLayoutWidth, KernArraySpan pDXArray, - o3tl::span<const sal_Bool> pKashidaArray ) const + std::span<const sal_Bool> pKashidaArray ) const { if (!InitFont()) return false; @@ -2440,7 +2440,7 @@ bool OutputDevice::GetTextOutlines( PolyPolyVector& rResultVector, const OUString& rStr, sal_Int32 nBase, sal_Int32 nIndex, sal_Int32 nLen, sal_uLong nLayoutWidth, KernArraySpan pDXArray, - o3tl::span<const sal_Bool> pKashidaArray ) const + std::span<const sal_Bool> pKashidaArray ) const { rResultVector.clear(); |