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

[Tomaž Vajngerl]

 vcl/source/edit/vclmedit.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit a9116e4b7d312d67c075469158cb8eceabe63dba
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
Date:   Wed May 27 16:18:56 2015 +0900

    tdf#91450 fix infinite invalidation loop
    
    Change-Id: I86f4e881011b2e3f50a0186fc301b142a65ccdf6

diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx
index 66ae929..1dc3478 100644
--- a/vcl/source/edit/vclmedit.cxx
+++ b/vcl/source/edit/vclmedit.cxx
@@ -1002,7 +1002,8 @@ void VclMultiLineEdit::ApplySettings(vcl::RenderContext& rRenderContext)
         theFont.SetFillColor(IsControlBackground() ? GetControlBackground() : rStyleSettings.GetFieldColor());
 
     pImpVclMEdit->GetTextWindow()->SetFont(theFont);
-    pImpVclMEdit->GetTextWindow()->GetTextEngine()->SetFont(theFont);
+    // FIXME: next call causes infinite invalidation loop, rethink how to properly fix this situation
+    // pImpVclMEdit->GetTextWindow()->GetTextEngine()->SetFont(theFont);
     pImpVclMEdit->GetTextWindow()->SetTextColor(aTextColor);
 
     if (IsPaintTransparent())