diff options
| author | Jan-Marek Glogowski <jan-marek.glogowski@extern.cib.de> | 2019-11-26 14:39:30 +0000 |
|---|---|---|
| committer | Xisco Faulí <xiscofauli@libreoffice.org> | 2019-11-27 10:54:45 +0100 |
| commit | 13d777a0aa3802871cf01869d904ceec39096024 (patch) | |
| tree | ef39bae2306f1c5d91591971d405af57b2007267 /include | |
| parent | 89deeb8940c8bc9f1ad0c88075df1afdd73d441a (diff) | |
tdf#127403 Revert "VCL keep / return the original set TextEngine font"
This reverts commit cc223fa12a61ba0e580b884386a7f5d7efd0541f.
All the other attenps to fix this seem to cause timeouts in the
Jenkins clang_dbgutil build. I don't have one around and no time
to investigate further, so let's see, if the revert passes.
Change-Id: Ib915185eaf79073523351705baf28df3c62906f1
Reviewed-on: https://gerrit.libreoffice.org/83654
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
(cherry picked from commit b1e73fd49661e07e6085310f3f6ecc6ade2a3762)
Reviewed-on: https://gerrit.libreoffice.org/83827
Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/vcl/texteng.hxx | 3 | ||||
| -rw-r--r-- | include/vcl/vclmedit.hxx | 5 |
2 files changed, 2 insertions, 6 deletions
diff --git a/include/vcl/texteng.hxx b/include/vcl/texteng.hxx index f265ec1f05e7..60aa359e3fd6 100644 --- a/include/vcl/texteng.hxx +++ b/include/vcl/texteng.hxx @@ -106,7 +106,6 @@ class VCL_DLLPUBLIC TextEngine : public SfxBroadcaster std::unique_ptr<LocaleDataWrapper> mpLocaleDataWrapper; vcl::Font maFont; - vcl::Font maOrigFont; // original font from SetFont Color maTextColor; sal_Int32 mnMaxTextLen; @@ -221,7 +220,7 @@ public: sal_Int32 GetTextLen( const TextSelection& rSel ) const; void SetFont( const vcl::Font& rFont ); - const vcl::Font& GetFont() const { return maOrigFont; } + const vcl::Font& GetFont() const { return maFont; } void SetLeftMargin( sal_uInt16 n ); diff --git a/include/vcl/vclmedit.hxx b/include/vcl/vclmedit.hxx index 1cb3b8114149..61367af5893e 100644 --- a/include/vcl/vclmedit.hxx +++ b/include/vcl/vclmedit.hxx @@ -97,10 +97,7 @@ protected: TextView* GetTextView() const; ExtTextEngine* GetTextEngine() const; - void ApplySettings(vcl::RenderContext&) override; - void ApplyBackgroundSettings(vcl::RenderContext&, const StyleSettings&); - void ApplyFontSettings(vcl::RenderContext&, const StyleSettings&); - + virtual void ApplySettings(vcl::RenderContext& rRenderContext) override; public: VclMultiLineEdit( vcl::Window* pParent, WinBits nWinStyle ); |