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

List:       kde-commits
Subject:    koffice/filters/kword/rtf/export
From:       Nicolas Goutte <nicolasg () snafu ! de>
Date:       2003-09-08 23:07:03
[Download RAW message or body]

CVS commit by goutte: 

Fix export of variables to fields
CCMAIL:52804-close@bugs.kde.org


  M +14 -6     ExportFilter.cc   2.79


--- koffice/filters/kword/rtf/export/ExportFilter.cc  #2.78:2.79
@@ -432,10 +432,14 @@ QString RTFWorker::ProcessParagraphData 
                 {
                    // ### TODO: fixed/variable date, exact custom formats
-                   str += "{\\field{\\*\\fldinst{DATE \\\\* MERGEFORMAT }}}";
+                   str += "{\\field{\\*\\fldinst DATE \\\\* MERGEFORMAT }{\\fldrslt ";
+                   str += escapeRtfText((*paraFormatDataIt).variable.m_text);
+                   str += "}}";
                 }
                 else if (2==(*paraFormatDataIt).variable.m_type) // time
                 {
                    // ### TODO: fixed/variable time, exact custom formats
-                   str += "{\\field{\\*\\fldinst{TIME \\\\* MERGEFORMAT }}}";
+                   str += "{\\field{\\*\\fldinst TIME \\\\* MERGEFORMAT }{\\fldrslt ";
+                   str += escapeRtfText((*paraFormatDataIt).variable.m_text);
+                   str += "}}";
                 }
                 else if (4==(*paraFormatDataIt).variable.m_type)
@@ -444,9 +448,13 @@ QString RTFWorker::ProcessParagraphData 
                     if ((*paraFormatDataIt).variable.isPageNumber())
                     {
-                        str += "{\\field{\\*\\fldinst{PAGE \\\\* MERGEFORMAT }}}";
+                        str += "{\\field{\\*\\fldinst PAGE \\\\* MERGEFORMAT }{\\fldrslt ";
+                        str += escapeRtfText((*paraFormatDataIt).variable.m_text);
+                        str += "}}";
                     }
                     else if ((*paraFormatDataIt).variable.isPageCount())
                     {
-                        str += "{\\field{\\*\\fldinst{NUMPAGES \\\\* MERGEFORMAT }}}";
+                        str += "{\\field{\\*\\fldinst NUMPAGES \\\\* MERGEFORMAT }{\\fldrslt ";
+                        str += escapeRtfText((*paraFormatDataIt).variable.m_text);
+                        str += "}}";
                     }
                     else


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

Configure | About | News | Add a list | Sponsored by KoreLogic