summaryrefslogtreecommitdiffstats
path: root/writerfilter/source/rtftok/rtfdocumentimpl.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'writerfilter/source/rtftok/rtfdocumentimpl.cxx')
-rw-r--r--writerfilter/source/rtftok/rtfdocumentimpl.cxx9
1 files changed, 4 insertions, 5 deletions
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);
}
}