diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-06-19 15:02:17 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-06-19 16:27:16 +0100 |
| commit | 3212a2419416359f11e60c62cadeeaa8078c33a7 (patch) | |
| tree | a2119927c02c00a515b6a45c0cab277302e46eba /editeng | |
| parent | 9d221db01337957ec161a76b5dd7db9d6b384c89 (diff) | |
consider field marks as text for auto quotes
Change-Id: I511a13f7785a0de6efaa8439d3f0bff20a1644ed
Diffstat (limited to 'editeng')
| -rw-r--r-- | editeng/qa/unit/core-test.cxx | 17 | ||||
| -rw-r--r-- | editeng/source/misc/svxacorr.cxx | 2 |
2 files changed, 18 insertions, 1 deletions
diff --git a/editeng/qa/unit/core-test.cxx b/editeng/qa/unit/core-test.cxx index f620a72d8843..b71c90c72dfc 100644 --- a/editeng/qa/unit/core-test.cxx +++ b/editeng/qa/unit/core-test.cxx @@ -375,6 +375,7 @@ void Test::testAutocorrect() CPPUNIT_ASSERT_EQUAL_MESSAGE("autocorrect", sExpected, aFoo.getResult()); } + // don't autocapitalize after a field mark { OUString sInput("Test. \x01 test"); sal_Unicode cNextChar(' '); @@ -385,6 +386,22 @@ void Test::testAutocorrect() CPPUNIT_ASSERT_EQUAL_MESSAGE("autocorrect", sExpected, aFoo.getResult()); } + + // consider field contents as text for auto quotes + { + OUString sInput("T\x01"); + sal_Unicode cNextChar('"'); + const sal_Unicode EXPECTED[] = { 'T', 0x01, 0x0201d }; + OUString sExpected(EXPECTED, SAL_N_ELEMENTS(EXPECTED)); + + TestAutoCorrDoc aFoo(sInput, LANGUAGE_ENGLISH_US); + aAutoCorrect.SetAutoCorrFlag(ChgQuotes, true); + aAutoCorrect.DoAutoCorrect(aFoo, sInput, sInput.getLength(), cNextChar, true); + fprintf(stderr, "text is %x\n", aFoo.getResult()[aFoo.getResult().getLength() - 1]); + + CPPUNIT_ASSERT_EQUAL_MESSAGE("autocorrect", sExpected, aFoo.getResult()); + } + } void Test::testHyperlinkCopyPaste() diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx index c7ec14cb0be6..d8804dcd1727 100644 --- a/editeng/source/misc/svxacorr.cxx +++ b/editeng/source/misc/svxacorr.cxx @@ -1258,7 +1258,7 @@ void SvxAutoCorrect::DoAutoCorrect( SvxAutoCorrDoc& rDoc, const OUString& rTxt, { sal_Unicode cPrev; bool bSttQuote = !nInsPos || - IsWordDelim( ( cPrev = rTxt[ nInsPos-1 ])) || + NonFieldWordDelim( ( cPrev = rTxt[ nInsPos-1 ])) || lcl_IsInAsciiArr( "([{", cPrev ) || ( cEmDash && cEmDash == cPrev ) || ( cEnDash && cEnDash == cPrev ); |