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 /sc/source/ui | |
| 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 'sc/source/ui')
| -rw-r--r-- | sc/source/ui/view/output2.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx index 098d66048e91..53eb899af9b9 100644 --- a/sc/source/ui/view/output2.cxx +++ b/sc/source/ui/view/output2.cxx @@ -811,7 +811,7 @@ const SalLayoutGlyphs* ScDrawStringsVars::GetLayoutGlyphs(const OUString& rStrin if( it != mCachedGlyphs.end() && it->second.IsValid()) return &it->second; std::unique_ptr<SalLayout> layout = pOutput->pFmtDevice->ImplLayout( rString, 0, rString.getLength(), - Point( 0, 0 ), 0, nullptr, SalLayoutFlags::GlyphItemsOnly ); + Point( 0, 0 ), 0, {}, SalLayoutFlags::GlyphItemsOnly ); if( layout ) { mCachedGlyphs.insert( std::make_pair( key, layout->GetGlyphs())); @@ -2146,7 +2146,7 @@ tools::Rectangle ScOutputData::LayoutStrings(bool bPixelToLogic, bool bPaint, co } if (bPaint) - mpDev->DrawTextArray(aDrawTextPos, aShort, aDX.data()); + mpDev->DrawTextArray(aDrawTextPos, aShort, {aDX.data(), aDX.size()}); } else { |