sw/source/uibase/shells/textsh1.cxx | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit a72e0556ec0c333125670b39cfd1f7671f827a62
Author: Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Mon Oct 28 11:38:20 2019 +0100
Commit: Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Fri Nov 1 09:10:12 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.k...@collabora.com>
(cherry picked from commit 586c00f7ba59b0c75ed2dd8ecf241a4d81c82331)
Reviewed-on: https://gerrit.libreoffice.org/81862
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
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();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
