solenv/flatpak-manifest.in | 6 +++--- vcl/source/edit/texteng.cxx | 2 +- vcl/source/edit/textview.cxx | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-)
New commits: commit f77de3ca7ab333fc9dfa75cd92e3f418d378443f Author: Stephan Bergmann <[email protected]> Date: Thu Sep 7 11:17:18 2017 +0200 Adapt flatpak-manifest.in to updated language-subtag-registry ...04d70c0999c716f5465631eca50945915ec607c4 "Upgrade to language-subtag-registry-2017-08-15" Change-Id: I4178545869a6d97cb1f90034f3944d9c72700bd6 (cherry picked from commit 374a721aca251e8988d4edb7f88ffd06ddef43b9) Reviewed-on: https://gerrit.libreoffice.org/42263 Tested-by: Jenkins <[email protected]> Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Caolán McNamara <[email protected]> diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in index 39b47826e24a..466a08198330 100644 --- a/solenv/flatpak-manifest.in +++ b/solenv/flatpak-manifest.in @@ -226,10 +226,10 @@ "dest-filename": "external/tarballs/libgltf-0.1.0.tar.gz" }, { - "url": "https://dev-www.libreoffice.org/src/language-subtag-registry-2017-04-19.tar.bz2";, - "sha256": "8333809eec6fce852a1d6de68859962106e13a84705417efb03452164da3ee7a", + "url": "https://dev-www.libreoffice.org/src/language-subtag-registry-2017-08-15.tar.bz2";, + "sha256": "d6a97fc8da5ae54d867e7f1b65ffb51e816cadd11714e45fc23ee0abf81a51ab", "type": "file", - "dest-filename": "external/tarballs/language-subtag-registry-2017-04-19.tar.bz2" + "dest-filename": "external/tarballs/language-subtag-registry-2017-08-15.tar.bz2" }, { "url": "https://dev-www.libreoffice.org/src/liblangtag-0.6.2.tar.bz2";, commit 96136c55a1fb5da6da2042bbfaa2f4e9aeb7938f Author: Michael Stahl <[email protected]> Date: Fri Sep 8 22:50:58 2017 +0200 tdf#108722 vcl: fix bugs in TextEngine with TEXTATTR_PROTECTED 1. If the cursor is at the end of the paragraph, attributes ending at that position are skipped in TextEngine::FindCharAttrib(). 2. If a TEXTATTR_PROTECTED is found, TextView::KeyInput() retains the selection that was extended to cover the attribute after deleting the text, because it compares to the initial selection. Why delete/backspace keys only work with the "gtk" vcl-plug but not "gtk3", "gen" or "kde4" is a mystery to me. Change-Id: Id7a6f298332f5a99454c793dd2dd6d424a975ad4 (cherry picked from commit d918a8086af56d1869e465baae64d960e56066d1) Reviewed-on: https://gerrit.libreoffice.org/42119 Tested-by: Jenkins <[email protected]> Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Caolán McNamara <[email protected]> diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx index cc50317037bc..d6f030921732 100644 --- a/vcl/source/edit/texteng.cxx +++ b/vcl/source/edit/texteng.cxx @@ -1012,7 +1012,7 @@ const TextCharAttrib* TextEngine::FindCharAttrib( const TextPaM& rPaM, sal_uInt1 { const TextCharAttrib* pAttr = nullptr; TextNode* pNode = mpDoc->GetNodes()[ rPaM.GetPara() ]; - if ( pNode && ( rPaM.GetIndex() < pNode->GetText().getLength() ) ) + if (pNode && (rPaM.GetIndex() <= pNode->GetText().getLength())) pAttr = pNode->GetCharAttribs().FindAttrib( nWhich, rPaM.GetIndex() ); return pAttr; } diff --git a/vcl/source/edit/textview.cxx b/vcl/source/edit/textview.cxx index f3c1b1a47b3c..d0e11899a380 100644 --- a/vcl/source/edit/textview.cxx +++ b/vcl/source/edit/textview.cxx @@ -623,10 +623,12 @@ bool TextView::KeyInput( const KeyEvent& rKeyEvent ) if(pStartAttr && pStartAttr->GetStart() < mpImpl->maSelection.GetStart().GetIndex()) { mpImpl->maSelection.GetStart().GetIndex() = pStartAttr->GetStart(); + aOldSel = mpImpl->maSelection; // update to deleted! } if(pEndAttr && pEndAttr->GetEnd() > mpImpl->maSelection.GetEnd().GetIndex()) { mpImpl->maSelection.GetEnd().GetIndex() = pEndAttr->GetEnd(); + aOldSel = mpImpl->maSelection; // update to deleted! } } aCurSel = ImpDelete( nDel, nMode );
_______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
