[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:39
Message-ID: 20101116053139.D92FEAC8AC () svn ! kde ! org
[Download RAW message or body]

SVN commit 1197580 by clicea:

Do read insideV and insideH.

 M  +89 -45    MsooXmlDrawingTableStyleReader.cpp  
 M  +4 -4      MsooXmlDrawingTableStyleReader.h  


--- branches/work/koffice-essen/filters/libmsooxml/MsooXmlDrawingTableStyleReader.cpp #1197579:1197580
@@ -198,13 +198,13 @@
         if(isStartElement()) {
             TRY_READ_IF(bottom)
 //             ELSE_TRY_READ_IF(extLst)
-//             ELSE_TRY_READ_IF(insideH)
-//             ELSE_TRY_READ_IF(insideV)
+            ELSE_TRY_READ_IF(insideH)
+            ELSE_TRY_READ_IF(insideV)
             ELSE_TRY_READ_IF(left)
             ELSE_TRY_READ_IF(right)
-//             ELSE_TRY_READ_IF(tl2br)
+            ELSE_TRY_READ_IF(tl2br)
             ELSE_TRY_READ_IF(top)
-//             ELSE_TRY_READ_IF(tr2bl)
+            ELSE_TRY_READ_IF(tr2bl)
 //             ELSE_WRONG_FORMAT
         }
     }
@@ -300,49 +300,93 @@
     READ_EPILOGUE
 }
 
-// #undef CURRENT_EL
-// #define CURRENT_EL tl2br
-// KoFilter::ConversionStatus MsooXmlDrawingTableStyleReader::read_tl2br()
-// {
-//     READ_PROLOGUE
-// 
-//     while(!atEnd()) {
-//         if(isStartElement()) {
-//             if(QUALIFIED_NAME_IS(ln)) {
-//                 TRY_READ(Table_ln)
-//                 m_currentTableStyleProperties->tl2br = m_currentBorder;
-//             }
-// //             ELSE_TRY_READ_IF(lnRef)
-// //             ELSE_WRONG_FORMAT
-//         }
-//         BREAK_IF_END_OF(CURRENT_EL);
-//     }
-// 
-//     READ_EPILOGUE
-// }
-// 
-// #undef CURRENT_EL
-// #define CURRENT_EL tr2bl
-// KoFilter::ConversionStatus MsooXmlDrawingTableStyleReader::read_tr2bl()
-// {
-//     READ_PROLOGUE
-// 
-//     while(!atEnd()) {
-//         if(isStartElement()) {
-//             if(QUALIFIED_NAME_IS(ln)) {
-//                 TRY_READ(Table_ln)
-//                 m_currentTableStyleProperties->tr2bl = m_currentBorder;
-//             }
-// //             ELSE_TRY_READ_IF(lnRef)
-// //             ELSE_WRONG_FORMAT
-//         }
-//         BREAK_IF_END_OF(CURRENT_EL);
-//     }
-// 
-//     READ_EPILOGUE
-// }
+#undef CURRENT_EL
+#define CURRENT_EL tl2br
+KoFilter::ConversionStatus MsooXmlDrawingTableStyleReader::read_tl2br()
+{
+    READ_PROLOGUE
 
+    while(!atEnd()) {
+        if(isStartElement()) {
+            if(QUALIFIED_NAME_IS(ln)) {
+                TRY_READ(Table_ln)
+                m_currentTableStyleProperties->tl2br = m_currentBorder;
+            }
+//             ELSE_TRY_READ_IF(lnRef)
+//             ELSE_WRONG_FORMAT
+        }
+        BREAK_IF_END_OF(CURRENT_EL);
+    }
+
+    READ_EPILOGUE
+}
+
 #undef CURRENT_EL
+#define CURRENT_EL tr2bl
+KoFilter::ConversionStatus MsooXmlDrawingTableStyleReader::read_tr2bl()
+{
+    READ_PROLOGUE
+
+    while(!atEnd()) {
+        if(isStartElement()) {
+            if(QUALIFIED_NAME_IS(ln)) {
+                TRY_READ(Table_ln)
+                m_currentTableStyleProperties->tr2bl = m_currentBorder;
+            }
+//             ELSE_TRY_READ_IF(lnRef)
+//             ELSE_WRONG_FORMAT
+        }
+        BREAK_IF_END_OF(CURRENT_EL);
+    }
+
+    READ_EPILOGUE
+}
+
+#undef CURRENT_EL
+#define CURRENT_EL insideV
+KoFilter::ConversionStatus MsooXmlDrawingTableStyleReader::read_insideV()
+{
+    READ_PROLOGUE
+
+    while(!atEnd()) {
+        readNext();
+        BREAK_IF_END_OF(CURRENT_EL);
+        if(isStartElement()) {
+            if(QUALIFIED_NAME_IS(ln)) {
+                TRY_READ(Table_ln)
+                m_currentTableStyleProperties->insideV = m_currentBorder;
+            }
+//             ELSE_TRY_READ_IF(lnRef)
+//             ELSE_WRONG_FORMAT
+        }
+    }
+
+    READ_EPILOGUE
+}
+
+#undef CURRENT_EL
+#define CURRENT_EL insideH
+KoFilter::ConversionStatus MsooXmlDrawingTableStyleReader::read_insideH()
+{
+    READ_PROLOGUE
+
+    while(!atEnd()) {
+        readNext();
+        BREAK_IF_END_OF(CURRENT_EL);
+        if(isStartElement()) {
+            if(QUALIFIED_NAME_IS(ln)) {
+                TRY_READ(Table_ln)
+                m_currentTableStyleProperties->insideH = m_currentBorder;
+            }
+//             ELSE_TRY_READ_IF(lnRef)
+//             ELSE_WRONG_FORMAT
+        }
+    }
+
+    READ_EPILOGUE
+}
+
+#undef CURRENT_EL
 #define CURRENT_EL ln
 KoFilter::ConversionStatus MsooXmlDrawingTableStyleReader::read_Table_ln()
 {
--- branches/work/koffice-essen/filters/libmsooxml/MsooXmlDrawingTableStyleReader.h #1197579:1197580
@@ -70,10 +70,10 @@
     KoFilter::ConversionStatus read_left();
     KoFilter::ConversionStatus read_right();
     KoFilter::ConversionStatus read_top();
-//     KoFilter::ConversionStatus read_insideV();
-//     KoFilter::ConversionStatus read_insideH();
-//     KoFilter::ConversionStatus read_tl2br();
-//     KoFilter::ConversionStatus read_tr2bl();
+    KoFilter::ConversionStatus read_insideV();
+    KoFilter::ConversionStatus read_insideH();
+    KoFilter::ConversionStatus read_tl2br();
+    KoFilter::ConversionStatus read_tr2bl();
     KoFilter::ConversionStatus read_tcBdr();
     KoFilter::ConversionStatus read_Table_ln();
 
[prev in list] [next in list] [prev in thread] [next in thread]