mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tdf#105625 related: also check selection across field boundaries

Browse Source 
The problem in callnk.cxx was that when selecting 1 char to the right
using keyboard, and exiting field boundary, nCmp pointed to previous
position (inside field), and then compared to position to the left
(which also may be inside field), thus missing call change link (and
read-only state change). Seems that this was a mistake in commit
740efbb1daf26828f70dc785c1e107f67706286b.

In pam.cxx, if cursor was to the left of field, and then selected
1 char to the right to cross field's boundary, then both PaM's point
and mark had same fieldmark, but point was outside, and mark inside,
and as code didn't check this condition, so read-only state wasn't
properly set.

Unit test is augmented to check the second problem.

Change-Id: I7323e53eeb261b4ccdc0f9e36cc0956b373f104d
Reviewed-on: https://gerrit.libreoffice.org/33790
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
This commit is contained in:
Mike Kaganski 2017-02-01 13:52:22 +03:00
parent f2278a10b2
commit c34fc4520d
4 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sw/qa/extras/uiwriter/data/tdf105625.fodt
View File

@ -3,6 +3,7 @@
<office:body>
<office:text>
<text:p><field:fieldmark field:type="vnd.oasis.opendocument.field.FORMCHECKBOX"/></text:p>
<text:p><field:fieldmark-start field:type="vnd.oasis.opendocument.field.FORMTEXT"/>Field<field:fieldmark-end/></text:p>
</office:text>
</office:body>
</office:document>

12
sw/qa/extras/uiwriter/uiwriter.cxx
View File

@ -4273,18 +4273,24 @@ void SwUiWriterTest::testTdf105417()
void SwUiWriterTest::testTdf105625()
{
// We should be able to edit at positions adjacent to fields.
// Check if the start and the end of the only paragraph are not protected
// (they are adjacent to FORMCHECKBOX)
SwDoc* pDoc = createDoc("tdf105625.fodt");
SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
uno::Reference<uno::XComponentContext> xComponentContext(comphelper::getProcessComponentContext());
// Ensure correct initial setting
comphelper::ConfigurationHelper::writeDirectKey(xComponentContext, "org.openoffice.Office.Writer/", "Cursor/Option", "IgnoreProtectedArea", css::uno::Any(false), comphelper::EConfigurationModes::Standard);
// We should be able to edit at positions adjacent to fields.
// Check if the start and the end of the 1st paragraph are not protected
// (they are adjacent to FORMCHECKBOX)
pWrtShell->SttPara();
CPPUNIT_ASSERT_EQUAL(false, pWrtShell->HasReadonlySel());
pWrtShell->EndPara();
CPPUNIT_ASSERT_EQUAL(false, pWrtShell->HasReadonlySel());
// 2nd paragraph - FORMTEXT
pWrtShell->Down(/*bSelect=*/false);
// Check selection across FORMTEXT field boundary - must be read-only
pWrtShell->SttPara();
pWrtShell->Right(CRSR_SKIP_CHARS, /*bSelect=*/true, 1, /*bBasicCall=*/false);
CPPUNIT_ASSERT_EQUAL(true, pWrtShell->HasReadonlySel());
}
CPPUNIT_TEST_SUITE_REGISTRATION(SwUiWriterTest);

4
sw/source/core/crsr/callnk.cxx
View File

@ -195,8 +195,8 @@ SwCallLink::~SwCallLink()
{
const OUString rText = pCNd->GetTextNode()->GetText();
if( !nCmp ||
g_pBreakIt->GetBreakIter()->getScriptType( rText, nCmp )
!= g_pBreakIt->GetBreakIter()->getScriptType( rText, nCmp - 1 ))
g_pBreakIt->GetBreakIter()->getScriptType( rText, nContent )
!= g_pBreakIt->GetBreakIter()->getScriptType(rText, nAktContent))
{
rShell.CallChgLnk();
return;

4
sw/source/core/crsr/pam.cxx
View File

@ -691,7 +691,9 @@ bool SwPaM::HasReadonlySel( bool bFormView, bool /*bAnnotationMode*/ ) const
bool bAtStartA = (pA != nullptr) && (pA->GetMarkStart() == *GetPoint());
bool bAtStartB = (pB != nullptr) && (pB->GetMarkStart() == *GetMark());
if (pA != pB)
if ((pA == pB) && (bAtStartA != bAtStartB))
bRet = true;
else if (pA != pB)
{
// If both points are either outside or at marks edges (i.e. selection either
// touches fields, or fully encloses it), then don't disable editing