mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed for libreoffice crashes while opening file.

Browse Source 
Change-Id: I85a16e4ef8d75f19250115d5522046a968d5fc91
Reviewed-on: https://gerrit.libreoffice.org/6760
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
PriyankaGaikwad
2013-11-22 19:05:32 +05:30
committed by Caolán McNamara
parent 82b5172954
commit c6e333e73b
3 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
sw/qa/extras/ooxmlimport/data/file_crash.docx Normal file
View File

Binary file not shown.

5
sw/qa/extras/ooxmlimport/ooxmlimport.cxx
View File

@@ -1555,6 +1555,11 @@ DECLARE_OOXMLIMPORT_TEST(testFdo70457, "fdo70457.docx")
CPPUNIT_ASSERT_EQUAL(sal_Int32(4500), getProperty<sal_Int32>(getShape(1), "RotateAngle")); CPPUNIT_ASSERT_EQUAL(sal_Int32(4500), getProperty<sal_Int32>(getShape(1), "RotateAngle"));
} }
DECLARE_OOXMLIMPORT_TEST(testLOCrash,"file_crash.docx")
{
//The problem was libreoffice crash while opening the file.
getParagraph(1,"Contents");
}
#endif #endif
CPPUNIT_PLUGIN_IMPLEMENT(); CPPUNIT_PLUGIN_IMPLEMENT();

2
sw/source/core/doc/doctxm.cxx
View File

@@ -1616,7 +1616,7 @@ void SwTOXBaseSection::GenerateText( sal_uInt16 nArrayIdx,
case TOKEN_ENTRY_TEXT: case TOKEN_ENTRY_TEXT:
{ {
SwIndex aIdx( pTOXNd, rTxt.getLength() ); SwIndex aIdx( pTOXNd, std::min(pTOXNd->GetTxt().getLength(),rTxt.getLength()) );
rBase.FillText( *pTOXNd, aIdx ); rBase.FillText( *pTOXNd, aIdx );
rTxt = lcl_RemoveLineBreaks(rTxt); rTxt = lcl_RemoveLineBreaks(rTxt);
} }