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

Szymon Kłos (via logerrit) logerrit at kemper.freedesktop.org
Mon Oct 28 14:19:24 UTC 2019


 sw/source/uibase/shells/textsh1.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 586c00f7ba59b0c75ed2dd8ecf241a4d81c82331
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Mon Oct 28 11:38:20 2019 +0100
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Mon Oct 28 15:18:43 2019 +0100

    jsdialogs: allow to use transparent highlight
    
    Change-Id: Ib19dbbf3c13afd20bee47226704887f899c99b5d
    Reviewed-on: https://gerrit.libreoffice.org/81597
    Tested-by: Jenkins
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/sw/source/uibase/shells/textsh1.cxx b/sw/source/uibase/shells/textsh1.cxx
index 7ff0435665d3..0788f49e52a3 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -1219,7 +1219,10 @@ void SwTextShell::Execute(SfxRequest &rReq)
             if (SfxItemState::SET == pArgs->GetItemState(SID_ATTR_COLOR_STR, false, &pColorStringItem))
             {
                 sColor = static_cast<const SfxStringItem*>(pColorStringItem)->GetValue();
-                aSet = Color(sColor.toInt32(16));
+                if (sColor == "transparent")
+                    aSet = COL_TRANSPARENT;
+                else
+                    aSet = Color(sColor.toInt32(16));
             }
             else if (pItem)
                 aSet = static_cast<const SvxColorItem*>(pItem)->GetValue();


More information about the Libreoffice-commits mailing list