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

RTFDocumentImpl::dispatchValue: fix indentation

Browse Source 
Change-Id: I521462315ebe8b69b65e05df98042e7a33d60dbb
This commit is contained in:
Miklos Vajna 2014-06-04 10:06:58 +02:00
parent 2df0d9d32d
commit 5a7e4766ca
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sw/qa/extras/rtfimport/rtfimport.cxx
View File

@ -294,8 +294,7 @@ DECLARE_RTFIMPORT_TEST(testFdo79384, "fdo79384.rtf")
{ {
uno::Reference<text::XTextRange> xTextRange = getRun(getParagraph(1), 1); uno::Reference<text::XTextRange> xTextRange = getRun(getParagraph(1), 1);
CPPUNIT_ASSERT_EQUAL(OUString("Маркеры спискамЫ", 31, RTL_TEXTENCODING_UTF8), CPPUNIT_ASSERT_EQUAL(OUString("Маркеры спискамЫ", 31, RTL_TEXTENCODING_UTF8), xTextRange->getString());
xTextRange->getString());
} }
DECLARE_RTFIMPORT_TEST(testFdo47326, "fdo47326.rtf") DECLARE_RTFIMPORT_TEST(testFdo47326, "fdo47326.rtf")

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

@ -986,8 +986,7 @@ int RTFDocumentImpl::resolveChars(char ch)
{ {
// fdo#79384: Word will reject Shift-JIS following \loch // fdo#79384: Word will reject Shift-JIS following \loch
// but apparently OOo could read and (worse) write such documents // but apparently OOo could read and (worse) write such documents
SAL_INFO_IF(m_aStates.top().eRunType != RTFParserState::DBCH, SAL_INFO_IF(m_aStates.top().eRunType != RTFParserState::DBCH, "writerfilter.rtf", "invalid Shift-JIS without DBCH");
"writerfilter.rtf", "invalid Shift-JIS without DBCH");
unsigned char uch = ch; unsigned char uch = ch;
if ((uch >= 0x80 && uch <= 0x9F) || uch >= 0xE0) if ((uch >= 0x80 && uch <= 0x9F) || uch >= 0xE0)
{ {
@ -3495,8 +3494,7 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam)
{ {
case RTF_F: case RTF_F:
case RTF_AF: case RTF_AF:
if (m_aStates.top().isRightToLeft if (m_aStates.top().isRightToLeft || m_aStates.top().eRunType == RTFParserState::HICH)
|| m_aStates.top().eRunType == RTFParserState::HICH)
{ {
nSprm = NS_ooxml::LN_CT_Fonts_cs; nSprm = NS_ooxml::LN_CT_Fonts_cs;
} }
@ -3521,8 +3519,8 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam)
RTFSprms aRunPropsSprms; RTFSprms aRunPropsSprms;
aRunPropsSprms.set(NS_ooxml::LN_EG_RPrBase_rFonts, RTFValue::Pointer_t(new RTFValue(aFontAttributes))); aRunPropsSprms.set(NS_ooxml::LN_EG_RPrBase_rFonts, RTFValue::Pointer_t(new RTFValue(aFontAttributes)));
m_aStates.top().aTableSprms.set(NS_ooxml::LN_CT_Lvl_rPr, m_aStates.top().aTableSprms.set(NS_ooxml::LN_CT_Lvl_rPr,
RTFValue::Pointer_t(new RTFValue(RTFSprms(), aRunPropsSprms)), RTFValue::Pointer_t(new RTFValue(RTFSprms(), aRunPropsSprms)),
OVERWRITE_NO_APPEND); OVERWRITE_NO_APPEND);
} }
else else
{ {