diff options
| author | Katarina Behrens <Katarina.Behrens@cib.de> | 2015-07-22 11:27:24 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2015-08-06 12:56:47 +0200 |
| commit | b72173c8c2dfbfa999a48bffe06ee1758a47eacb (patch) | |
| tree | d7617c1aa51a0052e3726e90ef68749968c868a9 /starmath | |
| parent | 307ede6711b4e4b661b693bc5251e8610ff73d36 (diff) | |
tdf#92600: Restore ability to apply font settings to controls
SmShowSymbol handles font/fg/bg settings by itself, so make
ApplySettings noop there.
This partially reverts commit b010e4074e5d5ee3a3905f1351f04efafe937c2a
Reviewed-on: https://gerrit.libreoffice.org/17288
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 94ceda8b2fea37587424b664e17fa9ee8b01e158)
squashed commit from László Németh <laszlo.nemeth@collabora.com>
tdf#92600 fix missing font preview in character set widget
The previous fix for tdf#92600 (missing bold text in dialogs)
brought back the regression in the special character set
widget: the characters show always the default font
of the Control class instead of the chosen font, see in
the Insert->Special Character... dialog window of Writer.
Change-Id: Ib5074684ef1277d9b9b4646bd73dce4cbff3943e
2bdc2300f481dd680877f84ea2a717b9e749c64c
Reviewed-on: https://gerrit.libreoffice.org/17303
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'starmath')
| -rw-r--r-- | starmath/inc/dialog.hxx | 1 | ||||
| -rw-r--r-- | starmath/source/dialog.cxx | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx index 4a64ca557f4f..aaf4c0f0e3a1 100644 --- a/starmath/inc/dialog.hxx +++ b/starmath/inc/dialog.hxx @@ -328,6 +328,7 @@ class SmShowSymbol : public Control Link<> aDblClickHdlLink; virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) SAL_OVERRIDE; + virtual void ApplySettings(vcl::RenderContext& rRenderContext) SAL_OVERRIDE; virtual void MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx index 5ec52289e6fb..840c2a7baf00 100644 --- a/starmath/source/dialog.cxx +++ b/starmath/source/dialog.cxx @@ -1384,6 +1384,10 @@ void SmShowSymbol::Resize() Invalidate(); } +void SmShowSymbol::ApplySettings(vcl::RenderContext& /*rRenderContext*/ ) +{ +} + void SmShowSymbol::setFontSize(vcl::Font &rFont) const { rFont.SetSize(Size(0, GetOutputSize().Height() - GetOutputSize().Height() / 3)); |