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 /include | |
| 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 'include')
| -rw-r--r-- | include/vcl/outdev.hxx | 2 | ||||
| -rw-r--r-- | include/vcl/vcllayout.hxx | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index 3fa9d2167d27..6c499307a7f1 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -1155,7 +1155,7 @@ public: sal_Int32 nIndex, sal_Int32 nLen, long nCharExtra, vcl::TextLayoutCache const* = nullptr) const; - std::shared_ptr<vcl::TextLayoutCache> CreateTextLayoutCache(OUString const&) const; + static std::shared_ptr<vcl::TextLayoutCache> CreateTextLayoutCache(OUString const&); protected: SAL_DLLPRIVATE void ImplInitTextLineSize(); diff --git a/include/vcl/vcllayout.hxx b/include/vcl/vcllayout.hxx index 44752b6e4e06..0c32b71d5197 100644 --- a/include/vcl/vcllayout.hxx +++ b/include/vcl/vcllayout.hxx @@ -101,8 +101,6 @@ public: virtual bool GetOutline(basegfx::B2DPolyPolygonVector&) const; bool GetBoundRect(tools::Rectangle&) const; - virtual std::shared_ptr<vcl::TextLayoutCache> - CreateTextLayoutCache(OUString const&) const; virtual const SalLayoutGlyphs* GetGlyphs() const; protected: |