mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

RTF import: split this call into simpler ones

Browse Source 
Hopefully with this it's easier to see which is the usual and which one
is the exceptional case.

Change-Id: Iac1b49b2a4f2b909db46155d1ff10d2ba99fd655
This commit is contained in:
Miklos Vajna
2017-09-25 09:13:58 +02:00
parent 40892cd331
commit 59ec0fe032
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
writerfilter/source/rtftok/rtfdocumentimpl.cxx
View File

@@ -3209,11 +3209,10 @@ void RTFDocumentImpl::checkUnicode(bool bUnicode, bool bHex)
} }
if (bHex && !m_aHexBuffer.isEmpty()) if (bHex && !m_aHexBuffer.isEmpty())
{ {
OUString aString = OStringToOUString( rtl_TextEncoding nEncoding = m_aStates.top().nCurrentEncoding;
m_aHexBuffer.makeStringAndClear(), if (m_aStates.top().eDestination == Destination::FONTENTRY && m_aStates.top().nCurrentEncoding == RTL_TEXTENCODING_SYMBOL)
((m_aStates.top().eDestination == Destination::FONTENTRY nEncoding = RTL_TEXTENCODING_MS_1252;
&& m_aStates.top().nCurrentEncoding == RTL_TEXTENCODING_SYMBOL) OUString aString = OStringToOUString(m_aHexBuffer.makeStringAndClear(), nEncoding);
? RTL_TEXTENCODING_MS_1252 : m_aStates.top().nCurrentEncoding));
text(aString); text(aString);
} }
} }