From 59ec0fe032badfb9dae59f27e97f842c11c60d98 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Mon, 25 Sep 2017 09:13:58 +0200 Subject: RTF import: split this call into simpler ones Hopefully with this it's easier to see which is the usual and which one is the exceptional case. Change-Id: Iac1b49b2a4f2b909db46155d1ff10d2ba99fd655 --- writerfilter/source/rtftok/rtfdocumentimpl.cxx | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'writerfilter') diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index e8483bb43f2f..575562fb2eca 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -3209,11 +3209,10 @@ void RTFDocumentImpl::checkUnicode(bool bUnicode, bool bHex) } if (bHex && !m_aHexBuffer.isEmpty()) { - OUString aString = OStringToOUString( - m_aHexBuffer.makeStringAndClear(), - ((m_aStates.top().eDestination == Destination::FONTENTRY - && m_aStates.top().nCurrentEncoding == RTL_TEXTENCODING_SYMBOL) - ? RTL_TEXTENCODING_MS_1252 : m_aStates.top().nCurrentEncoding)); + rtl_TextEncoding nEncoding = m_aStates.top().nCurrentEncoding; + if (m_aStates.top().eDestination == Destination::FONTENTRY && m_aStates.top().nCurrentEncoding == RTL_TEXTENCODING_SYMBOL) + nEncoding = RTL_TEXTENCODING_MS_1252; + OUString aString = OStringToOUString(m_aHexBuffer.makeStringAndClear(), nEncoding); text(aString); } } -- cgit