[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - sc/source

[Szymon Kłos (via logerrit)]

 sc/source/ui/drawfunc/drawsh.cxx |   15 +++++++++++++++
 1 file changed, 15 insertions(+)

New commits:
commit bd0653c7bfd1e5e4a316dcc61b91e40b0fcff19a
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Fri Nov 8 11:45:26 2019 +0100
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Fri Nov 8 12:53:12 2019 +0100

    jsdialog: apply .uno:XLineColor in Calc
    
    Change-Id: I6951241444a3dec4f81bcd121b5c2917895456a3
    Reviewed-on: https://gerrit.libreoffice.org/82279
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx
index 3de59aae93d7..8f0a955940b2 100644
--- a/sc/source/ui/drawfunc/drawsh.cxx
+++ b/sc/source/ui/drawfunc/drawsh.cxx
@@ -61,6 +61,7 @@
 #include <memory>
 #include <svx/xlnwtit.hxx>
 #include <svx/chrtitem.hxx>
+#include <svx/xlnclit.hxx>
 
 SFX_IMPL_INTERFACE(ScDrawShell, SfxShell)
 
@@ -68,6 +69,8 @@ namespace
 {
     void lcl_convertStringArguments(std::unique_ptr<SfxItemSet>& pArgs)
     {
+        Color aColor;
+        OUString sColor;
         const SfxPoolItem* pItem = nullptr;
 
         if (SfxItemState::SET == pArgs->GetItemState(SID_ATTR_LINE_WIDTH_ARG, false, &pItem))
@@ -80,6 +83,18 @@ namespace
             XLineWidthItem aItem(nValue);
             pArgs->Put(aItem);
         }
+        else if (SfxItemState::SET == pArgs->GetItemState(SID_ATTR_COLOR_STR, false, &pItem))
+        {
+            sColor = static_cast<const SfxStringItem*>(pItem)->GetValue();
+
+            if (sColor == "transparent")
+                aColor = COL_TRANSPARENT;
+            else
+                aColor = Color(sColor.toInt32(16));
+
+            XLineColorItem aLineColorItem(OUString(), aColor);
+            pArgs->Put(aLineColorItem);
+        }
     }
 }