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

List:       kde-commits
Subject:    koffice/filters/libmsooxml
From:       Lassi Taneli Nieminen <lassniem () gmail ! com>
Date:       2010-10-25 10:40:10
Message-ID: 20101025104010.9E779AC89A () svn ! kde ! org
[Download RAW message or body]

SVN commit 1189583 by lassin:

Fixed drawingml table row height & background color.


 M  +17 -10    MsooXmlDrawingReaderTableImpl.h  


--- trunk/koffice/filters/libmsooxml/MsooXmlDrawingReaderTableImpl.h #1189582:1189583
@@ -225,7 +225,7 @@
 
     const QXmlStreamAttributes attrs(attributes());
     READ_ATTR_WITHOUT_NS(h)
-    m_currentTableRowStyle.addProperty("style:row-height", \
MSOOXML::Utils::EMU_to_ODF(h), KoGenStyle::TableRowType); +    \
m_currentTableRowStyle.addProperty("style:min-row-height", \
MSOOXML::Utils::EMU_to_ODF(h), KoGenStyle::TableRowType);  
     while (!atEnd()) {
         readNext();
@@ -354,14 +354,13 @@
 //     //! @todo real border style get from w:tblPr/w:tblStyle@w:val
 //     //m_currentTableCellStyle.addProperty("fo:border", "0.5pt solid #000000");
 // 
-//     const QString tableCellStyleName(
-//         mainStyles->insert(
-//             m_currentTableCellStyle,
-//             m_currentTableName + '.' + \
                MSOOXML::Utils::columnName(m_currentTableColumnNumber)
-//                 + QString::number(m_currentTableRowNumber + 1),
-//             KoGenStyles::DontAddNumberToName)
-//     );
-//     body->addAttribute("table:style-name", tableCellStyleName);
+     const QString tableCellStyleName(
+         mainStyles->insert(
+             m_currentTableCellStyle,
+             m_currentTableName + '.' + \
MSOOXML::Utils::columnName(m_currentTableColumnNumber) +                 + \
QString::number(m_currentTableRowNumber + 1), KoGenStyles::DontAddNumberToName) +     \
); +     body->addAttribute("table:style-name", tableCellStyleName);
 
     body->addAttribute("office:value-type", "string");
 
@@ -379,6 +378,9 @@
 KoFilter::ConversionStatus MSOOXML_CURRENT_CLASS::read_tcPr()
 {
     READ_PROLOGUE
+
+    m_currentColor = QColor();
+
     while (!atEnd()) {
         readNext();
         BREAK_IF_END_OF(CURRENT_EL);
@@ -396,7 +398,12 @@
 //            ELSE_TRY_READ_IF(lnTlToBr)
 //            ELSE_TRY_READ_IF(noFill)
 //            ELSE_TRY_READ_IF(pattFill)
-//            ELSE_TRY_READ_IF(solidFill)
+              if (QUALIFIED_NAME_IS(solidFill)) {
+                  TRY_READ(solidFill)
+                  if (m_currentColor.isValid()) {
+                      m_currentTableCellStyle.addProperty("fo:background-color", \
m_currentColor.name()); +                  }
+              }
 //             ELSE_WRONG_FORMAT
         }
     }


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