diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2019-01-23 19:59:45 +0100 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2019-01-25 19:03:55 +0100 |
| commit | 8d7435aa72af7fd0b454d7314c6c79f61f112679 (patch) | |
| tree | 2146ba9fc325c4c5f7a2e40c23c59afe7e57a28d /sc | |
| parent | d33998a2851eef17ccd0a85f24df587302df7c9c (diff) | |
Assert missing SalGraphics font on GetTextLayout
Trying to layout text without a font can't work.
Without a font, currently the text is simply not painted, but this
is still a programming error, so warn the developer.
And we can get rid of all the intermediate OutputDevice font and
gpahics checks, as everything now uses Harfbuzz and there won't
be any layout which can't use the cached runs, so just generate
them directly.
Change-Id: Iae1fab0afeefec1cb1ca82c4e5d8dcbe9919859d
Reviewed-on: https://gerrit.libreoffice.org/66818
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'sc')
| -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 808aae367f94..5fecb743df94 100644 --- a/sc/source/ui/view/output2.cxx +++ b/sc/source/ui/view/output2.cxx @@ -2070,7 +2070,7 @@ tools::Rectangle ScOutputData::LayoutStrings(bool bPixelToLogic, bool bPaint, co if (aDX.size() < nLen) aDX.resize(nLen, 0); - pFmtDevice->GetTextArray(aShort, &aDX[0]); + pFmtDevice->GetTextArray(aShort, aDX.data()); if ( !mpRefDevice->GetConnectMetaFile() || mpRefDevice->GetOutDevType() == OUTDEV_PRINTER ) @@ -2081,7 +2081,7 @@ tools::Rectangle ScOutputData::LayoutStrings(bool bPixelToLogic, bool bPaint, co } if (bPaint) - mpDev->DrawTextArray(aDrawTextPos, aShort, &aDX[0]); + mpDev->DrawTextArray(aDrawTextPos, aShort, aDX.data()); } else { |