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

List:       kde-commits
Subject:    branches/work/koffice-essen/filters/libmsooxml
From:       Carlos Licea <carlos_licea () hotmail ! com>
Date:       2010-11-16 5:31:23
Message-ID: 20101116053123.D0448AC8A7 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1197575 by clicea:

Actually add the properties to the style.

 M  +10 -6     MsooXmlDrawingTableStyleReader.cpp  
 M  +1 -1      MsooXmlDrawingTableStyleReader.h  


--- branches/work/koffice-essen/filters/libmsooxml/MsooXmlDrawingTableStyleReader.cpp #1197574:1197575
@@ -140,6 +140,8 @@
 {
     READ_PROLOGUE
 
+    m_currentTableStyleProperties = new TableStyleProperties;
+
     while(!atEnd()) {
         readNext();
         BREAK_IF_END_OF(CURRENT_EL);
@@ -150,6 +152,8 @@
         }
     }
 
+    m_currentStyle.addProperties(TableStyle::WholeTbl, m_currentTableStyleProperties);
+
     READ_EPILOGUE
 }
 
@@ -220,7 +224,7 @@
         if(isStartElement()) {
             if(QUALIFIED_NAME_IS(ln)) {
                 TRY_READ(Table_ln)
-                m_currentTableStyleProperties.bottom = m_currentBorder;
+                m_currentTableStyleProperties->bottom = m_currentBorder;
             }
 //             ELSE_TRY_READ_IF(lnRef)
 //             ELSE_WRONG_FORMAT
@@ -242,7 +246,7 @@
         if(isStartElement()) {
             if(QUALIFIED_NAME_IS(ln)) {
                 TRY_READ(Table_ln)
-                m_currentTableStyleProperties.top = m_currentBorder;
+                m_currentTableStyleProperties->top = m_currentBorder;
             }
 //             ELSE_TRY_READ_IF(lnRef)
 //             ELSE_WRONG_FORMAT
@@ -264,7 +268,7 @@
         if(isStartElement()) {
             if(QUALIFIED_NAME_IS(ln)) {
                 TRY_READ(Table_ln)
-                m_currentTableStyleProperties.left = m_currentBorder;
+                m_currentTableStyleProperties->left = m_currentBorder;
             }
 //             ELSE_TRY_READ_IF(lnRef)
 //             ELSE_WRONG_FORMAT
@@ -286,7 +290,7 @@
         if(isStartElement()) {
             if(QUALIFIED_NAME_IS(ln)) {
                 TRY_READ(Table_ln)
-                m_currentTableStyleProperties.right = m_currentBorder;
+                m_currentTableStyleProperties->right = m_currentBorder;
             }
 //             ELSE_TRY_READ_IF(lnRef)
 //             ELSE_WRONG_FORMAT
@@ -306,7 +310,7 @@
 //         if(isStartElement()) {
 //             if(QUALIFIED_NAME_IS(ln)) {
 //                 TRY_READ(Table_ln)
-//                 m_currentTableStyleProperties.tl2br = m_currentBorder;
+//                 m_currentTableStyleProperties->tl2br = m_currentBorder;
 //             }
 // //             ELSE_TRY_READ_IF(lnRef)
 // //             ELSE_WRONG_FORMAT
@@ -327,7 +331,7 @@
 //         if(isStartElement()) {
 //             if(QUALIFIED_NAME_IS(ln)) {
 //                 TRY_READ(Table_ln)
-//                 m_currentTableStyleProperties.tr2bl = m_currentBorder;
+//                 m_currentTableStyleProperties->tr2bl = m_currentBorder;
 //             }
 // //             ELSE_TRY_READ_IF(lnRef)
 // //             ELSE_WRONG_FORMAT
--- branches/work/koffice-essen/filters/libmsooxml/MsooXmlDrawingTableStyleReader.h #1197574:1197575
@@ -85,7 +85,7 @@
 
     TableStyle m_currentStyle;
     KoBorder::BorderData m_currentBorder;
-    TableStyleProperties m_currentTableStyleProperties;
+    TableStyleProperties* m_currentTableStyleProperties;
 };
 
 }
[prev in list] [next in list] [prev in thread] [next in thread]