diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-03-27 16:59:17 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-03-28 08:57:47 +0000 |
| commit | 88005f6f2541e12325c3e00aa438317ed8ab06bd (patch) | |
| tree | 0c3482dcee377afc140ee7a849cb74cf4a43a11a /sw/qa | |
| parent | d0c545bede035f3a4757ac433d919f65d1d06cf0 (diff) | |
Related: fdo#73936 allow ModelToViewHelper to not expand footnotes..
but continue to expand fields. No change to anything yet, but
should allow this to be reused in SwTxtNode::GetExpandText
Change-Id: I4dbfc454d498fc85a918b0e43e68c219cbc37a21
Diffstat (limited to 'sw/qa')
| -rw-r--r-- | sw/qa/core/uwriter.cxx | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/sw/qa/core/uwriter.cxx b/sw/qa/core/uwriter.cxx index bdbeda3199b3..b32e8241bbf6 100644 --- a/sw/qa/core/uwriter.cxx +++ b/sw/qa/core/uwriter.cxx @@ -265,12 +265,18 @@ void SwDocTest::testModelToViewHelper() } { - ModelToViewHelper aModelToViewHelper(*pTxtNode, EXPANDFIELDS); + ModelToViewHelper aModelToViewHelper(*pTxtNode, EXPANDFIELDS | EXPANDFOOTNOTE); OUString sViewText = aModelToViewHelper.getViewText(); CPPUNIT_ASSERT(sViewText == "AAAAA BBBBB foo CCCCC foo DDDDD"); } { + ModelToViewHelper aModelToViewHelper(*pTxtNode, EXPANDFIELDS); + OUString sViewText = aModelToViewHelper.getViewText(); + CPPUNIT_ASSERT(sViewText == "AAAAA BBBBB CCCCC DDDDD"); + } + + { ModelToViewHelper aModelToViewHelper(*pTxtNode, HIDEINVISIBLE); OUString sViewText = aModelToViewHelper.getViewText(); CPPUNIT_ASSERT(sViewText == "AAAAA CCCCC " + OUString(CH_TXTATR_BREAKWORD) + " DDDDD"); @@ -283,13 +289,13 @@ void SwDocTest::testModelToViewHelper() } { - ModelToViewHelper aModelToViewHelper(*pTxtNode, EXPANDFIELDS | HIDEINVISIBLE); + ModelToViewHelper aModelToViewHelper(*pTxtNode, EXPANDFIELDS | HIDEINVISIBLE | EXPANDFOOTNOTE); OUString sViewText = aModelToViewHelper.getViewText(); CPPUNIT_ASSERT(sViewText == "AAAAA CCCCC foo DDDDD"); } { - ModelToViewHelper aModelToViewHelper(*pTxtNode, EXPANDFIELDS | HIDEREDLINED); + ModelToViewHelper aModelToViewHelper(*pTxtNode, EXPANDFIELDS | HIDEREDLINED | EXPANDFOOTNOTE); OUString sViewText = aModelToViewHelper.getViewText(); CPPUNIT_ASSERT(sViewText == "AAAABB foo CCCCC foo DDDDD"); } @@ -305,7 +311,7 @@ void SwDocTest::testModelToViewHelper() } { - ModelToViewHelper aModelToViewHelper(*pTxtNode, EXPANDFIELDS | HIDEINVISIBLE | HIDEREDLINED); + ModelToViewHelper aModelToViewHelper(*pTxtNode, EXPANDFIELDS | HIDEINVISIBLE | HIDEREDLINED | EXPANDFOOTNOTE); OUString sViewText = aModelToViewHelper.getViewText(); CPPUNIT_ASSERT(sViewText == "AAAACCCCC foo DDDDD"); } @@ -325,7 +331,7 @@ void SwDocTest::testModelToViewHelper() CPPUNIT_ASSERT(pTxtNode->GetTxt().getLength() == 11); { - ModelToViewHelper aModelToViewHelper(*pTxtNode, EXPANDFIELDS); + ModelToViewHelper aModelToViewHelper(*pTxtNode, EXPANDFIELDS | EXPANDFOOTNOTE); OUString sViewText = aModelToViewHelper.getViewText(); fprintf(stderr, "string is %s\n", OUStringToOString(sViewText, RTL_TEXTENCODING_UTF8).getStr()); CPPUNIT_ASSERT(sViewText == "AAAAABBBBBCCCCC"); |