From 7da83a670b9988bf31a3385c708a2dbee03f73cd Mon Sep 17 00:00:00 2001
From: Jan Holesovsky <kendy@collabora.com>
Date: Mon, 25 Jun 2018 22:58:30 +0200
Subject: Conditional formatting: Allow to set the icon set CF via .uno:
 command.

When .uno:IconSetFormatDialog gets a parameter, it directly creates the
icon set conditional formatting with pre-selected values.

Change-Id: I75dda90e5ea9c191254acc24c564cda7b27243a5
Reviewed-on: https://gerrit.libreoffice.org/56429
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
Reviewed-on: https://gerrit.libreoffice.org/61669
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
---
 desktop/source/lib/init.cxx | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'desktop/source')

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 5a505910bbfa..6a23444900b1 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -333,6 +333,8 @@ std::vector<beans::PropertyValue> desktop::jsonToPropertyValuesVector(const char
                 aValue.Value <<= OString(rValue.c_str()).toFloat();
             else if (rType == "long")
                 aValue.Value <<= OString(rValue.c_str()).toInt32();
+            else if (rType == "short")
+                aValue.Value <<= static_cast<sal_Int16>(OString(rValue.c_str()).toInt32());
             else if (rType == "unsigned short")
                 aValue.Value <<= static_cast<sal_uInt16>(OString(rValue.c_str()).toUInt32());
             else if (rType == "[]any")
-- 
cgit