diff options
| author | László Németh <laszlo.nemeth@collabora.com> | 2015-07-22 22:50:33 +0200 |
|---|---|---|
| committer | László Németh <laszlo.nemeth@collabora.com> | 2015-07-22 23:02:58 +0200 |
| commit | e92a8b92072284fd7c37d7bb3e1e8fe72a185f35 (patch) | |
| tree | 26da24f9ff9b3c1343f818ce9a61dc7cc1dcdf2f | |
| parent | ea7224a34686fed69daadc2ffcd06061497301ff (diff) | |
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: I2bdc2300f481dd680877f84ea2a717b9e749c64c
| -rw-r--r-- | include/svx/charmap.hxx | 1 | ||||
| -rw-r--r-- | svx/source/dialog/charmap.cxx | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/include/svx/charmap.hxx b/include/svx/charmap.hxx index 3615a2941af0..636f9c256532 100644 --- a/include/svx/charmap.hxx +++ b/include/svx/charmap.hxx @@ -43,6 +43,7 @@ public: SvxShowCharSet( vcl::Window* pParent ); virtual ~SvxShowCharSet(); virtual void dispose() SAL_OVERRIDE; + virtual void ApplySettings(vcl::RenderContext& rRenderContext) SAL_OVERRIDE; void RecalculateFont(vcl::RenderContext& rRenderContext); diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx index 2972dbe04feb..7aadf2fc12cf 100644 --- a/svx/source/dialog/charmap.cxx +++ b/svx/source/dialog/charmap.cxx @@ -66,6 +66,10 @@ SvxShowCharSet::SvxShowCharSet(vcl::Window* pParent) init(); } +void SvxShowCharSet::ApplySettings(vcl::RenderContext& /*rRenderContext*/ ) +{ +} + void SvxShowCharSet::init() { nSelectedIndex = -1; // TODO: move into init list when it is no longer static |