summaryrefslogtreecommitdiff
path: root/writerfilter
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@suse.cz>2013-06-21 15:48:39 +0200
committerMiklos Vajna <vmiklos@suse.cz>2013-06-21 16:11:01 +0200
commitc6a941b51b68eb097d4d43323b39ff1aba4c753e (patch)
tree385ee8348b280d88058072ac4684567394fc0ded /writerfilter
parent1b3692c6a4dbd0c16da97c0966d242d31dcf4c5f (diff)
bnc#823655 RTF import: ignore styles without a type
Regression from 29dcdf6b56f8dbc1b7de0478afb04122f8dbf0f9. Change-Id: I970c0e7b3652d7e6f093815b90e04e0c45904b28
Diffstat (limited to 'writerfilter')
-rw-r--r--writerfilter/source/rtftok/rtfdocumentimpl.cxx3
1 files changed, 3 insertions, 0 deletions
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 8849ed718ebc..2a33d962b0ce 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -1028,6 +1028,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);
@@ -1037,6 +1038,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: