diff -uNr sw.old/source/ui/dochdl/swdtflvr.cxx sw.new/source/ui/dochdl/swdtflvr.cxx --- sw.old/source/ui/dochdl/swdtflvr.cxx 2007-06-28 09:53:04.000000000 +0800 +++ sw.new/source/ui/dochdl/swdtflvr.cxx 2007-06-28 09:52:28.000000000 +0800 @@ -1827,7 +1827,14 @@ { if( ( SOT_FORMATSTR_ID_HTML_SIMPLE == nFmt ) || ( SOT_FORMATSTR_ID_HTML_NO_COMMENT == nFmt ) ) - { + { + if( rData.GetSotStorageStream( SOT_FORMAT_RTF, xStrm ) ) + { + pStream = &xStrm; + pRead = ReadRtf; + } + else + { pStream = aMSE40ClpObj.IsValid( *xStrm ); pRead = ReadHTML; pRead->SetReadUTF8( TRUE ); @@ -1835,7 +1842,8 @@ BOOL bNoComments = ( nFmt == SOT_FORMATSTR_ID_HTML_NO_COMMENT ); - pRead->SetIgnoreHTMLComments( bNoComments ); + pRead->SetIgnoreHTMLComments( bNoComments ); + } } else {