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

[Jim Raykowski (via logerrit)]

 svx/source/tbxctrls/tbxcolorupdate.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2e3b0c5d42d60d46cd9f8b8eda9424b095c63418
Author:     Jim Raykowski <raykowj at gmail.com>
AuthorDate: Mon Apr 8 19:44:31 2019 -0800
Commit:     Jim Raykowski <raykowj at gmail.com>
CommitDate: Sun Apr 14 00:04:06 2019 +0200

    Remove check for empty color name
    
    In ToolboxButtonColorUpdater::Update(const NamedColor &rNamedColor) if
    the color name is empty the check for color name emptiness causes the
    tool tip to remain unchanged. This produces an incorrect tool tip.
    Better to show either the hex representation of the color or simply
    empty. This patch shows the color name as empty. Currently there are not
    any colors that I know of that have empty color names but with this
    patch we are ready for them :-)
    
    Change-Id: Ia96789b668cb358d7b03904a75e327303411e56d
    Reviewed-on: https://gerrit.libreoffice.org/70448
    Tested-by: Jenkins
    Reviewed-by: Jim Raykowski <raykowj at gmail.com>

diff --git a/svx/source/tbxctrls/tbxcolorupdate.cxx b/svx/source/tbxctrls/tbxcolorupdate.cxx
index f7524c02bc1a..7bbeea79c346 100644
--- a/svx/source/tbxctrls/tbxcolorupdate.cxx
+++ b/svx/source/tbxctrls/tbxcolorupdate.cxx
@@ -75,7 +75,7 @@ namespace svx
     void ToolboxButtonColorUpdater::Update(const NamedColor &rNamedColor)
     {
         Update(rNamedColor.first);
-        if (!mbWideButton && !rNamedColor.second.isEmpty())
+        if (!mbWideButton)
         {
             // Also show the current color as QuickHelpText
             OUString colorSuffix = " (%1)";