[Libreoffice-commits] core.git: include/svx svx/source

[László Németh]

 include/svx/charmap.hxx       |    1 +
 svx/source/dialog/charmap.cxx |    4 ++++
 2 files changed, 5 insertions(+)

New commits:
commit e92a8b92072284fd7c37d7bb3e1e8fe72a185f35
Author: László Németh <laszlo.nemeth at collabora.com>
Date:   Wed Jul 22 22:50:33 2015 +0200

    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

diff --git a/include/svx/charmap.hxx b/include/svx/charmap.hxx
index 3615a29..636f9c25 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 2972dbe..7aadf2f 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