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

List:       kde-commits
Subject:    koffice/filters/kword/rtf/export
From:       Johannes Wilm <johanneswilm () yahoo ! no>
Date:       2003-09-26 5:58:25
[Download RAW message or body]

CVS commit by wilm: 

Fixes inline picture support that was broken after last (2.90) patch - 
it puts them back inside of paragraphs.


  M +20 -20    ExportFilter.cc   2.91


--- koffice/filters/kword/rtf/export/ExportFilter.cc  #2.90:2.91
@@ -680,4 +680,8 @@ QString RTFWorker::ProcessParagraphData 
                 // We have an image, a clipart or a table
 
+                if (6==(*paraFormatDataIt).frameAnchor.type)
+                {
+
+
                 if (!content.isEmpty())
                 {
@@ -688,19 +692,15 @@ QString RTFWorker::ProcessParagraphData 
                 str += "}";
                 str += m_eol;
-                content="";
+                        content = QString::null;
                 if (!m_inTable)
                 {
-                    m_prefix="\\par";
+                            m_prefix = "\\par";
                 }
                 } 
-                
-                if (6==(*paraFormatDataIt).frameAnchor.type)
-                {
-
                     str += makeTable((*paraFormatDataIt).frameAnchor);
                 }
                 else if (2==(*paraFormatDataIt).frameAnchor.type)
                 {
-                    str += makeImage((*paraFormatDataIt).frameAnchor);
+                    content += makeImage((*paraFormatDataIt).frameAnchor);
                 
                 }


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