[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sw/source

[Fridrich Å trba]

 sw/source/core/doc/doctxm.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 44ad2d98a5e9dbf7f6429caf920cdcf3931a62c4
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Fri May 31 12:27:49 2013 +0200

    Resolves: rhbz#989686 Fix crash with ooo120774-1.doc
    
    Do not try to remove line breaks from empty string
    
    Reviewed-on: https://gerrit.libreoffice.org/4114
    Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
    Tested-by: Fridrich Strba <fridrich at documentfoundation.org>
    (cherry picked from commit 2cb9aaf44dc589af79d62d7b1136b5d65e9f47d4)
    
    Change-Id: Ieb12c541d42944aac813cee10ce479207b1c674b
    Reviewed-on: https://gerrit.libreoffice.org/5195
    Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
    Tested-by: Fridrich Strba <fridrich at documentfoundation.org>

diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx
index 2029d9f..6498585 100644
--- a/sw/source/core/doc/doctxm.cxx
+++ b/sw/source/core/doc/doctxm.cxx
@@ -1536,6 +1536,8 @@ static String lcl_GetNumString( const SwTOXSortTabBase& rBase, bool bUsePrefix,
 /// to a single space, and trailing space removed.
 String lcl_RemoveLineBreaks( String sRet )
 {
+    if (!sRet.Len())
+        return sRet;
     xub_StrLen nOffset = 0;
     sRet.SearchAndReplaceAll('\n', ' ');
     for (xub_StrLen i = 1; i < sRet.Len(); i++)