diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-12-08 17:25:07 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-12-09 08:10:40 +0100 |
| commit | 51c400dc4cd6a88c01b245e41d0de737d4df4017 (patch) | |
| tree | a8da22631ac8166108ea62194d7e11fd5a229f8a /writerfilter | |
| parent | 07b0cde32a7eebce996b8c32aa58545e4ec15003 (diff) | |
RTF filter: handle user-defined document properties of type double
This was the last unhandled type.
Change-Id: Ife9b93ac81ddab9409c6790228eec03e92920e01
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/rtftok/rtfdispatchvalue.cxx | 3 | ||||
| -rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.cxx | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/writerfilter/source/rtftok/rtfdispatchvalue.cxx b/writerfilter/source/rtftok/rtfdispatchvalue.cxx index 0cefa0114505..8c6075ece5ff 100644 --- a/writerfilter/source/rtftok/rtfdispatchvalue.cxx +++ b/writerfilter/source/rtftok/rtfdispatchvalue.cxx @@ -1397,6 +1397,9 @@ RTFError RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam) case 3: m_aStates.top().aPropType = cppu::UnoType<sal_Int32>::get(); break; + case 5: + m_aStates.top().aPropType = cppu::UnoType<double>::get(); + break; case 11: m_aStates.top().aPropType = cppu::UnoType<bool>::get(); break; diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 09c84a0d9eb3..c113167c1cc8 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -2712,6 +2712,8 @@ RTFError RTFDocumentImpl::popState() aAny = uno::makeAny(aStaticVal.toBoolean()); else if (m_aStates.top().aPropType == cppu::UnoType<util::DateTime>::get()) aAny = uno::makeAny(getDateTimeFromUserProp(aStaticVal)); + else if (m_aStates.top().aPropType == cppu::UnoType<double>::get()) + aAny = uno::makeAny(aStaticVal.toDouble()); xPropertyContainer->addProperty(rKey, beans::PropertyAttribute::REMOVABLE, aAny); } |