diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-04-08 15:32:20 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-04-08 15:47:51 +0200 |
| commit | 36532778a6307f9ebaf0c777224e4de568c74450 (patch) | |
| tree | d334bb4f5098e90e55797cc02b82fc683fff37cf | |
| parent | 51c2cbf539427dcee27fb5fd2678f94e684b616f (diff) | |
sw: initialize FieldResult::m_eType
Change-Id: Ia41ceb42b360a17021a30b5ed420d36759116255
| -rw-r--r-- | sw/qa/core/uwriter.cxx | 8 | ||||
| -rw-r--r-- | sw/source/core/txtnode/modeltoviewhelper.cxx | 13 |
2 files changed, 9 insertions, 12 deletions
diff --git a/sw/qa/core/uwriter.cxx b/sw/qa/core/uwriter.cxx index d6fa423ddd3c..3d085e6a40ee 100644 --- a/sw/qa/core/uwriter.cxx +++ b/sw/qa/core/uwriter.cxx @@ -298,14 +298,8 @@ void SwDocTest::testModelToViewHelper() OUString sViewText = aModelToViewHelper.getViewText(); CPPUNIT_ASSERT_EQUAL(OUString("AAAAA BBBBB CCCCC DDDDD"), sViewText); - // ??? is it a problem that we get the positions without - // EXPANDFOOTNOTE when it's completely removed? - CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(2), + CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(0), aModelToViewHelper.getFootnotePositions().size()); - CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(12), - aModelToViewHelper.getFootnotePositions()[0]); - CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(19), - aModelToViewHelper.getFootnotePositions()[1]); CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(0), aModelToViewHelper.getFieldPositions().size()); } diff --git a/sw/source/core/txtnode/modeltoviewhelper.cxx b/sw/source/core/txtnode/modeltoviewhelper.cxx index 085d3c5eff9d..bd1a3ae8250d 100644 --- a/sw/source/core/txtnode/modeltoviewhelper.cxx +++ b/sw/source/core/txtnode/modeltoviewhelper.cxx @@ -37,7 +37,10 @@ struct FieldResult { sal_Int32 m_nFieldPos; OUString m_sExpand; - enum { FIELD, FOOTNOTE } m_eType; + enum { NONE, FIELD, FOOTNOTE } m_eType; + explicit FieldResult(sal_Int32 const nPos) + : m_nFieldPos(nPos), m_eType(NONE) + { } }; class sortfieldresults : @@ -137,8 +140,7 @@ ModelToViewHelper::ModelToViewHelper(const SwTxtNode &rNode, sal_uInt16 eMode) aBlocks.end(), containsPos(nDummyCharPos)); if (aFind != aBlocks.end()) { - FieldResult aFieldResult; - aFieldResult.m_nFieldPos = nDummyCharPos; + FieldResult aFieldResult(nDummyCharPos); switch (pAttr->Which()) { case RES_TXTATR_FIELD: @@ -190,8 +192,7 @@ ModelToViewHelper::ModelToViewHelper(const SwTxtNode &rNode, sal_uInt16 eMode) containsPos(nDummyCharPos)); if (aFind != aBlocks.end()) { - FieldResult aFieldResult; - aFieldResult.m_nFieldPos = nDummyCharPos; + FieldResult aFieldResult(nDummyCharPos); aFieldResult.m_sExpand = (eMode & REPLACEMODE) ? OUString(CHAR_ZWSP) : sw::mark::ExpandFieldmark(pMark); @@ -229,6 +230,8 @@ ModelToViewHelper::ModelToViewHelper(const SwTxtNode &rNode, sal_uInt16 eMode) case FieldResult::FOOTNOTE: m_FootnotePositions.push_back(viewPos); break; + case FieldResult::NONE: /*ignore*/ + break; } nOffset += j->m_sExpand.getLength() - 1; } |