diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-04-24 09:41:55 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-04-24 09:42:47 +0200 |
commit | bf286d12502688e63acebf381123ef05c750b852 (patch) | |
tree | f875159cbfeefde0812b28d112aa6fce6865474d | |
parent | b29b68ab4075d7b511f0d94df562118d4f1c76f9 (diff) |
Indentation fixes
No functional changes intended.
Change-Id: Ibc23de9cb33428765b8b0c85a221a2014ad4d7bd
-rw-r--r-- | oox/source/drawingml/customshapepresetdata.cxx | 2 | ||||
-rw-r--r-- | sd/qa/unit/tiledrendering/tiledrendering.cxx | 3 | ||||
-rw-r--r-- | sw/qa/extras/rtfexport/rtfexport.cxx | 10 | ||||
-rw-r--r-- | sw/source/filter/ww8/rtfexport.cxx | 5 | ||||
-rw-r--r-- | sw/source/filter/ww8/rtfsdrexport.cxx | 2 | ||||
-rw-r--r-- | writerfilter/source/rtftok/rtfdispatchvalue.cxx | 2 |
6 files changed, 11 insertions, 13 deletions
diff --git a/oox/source/drawingml/customshapepresetdata.cxx b/oox/source/drawingml/customshapepresetdata.cxx index 4788e297c50a..ca931eb199b4 100644 --- a/oox/source/drawingml/customshapepresetdata.cxx +++ b/oox/source/drawingml/customshapepresetdata.cxx @@ -321,7 +321,7 @@ void lcl_parseHandleRef(std::vector<beans::PropertyValue>& rHandle, const OStrin const sal_Int32 nCheck= SAL_N_ELEMENTS(aPrefix) - 1; const sal_Int32 nStart= SAL_N_ELEMENTS("Name = \"") - 1 + rName.getLength(); - if (rValue.copy(nStart , nCheck).equalsL(aPrefix, nCheck)) + if (rValue.copy(nStart, nCheck).equalsL(aPrefix, nCheck)) { sal_Int32 nIndex = nStart + nCheck; beans::PropertyValue aPropertyValue; diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx b/sd/qa/unit/tiledrendering/tiledrendering.cxx index e5aa417447be..5804fdf34bd4 100644 --- a/sd/qa/unit/tiledrendering/tiledrendering.cxx +++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx @@ -770,8 +770,7 @@ void SdTiledRenderingTest::testInsertTable() { { "Rows", uno::makeAny(sal_Int32(3)) }, { "Columns", uno::makeAny(sal_Int32(5)) } - } - )); + })); comphelper::dispatchCommand(".uno:InsertTable", aArgs); Scheduler::ProcessEventsToIdle(); diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx b/sw/qa/extras/rtfexport/rtfexport.cxx index ff413cf0d1f5..12cc5e19b806 100644 --- a/sw/qa/extras/rtfexport/rtfexport.cxx +++ b/sw/qa/extras/rtfexport/rtfexport.cxx @@ -360,11 +360,11 @@ DECLARE_RTFEXPORT_TEST(testTdf49073, "tdf49073.rtf") OUString sStyle = getProperty<OUString>(getParagraph(1)->getStart(), "RubyCharStyleName"); uno::Reference<beans::XPropertySet> xPropertySet(getStyles("CharacterStyles")->getByName(sStyle), uno::UNO_QUERY); CPPUNIT_ASSERT_EQUAL(5.f, getProperty<float>(xPropertySet, "CharHeight")); - CPPUNIT_ASSERT_EQUAL(sal_Int16(text::RubyAdjust_CENTER) ,getProperty<sal_Int16>(getParagraph(2)->getStart(),"RubyAdjust")); - CPPUNIT_ASSERT_EQUAL(sal_Int16(text::RubyAdjust_BLOCK) ,getProperty<sal_Int16>(getParagraph(3)->getStart(),"RubyAdjust")); - CPPUNIT_ASSERT_EQUAL(sal_Int16(text::RubyAdjust_INDENT_BLOCK),getProperty<sal_Int16>(getParagraph(4)->getStart(),"RubyAdjust")); - CPPUNIT_ASSERT_EQUAL(sal_Int16(text::RubyAdjust_LEFT) ,getProperty<sal_Int16>(getParagraph(5)->getStart(),"RubyAdjust")); - CPPUNIT_ASSERT_EQUAL(sal_Int16(text::RubyAdjust_RIGHT) ,getProperty<sal_Int16>(getParagraph(6)->getStart(),"RubyAdjust")); + CPPUNIT_ASSERT_EQUAL(sal_Int16(text::RubyAdjust_CENTER), getProperty<sal_Int16>(getParagraph(2)->getStart(),"RubyAdjust")); + CPPUNIT_ASSERT_EQUAL(sal_Int16(text::RubyAdjust_BLOCK), getProperty<sal_Int16>(getParagraph(3)->getStart(),"RubyAdjust")); + CPPUNIT_ASSERT_EQUAL(sal_Int16(text::RubyAdjust_INDENT_BLOCK), getProperty<sal_Int16>(getParagraph(4)->getStart(),"RubyAdjust")); + CPPUNIT_ASSERT_EQUAL(sal_Int16(text::RubyAdjust_LEFT), getProperty<sal_Int16>(getParagraph(5)->getStart(),"RubyAdjust")); + CPPUNIT_ASSERT_EQUAL(sal_Int16(text::RubyAdjust_RIGHT), getProperty<sal_Int16>(getParagraph(6)->getStart(),"RubyAdjust")); } DECLARE_RTFEXPORT_TEST(testMathRuns, "math-runs.rtf") diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx index 9b08e3522081..aa481c62bfbb 100644 --- a/sw/source/filter/ww8/rtfexport.cxx +++ b/sw/source/filter/ww8/rtfexport.cxx @@ -698,8 +698,7 @@ void RtfExport::ExportDocument_Impl() // Seeking the first SwFormatPageDesc. If no set, the default is valid const SwFormatPageDesc* pSttPgDsc = nullptr; { - const SwNode& rSttNd = *m_pDoc->GetNodes()[ - m_pDoc->GetNodes().GetEndOfExtras().GetIndex() + 2 ]; + const SwNode& rSttNd = *m_pDoc->GetNodes()[m_pDoc->GetNodes().GetEndOfExtras().GetIndex() + 2]; const SfxItemSet* pSet = nullptr; if (rSttNd.IsContentNode()) @@ -1165,7 +1164,7 @@ void RtfExport::OutColorTable() nMaxItem = rPool.GetItemCount2(*pIds); for (sal_uInt32 n = 0; n < nMaxItem; ++n) { - if ((pBackground = static_cast<const SvxBrushItem*>(rPool.GetItem2(*pIds , n)))) + if ((pBackground = static_cast<const SvxBrushItem*>(rPool.GetItem2(*pIds, n)))) { InsColor(pBackground->GetColor()); } diff --git a/sw/source/filter/ww8/rtfsdrexport.cxx b/sw/source/filter/ww8/rtfsdrexport.cxx index 17fb699a2310..edb73a6f9eb6 100644 --- a/sw/source/filter/ww8/rtfsdrexport.cxx +++ b/sw/source/filter/ww8/rtfsdrexport.cxx @@ -37,7 +37,7 @@ RtfSdrExport::RtfSdrExport(RtfExport& rExport) m_rAttrOutput(static_cast<RtfAttributeOutput&>(m_rExport.AttrOutput())), m_pSdrObject(nullptr), m_nShapeType(ESCHER_ShpInst_Nil), - m_nShapeFlags(0) , + m_nShapeFlags(0), m_aShapeStyle(200), m_pShapeTypeWritten(new bool[ ESCHER_ShpInst_COUNT ]) { diff --git a/writerfilter/source/rtftok/rtfdispatchvalue.cxx b/writerfilter/source/rtftok/rtfdispatchvalue.cxx index 457af170ff3f..6e4724d3ab07 100644 --- a/writerfilter/source/rtftok/rtfdispatchvalue.cxx +++ b/writerfilter/source/rtftok/rtfdispatchvalue.cxx @@ -67,7 +67,7 @@ int getNumberFormat(int nParam) NS_ooxml::LN_Value_ST_NumberFormat_decimalFullWidth, NS_ooxml::LN_Value_ST_NumberFormat_decimalHalfWidth, NS_ooxml::LN_Value_ST_NumberFormat_japaneseLegal, - NS_ooxml::LN_Value_ST_NumberFormat_japaneseDigitalTenThousand , + NS_ooxml::LN_Value_ST_NumberFormat_japaneseDigitalTenThousand, NS_ooxml::LN_Value_ST_NumberFormat_decimalEnclosedCircleChinese, NS_ooxml::LN_Value_ST_NumberFormat_decimalFullWidth2, NS_ooxml::LN_Value_ST_NumberFormat_aiueoFullWidth, |