From 5a7e4766ca1ae20c6683bb7424f08fc9698ae9b7 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Wed, 4 Jun 2014 10:06:58 +0200 Subject: [PATCH] RTFDocumentImpl::dispatchValue: fix indentation Change-Id: I521462315ebe8b69b65e05df98042e7a33d60dbb --- sw/qa/extras/rtfimport/rtfimport.cxx | 3 +-- writerfilter/source/rtftok/rtfdocumentimpl.cxx | 10 ++++------ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx index 165492247598..1829490afcaa 100644 --- a/sw/qa/extras/rtfimport/rtfimport.cxx +++ b/sw/qa/extras/rtfimport/rtfimport.cxx @@ -294,8 +294,7 @@ DECLARE_RTFIMPORT_TEST(testFdo79384, "fdo79384.rtf") { uno::Reference xTextRange = getRun(getParagraph(1), 1); - CPPUNIT_ASSERT_EQUAL(OUString("Маркеры спискамЫ", 31, RTL_TEXTENCODING_UTF8), - xTextRange->getString()); + CPPUNIT_ASSERT_EQUAL(OUString("Маркеры спискамЫ", 31, RTL_TEXTENCODING_UTF8), xTextRange->getString()); } DECLARE_RTFIMPORT_TEST(testFdo47326, "fdo47326.rtf") diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 0758ee7dcf2f..b45fd3e7e768 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -986,8 +986,7 @@ int RTFDocumentImpl::resolveChars(char ch) { // fdo#79384: Word will reject Shift-JIS following \loch // but apparently OOo could read and (worse) write such documents - SAL_INFO_IF(m_aStates.top().eRunType != RTFParserState::DBCH, - "writerfilter.rtf", "invalid Shift-JIS without DBCH"); + SAL_INFO_IF(m_aStates.top().eRunType != RTFParserState::DBCH, "writerfilter.rtf", "invalid Shift-JIS without DBCH"); unsigned char uch = ch; if ((uch >= 0x80 && uch <= 0x9F) || uch >= 0xE0) { @@ -3495,8 +3494,7 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam) { case RTF_F: case RTF_AF: - if (m_aStates.top().isRightToLeft - || m_aStates.top().eRunType == RTFParserState::HICH) + if (m_aStates.top().isRightToLeft || m_aStates.top().eRunType == RTFParserState::HICH) { nSprm = NS_ooxml::LN_CT_Fonts_cs; } @@ -3521,8 +3519,8 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam) RTFSprms aRunPropsSprms; 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, - RTFValue::Pointer_t(new RTFValue(RTFSprms(), aRunPropsSprms)), - OVERWRITE_NO_APPEND); + RTFValue::Pointer_t(new RTFValue(RTFSprms(), aRunPropsSprms)), + OVERWRITE_NO_APPEND); } else {