diff options
| author | Luke Deller <luke@deller.id.au> | 2013-05-23 02:05:36 +1000 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2013-05-27 15:44:13 +0200 |
| commit | b571605129426a1bf8eb7c9e9927785f8a9a5305 (patch) | |
| tree | 28721538330ce79eed2bf30e01ca2ea21303ad97 /sw/source/filter/ww8 | |
| parent | 92dc9cb50d2d7ebff6fb591d265589ef5f22dc1b (diff) | |
fix fdo#64872 infinite loop saving as doc
When loading from odt, table cells which are covered (due to merging of
cells) are replaced with an empty cell by
SwXMLTableContext::ReplaceWithEmptyCell. However if there is a sequence
of cells covered from above then their replacements are accidentally
inserted in reverse order, which produces this infinite loop problem when
saving as doc.
The reverse ordering in SwXMLTableContext::ReplaceWithEmptyCell was because
the insert position came from SwXMLTableContext::GetPrevStartNode which was
very careful to skip previous covered cells. However those cells have
already been replaced with an empty cell so they should not be skipped.
Change-Id: I6a022cd1490afa181dbc3e4b2d6ed4af3077b363
Signed-off-by: Miklos Vajna <vmiklos@suse.cz>
Diffstat (limited to 'sw/source/filter/ww8')
| -rw-r--r-- | sw/source/filter/ww8/wrtw8sty.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx index 36ee09bd5784..f5370ea91ac2 100644 --- a/sw/source/filter/ww8/wrtw8sty.cxx +++ b/sw/source/filter/ww8/wrtw8sty.cxx @@ -531,7 +531,7 @@ void MSWordStyles::OutputStyle( SwFmt* pFmt, sal_uInt16 nPos ) // (It must be the English word regardless of language settings) if ( nPos == 0 ) { assert( pFmt->GetPoolFmtId() == RES_POOLCOLL_STANDARD ); - aName = OUString("Normal"); + aName = rtl::OUString("Normal"); } else if (aName.EqualsIgnoreCaseAscii("Normal")) { // If LO has a style named "Normal"(!) rename it to something unique aName.InsertAscii("LO-" , 0); |