[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [koffice] filters/kword/rtf/import: Make krazy happy with the rtf
From:       "Dr. Robert Marmorstein" <robert () narnia ! homeunix ! com>
Date:       2011-08-02 9:16:39
Message-ID: 20110802091639.9564CA60DD () git ! kde ! org
[Download RAW message or body]

Git commit a3a7a3129b65f724a33dd2d889aa4330065938b0 by Dr. Robert Marmorstein.
Committed on 02/08/2011 at 04:07.
Pushed by robertm into branch 'master'.

Make krazy happy with the rtf import filter.

M  +3    -3    filters/kword/rtf/import/rtfimport.cpp

http://commits.kde.org/koffice/a3a7a3129b65f724a33dd2d889aa4330065938b0

diff --git a/filters/kword/rtf/import/rtfimport.cpp b/filters/kword/rtf/import/rtfimport.cpp
index ba275d1..33dc578 100644
--- a/filters/kword/rtf/import/rtfimport.cpp
+++ b/filters/kword/rtf/import/rtfimport.cpp
@@ -1639,7 +1639,7 @@ void RTFImport::parseField(RTFProperty *)
                 format.replace("a/p", "ap"); // Approximation
                 format.replace("AM/PM", "AP");
                 format.replace("A/P", "AP"); // Approximation
-                format.remove("'"); // KWord 1.3 cannot protect text in date/time
+                format.remove('\''); // KWord 1.3 cannot protect text in date/time
                 addDateTime(format, (fieldName == "DATE"), fldfmt);
             } else if (fieldName == "IMPORT") {
                 addImportedPicture(list[1]);
@@ -1937,7 +1937,7 @@ void RTFImport::addFormat(DomNode &node, const KWFormat& format, const RTFFormat
             switch (format.fmt.underline) {
             case RTFFormat::UnderlineNone:
             default: {
-                st = "0";
+                st = "0";//krazy:exclude=doublequote_chars
                 underlinecolor = -1; // Reset underline color
                 break;
             }
@@ -1958,7 +1958,7 @@ void RTFImport::addFormat(DomNode &node, const KWFormat& format, const RTFFormat
             case RTFFormat::UnderlineWordByWord: {
                 st = "single";
                 styleline = "solid";
-                wordbyword = "1";
+                wordbyword = "1";//krazy:exclude=doublequote_chars
                 break;
             }
             case RTFFormat::UnderlineDash: {


[prev in list] [next in list] [prev in thread] [next in thread]