sc/source/ui/app/inputhdl.cxx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
New commits: commit 1ea5633c8ca31fad574ea9fd98ddb20425054b48 Author: Eike Rathke <[email protected]> AuthorDate: Thu Sep 22 18:32:13 2022 +0200 Commit: Caolán McNamara <[email protected]> CommitDate: Wed Oct 5 09:52:58 2022 +0200 Fix string length assertion and handle parentheses in multi-line formula soffice.bin: include/rtl/ustring.hxx:842: sal_Unicode rtl::OUString::operator[](sal_Int32) const: Assert ion `index >= 0 && static_cast<sal_uInt32>(index) < static_cast<sal_uInt32>(getLength())' failed. when editing a paragraph (line) longer than the first, because the string was always obtained from the first paragraph but the position from the current selection. Also match parentheses in the current paragraph, not somewhere else in the first paragraph.. still we're matching only within one paragraph. Change-Id: I955fd371c1e248ce58735a5b61603bbce6c997db Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140446 Reviewed-by: Eike Rathke <[email protected]> Tested-by: Jenkins (cherry picked from commit 1df910dac84b4690371f2fc84299e3a918529484) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140387 Reviewed-by: Michael Stahl <[email protected]> Reviewed-by: Xisco Fauli <[email protected]> Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Caolán McNamara <[email protected]> diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index b837cb2d089b..dd1f9f61958a 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -2171,10 +2171,11 @@ void ScInputHandler::UpdateParenthesis() { // Examine character left to the cursor sal_Int32 nPos = aSel.nStartPos - 1; - OUString aFormula = mpEditEngine->GetText(0); + OUString aFormula = mpEditEngine->GetText(aSel.nStartPara); sal_Unicode c = aFormula[nPos]; if ( c == '(' || c == ')' ) { + // Note this matches only within one paragraph. sal_Int32 nOther = lcl_MatchParenthesis( aFormula, nPos ); if ( nOther != -1 ) { @@ -2190,9 +2191,9 @@ void ScInputHandler::UpdateParenthesis() mpEditEngine->RemoveCharAttribs( i, EE_CHAR_WEIGHT ); } - ESelection aSelThis( 0,nPos, 0,nPos+1 ); + ESelection aSelThis( aSel.nStartPara, nPos, aSel.nStartPara, nPos+1); mpEditEngine->QuickSetAttribs( aSet, aSelThis ); - ESelection aSelOther( 0,nOther, 0,nOther+1 ); + ESelection aSelOther( aSel.nStartPara, nOther, aSel.nStartPara, nOther+1); mpEditEngine->QuickSetAttribs( aSet, aSelOther ); // Dummy InsertText for Update and Paint (selection is empty)
