[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - editeng/source
Julien Nabet
serval2412 at yahoo.fr
Mon Jan 5 12:27:56 PST 2015
editeng/source/editeng/impedit4.cxx | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 9a779652a28d538184eb7fd8f4117ae9882feab9
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Mon Feb 2 18:02:50 2015 +0100
Resolves fdo#87968 : Assertion failed: false rtl_uString_newFromSubString
aNewText already contains the good string so calling copy method is wrong
(same pb for i18n::TransliterationModulesExtra::TITLE_CASE and
i18n::TransliterationModulesExtra::SENTENCE_CASE)
Change-Id: Ifce92f33e98af3a58a70d25da9c60cf3d584a001
Reviewed-on: https://gerrit.libreoffice.org/13724
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
(cherry picked from commit 31de7888660f551597263413bfdf467aade36680)
Reviewed-on: https://gerrit.libreoffice.org/13754
diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx
index fd11281..41ae0cc 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -2819,7 +2819,7 @@ EditSelection ImpEditEngine::TransliterateText( const EditSelection& rSelection,
GetLanguage( EditPaM( pNode, nCurrentStart + 1 ) ),
nCurrentStart, nLen, &aOffsets ));
- if (aNodeStr != aNewText.copy( nCurrentStart, nLen ))
+ if (aNodeStr != aNewText)
{
aChgData.nStart = nCurrentStart;
aChgData.nLen = nLen;
@@ -2907,7 +2907,7 @@ EditSelection ImpEditEngine::TransliterateText( const EditSelection& rSelection,
GetLanguage( EditPaM( pNode, nCurrentStart + 1 ) ),
nCurrentStart, nLen, &aOffsets ));
- if ( aNodeStr != aNewText.copy( nCurrentStart, nLen ))
+ if (aNodeStr != aNewText)
{
aChgData.nStart = nCurrentStart;
aChgData.nLen = nLen;
@@ -2945,7 +2945,7 @@ EditSelection ImpEditEngine::TransliterateText( const EditSelection& rSelection,
Sequence< sal_Int32 > aOffsets;
OUString aNewText( aTranslitarationWrapper.transliterate( aNodeStr, nLanguage, nCurrentStart, nLen, &aOffsets ) );
- if (aNodeStr != aNewText.copy( nCurrentStart, nLen ))
+ if (aNodeStr != aNewText)
{
aChgData.nStart = nCurrentStart;
aChgData.nLen = nLen;
More information about the Libreoffice-commits
mailing list