diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-10-05 11:29:02 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-10-05 12:04:59 +0200 |
| commit | 44838c669b6bd02e14c394aebd9d19bcbf5ff409 (patch) | |
| tree | 298f9ca23fb2a13ee69c2570bbd8d4d5e47ceac9 /desktop | |
| parent | 153ac5dc8fd15efff49c7e428ac6a3799aded0f4 (diff) | |
desktop: handle sal_uInt16 in jsonToPropertyValues()
Change-Id: Ic0059404b7ccbc922703705e7818404d4904f324
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/lib/init.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index e902df0c71ba..7eb54d3a6064 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -903,6 +903,8 @@ static void jsonToPropertyValues(const char* pJSON, uno::Sequence<beans::Propert aValue.Value <<= OString(rValue.c_str()).toFloat(); else if (rType == "long") aValue.Value <<= OString(rValue.c_str()).toInt32(); + else if (rType == "unsigned short") + aValue.Value <<= static_cast<sal_uInt16>(OString(rValue.c_str()).toUInt32()); else SAL_WARN("desktop.lib", "jsonToPropertyValues: unhandled type '"<<rType<<"'"); aArguments.push_back(aValue); |