diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2021-10-31 11:23:11 +0100 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2021-10-31 15:52:02 +0100 |
| commit | b5e701d36ec16776e01597fd250dbde2e73fad3a (patch) | |
| tree | c5f5fee0355dc6eca66dd4dcaca40a78e63dc6cf /cppcanvas | |
| parent | d4b63c4562ec4c612df675502fd35c7c88bc432d (diff) | |
add o3tl::span ctor from std::vector
Makes code simpler, and std::span can be constructed from std::vector
too.
Change-Id: Iae26b53c52148c19d9068a63126a7393d098d654
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124507
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
Tested-by: Jenkins
Diffstat (limited to 'cppcanvas')
| -rw-r--r-- | cppcanvas/source/mtfrenderer/implrenderer.cxx | 6 | ||||
| -rw-r--r-- | cppcanvas/source/mtfrenderer/textaction.cxx | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx index 730fc11b1845..3fb31a79ee73 100644 --- a/cppcanvas/source/mtfrenderer/implrenderer.cxx +++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx @@ -1008,7 +1008,7 @@ namespace cppcanvas::internal aStrikeoutText.makeStringAndClear(), 0/*nStartPos*/, nLen, - { aStrikeoutCharWidths.data(), aStrikeoutCharWidths.size() }, + aStrikeoutCharWidths, rParms.mrVDev, rParms.mrCanvas, rState, @@ -2474,7 +2474,7 @@ namespace cppcanvas::internal sText, pAct->GetIndex(), nLen, - { pAct->GetDXArray().data(), pAct->GetDXArray().size() }, + pAct->GetDXArray(), rFactoryParms, bSubsettableActions ); } @@ -2582,7 +2582,7 @@ namespace cppcanvas::internal sText, pAct->GetIndex(), nLen, - { aDXArray.data(), aDXArray.size() }, + aDXArray, rFactoryParms, bSubsettableActions ); } diff --git a/cppcanvas/source/mtfrenderer/textaction.cxx b/cppcanvas/source/mtfrenderer/textaction.cxx index c63c92a5b851..091dde1c456c 100644 --- a/cppcanvas/source/mtfrenderer/textaction.cxx +++ b/cppcanvas/source/mtfrenderer/textaction.cxx @@ -191,7 +191,7 @@ namespace cppcanvas::internal rVDev.GetTextArray( rText, &aCharWidths, nStartPos, nLen ); - return setupDXArray( { aCharWidths.data(), aCharWidths.size() }, nLen, rState ); + return setupDXArray( aCharWidths, nLen, rState ); } ::basegfx::B2DPoint adaptStartPoint( const ::basegfx::B2DPoint& rStartPoint, |