[Libreoffice-commits] core.git: sw/qa writerfilter/source
Miklos Vajna
vmiklos at collabora.co.uk
Mon Jan 30 07:55:37 UTC 2017
sw/qa/extras/rtfimport/rtfimport.cxx | 19 ++++++++++++++-----
writerfilter/source/rtftok/rtfdispatchvalue.cxx | 4 ++--
2 files changed, 16 insertions(+), 7 deletions(-)
New commits:
commit 481293fcf5740cbc739e1e7d7f6082acbfb0cdf6
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Mon Jan 30 08:28:17 2017 +0100
Indentation fixes
Change-Id: I22247da71d1594187c531ca5552cf75363aaddfd
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx
index e71be6a..c574e39 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -1616,17 +1616,26 @@ DECLARE_RTFIMPORT_TEST(testCp1000018, "cp1000018.rtf")
CPPUNIT_ASSERT_EQUAL(aExpected, xTextRange->getString());
}
-class testTdf105511 : public Test {
+class testTdf105511 : public Test
+{
protected:
- virtual OUString getTestName() override { return OUString("testTdf105511"); }
+ virtual OUString getTestName() override
+ {
+ return OUString("testTdf105511");
+ }
public:
CPPUNIT_TEST_SUITE(testTdf105511);
CPPUNIT_TEST(Import);
CPPUNIT_TEST_SUITE_END();
- void Import() {
- struct DefaultLocale : public comphelper::ConfigurationProperty<DefaultLocale, rtl::OUString> {
- static OUString path() { return OUString("/org.openoffice.Office.Linguistic/General/DefaultLocale"); }
+ void Import()
+ {
+ struct DefaultLocale : public comphelper::ConfigurationProperty<DefaultLocale, rtl::OUString>
+ {
+ static OUString path()
+ {
+ return OUString("/org.openoffice.Office.Linguistic/General/DefaultLocale");
+ }
~DefaultLocale() = delete;
};
auto batch = comphelper::ConfigurationChanges::create();
diff --git a/writerfilter/source/rtftok/rtfdispatchvalue.cxx b/writerfilter/source/rtftok/rtfdispatchvalue.cxx
index a63eee1..72833ee 100644
--- a/writerfilter/source/rtftok/rtfdispatchvalue.cxx
+++ b/writerfilter/source/rtftok/rtfdispatchvalue.cxx
@@ -394,8 +394,8 @@ RTFError RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam)
case RTF_CPG:
{
rtl_TextEncoding nEncoding = (nParam == 0) ?
- utl_getWinTextEncodingFromLangStr(getLODefaultLanguage().toUtf8().getStr()) :
- rtl_getTextEncodingFromWindowsCodePage(nParam);
+ utl_getWinTextEncodingFromLangStr(getLODefaultLanguage().toUtf8().getStr()) :
+ rtl_getTextEncodingFromWindowsCodePage(nParam);
if (nKeyword == RTF_ANSICPG)
m_aDefaultState.nCurrentEncoding = nEncoding;
else
More information about the Libreoffice-commits
mailing list