incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m..@apache.org
Subject svn commit: r1172113 - /incubator/ooo/trunk/main/sw/source/filter/rtf/rtffld.cxx
Date Sat, 17 Sep 2011 22:39:20 GMT
Author: mst
Date: Sat Sep 17 22:39:20 2011
New Revision: 1172113

URL: http://svn.apache.org/viewvc?rev=1172113&view=rev
Log:
sw34bf06: #i117947#: rtf: ignore invalid tokens following field result

# HG changeset patch
# User Michael Stahl <mst@openoffice.org>
# Date 1304005948 0
# Node ID 2f76e8667395fe1e0c62c7203593ea63c1f0ce3a
# Parent  c2c01fd6bc10ec9cf351102d06b0c8bf8e2c458c

Modified:
    incubator/ooo/trunk/main/sw/source/filter/rtf/rtffld.cxx

Modified: incubator/ooo/trunk/main/sw/source/filter/rtf/rtffld.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sw/source/filter/rtf/rtffld.cxx?rev=1172113&r1=1172112&r2=1172113&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sw/source/filter/rtf/rtffld.cxx (original)
+++ incubator/ooo/trunk/main/sw/source/filter/rtf/rtffld.cxx Sat Sep 17 22:39:20 2011
@@ -1092,7 +1092,9 @@ void SwRTFParser::ReadField()
 											SwFmtINetFmt( sFieldNm, sTarget ),
 											nsSetAttrMode::SETATTR_DONTEXPAND );
 							pPam->DeleteMark();
-
+                            // #i117947#: insert result only once in case
+                            // field result is followed by invalid tokens
+                            sFieldStr.Erase();
 						}
 						break;
 					}



Mime
View raw message