diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-10-28 09:27:29 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-10-29 12:38:51 +0200 |
| commit | 894b4911ffb96ff667fdeb3aec7922316ab7230a (patch) | |
| tree | 3942ed8088c058b70bb79984b186c5156284abf4 /sfx2 | |
| parent | 5b0ae3b59cd2cccfb72d991657366eb2a69bff49 (diff) | |
pass DX array around using o3tl::span instead of pointer
so we get bounds checking in debug mode
Note that I cannot just pass around the std::vectors
involved because there is a place in editeng which
calls with a subset of a vector.
Change-Id: I5088a139593c27bf9cbe5d843ab4b0048ac6d508
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124330
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/doc/SfxRedactionHelper.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sfx2/source/doc/SfxRedactionHelper.cxx b/sfx2/source/doc/SfxRedactionHelper.cxx index 28cf18d94ebf..5bb43fcc422a 100644 --- a/sfx2/source/doc/SfxRedactionHelper.cxx +++ b/sfx2/source/doc/SfxRedactionHelper.cxx @@ -141,9 +141,11 @@ tools::Rectangle ImplCalcActionBounds(const MetaAction& rAct, const OutputDevice { // #105987# ImplLayout takes everything in logical coordinates std::unique_ptr<SalLayout> pSalLayout1 = rOut.ImplLayout( - aString, 0, nStrStartPos, rTextAct.GetPoint(), 0, rTextAct.GetDXArray()); + aString, 0, nStrStartPos, rTextAct.GetPoint(), 0, + { rTextAct.GetDXArray().data(), rTextAct.GetDXArray().size() }); std::unique_ptr<SalLayout> pSalLayout2 = rOut.ImplLayout( - aString, 0, nStrEndPos, rTextAct.GetPoint(), 0, rTextAct.GetDXArray()); + aString, 0, nStrEndPos, rTextAct.GetPoint(), 0, + { rTextAct.GetDXArray().data(), rTextAct.GetDXArray().size() }); if (pSalLayout2) { tools::Rectangle aBoundRect2(rOut.ImplGetTextBoundRect(*pSalLayout2)); |