[Libreoffice-commits] core.git: Branch 'feature/unitver' - vcl/source

[Andrzej Hunt]

Rebased ref, commits from common ancestor:
commit 1a4423f9986938e17d1f9589abb1fef4a8a1621a
Author: Andrzej Hunt <andrzej at ahunt.org>
Date:   Sun May 31 16:14:10 2015 +0100

    Allow unsetting underline attribute
    
    Change-Id: Ib11f6e76a52c0b8c943d46b9f14b3b00642879d1

diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index c38a2b2..f187280 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -1558,10 +1558,10 @@ bool Window::set_font_attribute(const OString &rKey, const OString &rValue)
             aFont.SetItalic(ITALIC_NORMAL);
         SetControlFont(aFont);
     }
-    else if (rKey == "underline" && toBool(rValue))
+    else if (rKey == "underline")
     {
         vcl::Font aFont(GetControlFont());
-        aFont.SetUnderline(UNDERLINE_SINGLE);
+        aFont.SetUnderline(toBool(rValue) ? UNDERLINE_SINGLE : UNDERLINE_NONE);
         SetControlFont(aFont);
     }
     else if (rKey == "size")