summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2017-09-25 09:13:58 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2017-09-25 09:16:59 +0200
commit59ec0fe032badfb9dae59f27e97f842c11c60d98 (patch)
treee5bd3b56defc882de3a2104c088264cab85e9df9
parent40892cd3311021c55e943228e16bfd36df7b1011 (diff)
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
-rw-r--r--writerfilter/source/rtftok/rtfdocumentimpl.cxx9
-rw-r--r--writerperfect/source/writer/EPUBExportFilter.cxx10
2 files changed, 9 insertions, 10 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);
}
}
diff --git a/writerperfect/source/writer/EPUBExportFilter.cxx b/writerperfect/source/writer/EPUBExportFilter.cxx
index eefbdc4c9d4d..239884ef605f 100644
--- a/writerperfect/source/writer/EPUBExportFilter.cxx
+++ b/writerperfect/source/writer/EPUBExportFilter.cxx
@@ -28,11 +28,11 @@ using namespace com::sun::star;
#if !LIBEPUBGEN_VERSION_SUPPORT
namespace libepubgen
{
- enum EPUBStylesMethod
- {
- EPUB_STYLES_METHOD_CSS, //< The styles will be described in a separate CSS file.
- EPUB_STYLES_METHOD_INLINE, //< The styles will be described inline.
- };
+enum EPUBStylesMethod
+{
+ EPUB_STYLES_METHOD_CSS, //< The styles will be described in a separate CSS file.
+ EPUB_STYLES_METHOD_INLINE, //< The styles will be described inline.
+};
}
#endif