diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-12-08 14:33:41 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-12-09 07:08:12 +0000 |
| commit | 547de17fcb654e560a60d683c33482feeee84358 (patch) | |
| tree | e5d3a414a4b8d647fd7adeb0ef925bfb19c1b274 /writerfilter | |
| parent | 73131fc3806ce2a7da61c93590e467e5b044c341 (diff) | |
RTF filter: handle user-defined document properties of type bool
Next to number and string.
Change-Id: I76f78197412606f00559c1c2790b7c70117ef1c1
Reviewed-on: https://gerrit.libreoffice.org/31767
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
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 dc49e6484ef6..eaa845ebc787 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 11: + m_aStates.top().aPropType = cppu::UnoType<bool>::get(); + break; case 30: m_aStates.top().aPropType = cppu::UnoType<OUString>::get(); break; diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index c92e3a9fd4a8..80859bfd1541 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -2685,6 +2685,8 @@ RTFError RTFDocumentImpl::popState() aAny = uno::makeAny(aStaticVal); else if (m_aStates.top().aPropType == cppu::UnoType<sal_Int32>::get()) aAny = uno::makeAny(aStaticVal.toInt32()); + else if (m_aStates.top().aPropType == cppu::UnoType<bool>::get()) + aAny = uno::makeAny(aStaticVal.toBoolean()); xPropertyContainer->addProperty(rKey, beans::PropertyAttribute::REMOVABLE, aAny); } |