diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2013-06-21 15:48:39 +0200 |
|---|---|---|
| committer | Fridrich Strba <fridrich@documentfoundation.org> | 2013-06-28 07:04:46 +0000 |
| commit | 34a30f6e6ba7ea666bf51f89d077c5d9fb2c8bcb (patch) | |
| tree | da49aad99fc39eb58ece01e25b2342d784a7137e /writerfilter | |
| parent | a34f119432489937a0400d3b7692a40736a326ba (diff) | |
bnc#823655 RTF import: ignore styles without a type
Regression from 29dcdf6b56f8dbc1b7de0478afb04122f8dbf0f9.
Change-Id: I970c0e7b3652d7e6f093815b90e04e0c45904b28
(cherry picked from commit c6a941b51b68eb097d4d43323b39ff1aba4c753e)
Reviewed-on: https://gerrit.libreoffice.org/4482
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.cxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 5c44b25475e6..80db68d1d73b 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -1034,6 +1034,7 @@ void RTFDocumentImpl::text(OUString& rString) break; case DESTINATION_STYLESHEET: case DESTINATION_STYLEENTRY: + if (m_aStates.top().aTableAttributes.find(NS_rtf::LN_SGC)) { RTFValue::Pointer_t pValue(new RTFValue(m_aStates.top().aDestinationText.makeStringAndClear())); m_aStates.top().aTableAttributes.set(NS_rtf::LN_XSTZNAME1, pValue); @@ -1043,6 +1044,8 @@ void RTFDocumentImpl::text(OUString& rString) ); m_aStyleTableEntries.insert(make_pair(m_nCurrentStyleIndex, pProp)); } + else + SAL_INFO("writerfilter", "no RTF style type defined, ignoring"); break; case DESTINATION_REVISIONTABLE: case DESTINATION_REVISIONENTRY: |