[Libreoffice-commits] core.git: sw/source

Caolán McNamara caolanm at redhat.com
Wed Apr 29 03:57:35 PDT 2015


 sw/source/core/text/guess.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 174ba8550349778f661a30d5c2d3243bff5f3c0d
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Apr 29 11:52:49 2015 +0100

    fix assert on load of fdo82018-3.docx
    
    apparently arises when lacking font to display it
    
    Change-Id: I934e43668f2f4d9c4e96736c004dfb0c250ef191

diff --git a/sw/source/core/text/guess.cxx b/sw/source/core/text/guess.cxx
index 5484520..88e975f 100644
--- a/sw/source/core/text/guess.cxx
+++ b/sw/source/core/text/guess.cxx
@@ -318,6 +318,10 @@ bool SwTxtGuess::Guess( const SwTxtPortion& rPor, SwTxtFormatInfo &rInf,
                                               rInf.GetIdx() - nFieldDiff - 1:
                                               0;
 
+            if ( nLangIndex > nDoNotStepOver &&
+                    rInf.GetTxt().getLength() == nLangIndex )
+                --nLangIndex;
+
             while ( nLangIndex > nDoNotStepOver &&
                     ! rCC.isLetterNumeric( rInf.GetTxt(), nLangIndex ) )
                 --nLangIndex;


More information about the Libreoffice-commits mailing list