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())
{
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);
}
}

10
writerperfect/source/writer/EPUBExportFilter.cxx
View File

@@ -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