[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - editeng/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Fri Mar 8 09:55:10 UTC 2019


 editeng/source/misc/svxacorr.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit d4c6057486f9667e82d7d4810bb2d421071b0eb2
Author:     Julien Nabet <serval2412 at yahoo.fr>
AuthorDate: Wed Mar 6 22:01:15 2019 +0100
Commit:     Michael Stahl <Michael.Stahl at cib.de>
CommitDate: Fri Mar 8 10:54:36 2019 +0100

    tdf#121686: fix assert in SvxAutoCorrect::FnChgToEnEmDash (editeng)
    
    See https://bugs.documentfoundation.org/attachment.cgi?id=149773
    
    Change-Id: I1696984a8df1b38a359a8177a5f3670526d2696e
    Reviewed-on: https://gerrit.libreoffice.org/68832
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>
    (cherry picked from commit 67d170868401335434772f1be23d565d23c1fbea)
    Reviewed-on: https://gerrit.libreoffice.org/68882

diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index b890b5cd0984..737225d31615 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -542,7 +542,8 @@ bool SvxAutoCorrect::FnChgToEnEmDash(
         sal_Unicode cCh = rTxt[ nSttPos ];
         if( '-' == cCh )
         {
-            if( ' ' == rTxt[ nSttPos-1 ] &&
+            if( 1 < nEndPos - nSttPos &&
+                ' ' == rTxt[ nSttPos-1 ] &&
                 '-' == rTxt[ nSttPos+1 ])
             {
                 sal_Int32 n;


More information about the Libreoffice-commits mailing list