summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorSzymon Kłos <szymon.klos@collabora.com>2019-10-28 11:38:20 +0100
committerSzymon Kłos <szymon.klos@collabora.com>2019-11-01 09:10:12 +0100
commita72e0556ec0c333125670b39cfd1f7671f827a62 (patch)
treedfdff6ea867b84a2e09fde209da0bd91c9baec77 /sw
parente92a9ea35f1b04d2d6e5b3714e531b052a7a7868 (diff)
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@collabora.com> (cherry picked from commit 586c00f7ba59b0c75ed2dd8ecf241a4d81c82331) Reviewed-on: https://gerrit.libreoffice.org/81862 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Diffstat (limited to 'sw')
-rw-r--r--sw/source/uibase/shells/textsh1.cxx5
1 files changed, 4 insertions, 1 deletions
diff --git a/sw/source/uibase/shells/textsh1.cxx b/sw/source/uibase/shells/textsh1.cxx
index 525b808fb2d0..b6bc638131f7 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -1208,7 +1208,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();