commit f512f8818aec08a5b463c8acdf781e7ab27036f5
author Aditya <adityasahu1511@gmail.com> Sat Apr 06 13:23:48 2019 +0530
committer Jim Raykowski <raykowj@gmail.com> Tue Apr 09 03:54:41 2019 +0200
tree a16b1b313a79e00724b1e697935d85d824a1afd6
parent 6c50ee3377756ae7da1ae039da35775c0a97ef2f

tdf#124247: Fix tooltip message when color added to recent colors

Presently, the tool tip text in recent colors is shown in its
 hexadecimal representation when the split color button is clicked.
 Change the hexadecimal representation of the colors in 'recent
 colors' to its actual color name.

Change-Id: I59636eb124b75a9397337c9560bfff72804424ae
Reviewed-on: https://gerrit.libreoffice.org/70337
Tested-by: Jenkins
Reviewed-by: Jim Raykowski <raykowj@gmail.com>

include/svx/tbxcolorupdate.hxx

diff --git a/include/svx/tbxcolorupdate.hxx b/include/svx/tbxcolorupdate.hxx
index 03b6a09..ec7639b 100644
--- a/include/svx/tbxcolorupdate.hxx
+++ b/include/svx/tbxcolorupdate.hxx
@@ -52,6 +52,7 @@ namespace svx
        void        Update( const NamedColor& rNamedColor );
        void        Update( const Color& rColor, bool bForceUpdate = false );
        Color const & GetCurrentColor() const { return maCurColor; }
        OUString    GetCurrentColorName();

    private:
        ToolboxButtonColorUpdater(ToolboxButtonColorUpdater const &) = delete;

svx/source/tbxctrls/tbcontrl.cxx

diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 1843e04..0208ae8 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -3507,7 +3507,7 @@ void SvxColorToolBoxControl::execute(sal_Int16 /*nSelectModifier*/)
    dispatchCommand( aCommand, aArgs );

    EnsurePaletteManager();
    OUString sColorName = "#" + aColor.AsRGBHexString().toAsciiUpperCase();
    OUString sColorName = m_xBtnUpdater->GetCurrentColorName();
    m_xPaletteManager->AddRecentColor(aColor, sColorName);
}

svx/source/tbxctrls/tbxcolorupdate.cxx

diff --git a/svx/source/tbxctrls/tbxcolorupdate.cxx b/svx/source/tbxctrls/tbxcolorupdate.cxx
index 378f487..f7524c0 100644
--- a/svx/source/tbxctrls/tbxcolorupdate.cxx
+++ b/svx/source/tbxctrls/tbxcolorupdate.cxx
@@ -142,6 +142,19 @@ namespace svx

        mpTbx->SetItemOverlayImage(mnBtnId, Image(pVirDev->GetBitmapEx(Point(0,0), aItemSize)));
    }

    OUString ToolboxButtonColorUpdater::GetCurrentColorName()
    {
        OUString sColorName = mpTbx->GetQuickHelpText(mnBtnId);
        // The obtained string is of format: color context (color name)
        // Generate a substring which contains only the color name
        sal_Int32 nStart = sColorName.indexOf('(');
        sColorName = sColorName.copy( nStart + 1 );
        sal_Int32 nLength = sColorName.getLength();
        if(nLength > 0)
            sColorName = sColorName.copy( 0, nLength - 1);
        return sColorName;
    }
}

/* vim:set shiftwidth=4 softtabstop=4 expandtab: */