[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - cui/source

[Tomaž Vajngerl]

 cui/source/dialogs/cuicharmap.cxx |   17 ++++++++++-------
 cui/source/inc/cuicharmap.hxx     |    1 +
 2 files changed, 11 insertions(+), 7 deletions(-)

New commits:
commit efc5602dd3a2c2c138e0290e58ed1527523e4dcf
Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
Date:   Wed Jun 17 14:10:09 2015 +0900

    tdf#91748 fix preview of special characters
    
    Change-Id: Icf18e8be2ec07bb4bcd6edce3e41a6e88ecefca7
    (cherry picked from commit 56d62036862462ca7147686268558a754613858f)

diff --git a/cui/source/dialogs/cuicharmap.cxx 
b/cui/source/dialogs/cuicharmap.cxx
index 9589423..89f63ef 100644
--- a/cui/source/dialogs/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -184,6 +184,8 @@ VCL_BUILDER_FACTORY(SvxShowText)
 
 void SvxShowText::Paint(vcl::RenderContext& rRenderContext, const Rectangle&)
 {
+    rRenderContext.SetFont(maFont);
+
     Color aTextCol = rRenderContext.GetTextColor();
 
     const StyleSettings& rStyleSettings = 
Application::GetSettings().GetStyleSettings();
@@ -268,13 +270,14 @@ void SvxShowText::Paint(vcl::RenderContext& 
rRenderContext, const Rectangle&)
 void SvxShowText::SetFont( const vcl::Font& rFont )
 {
     long nWinHeight = GetOutputSizePixel().Height();
-    vcl::Font aFont = rFont;
-    aFont.SetWeight( WEIGHT_NORMAL );
-    aFont.SetAlign( ALIGN_TOP );
-    aFont.SetSize( PixelToLogic( Size( 0, nWinHeight/2 ) ) );
-    aFont.SetTransparent( true );
-    Control::SetFont( aFont );
-    mnY = ( nWinHeight - GetTextHeight() ) / 2;
+    maFont = vcl::Font(rFont);
+    maFont.SetWeight(WEIGHT_NORMAL);
+    maFont.SetAlign(ALIGN_TOP);
+    maFont.SetSize(PixelToLogic(Size(0, nWinHeight / 2)));
+    maFont.SetTransparent(true);
+    Control::SetFont(maFont);
+
+    mnY = (nWinHeight - GetTextHeight()) / 2;
 
     Invalidate();
 }
diff --git a/cui/source/inc/cuicharmap.hxx b/cui/source/inc/cuicharmap.hxx
index 3a65325..d06f55a 100644
--- a/cui/source/inc/cuicharmap.hxx
+++ b/cui/source/inc/cuicharmap.hxx
@@ -55,6 +55,7 @@ protected:
 private:
     long            mnY;
     bool            mbCenter;
+    vcl::Font       maFont;
 
 };
 

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits