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

List:       kde-commits
Subject:    [Calligra] 8a99bb8: PPT: Filter update.
From:       Matus Uzak <matus.uzak () ixonos ! com>
Date:       2010-12-10 14:30:19
Message-ID: 20101210143019.5FD19A60AE () git ! kde ! org
[Download RAW message or body]

commit 8a99bb887020f217174e04413ac3dde0622858a3
branch master
Author: Matus Uzak <matus.uzak@ixonos.com>
Date:   Fri Dec 10 15:23:57 2010 +0100

    PPT: Filter update.
    
        Added rules for inheritance of text properties for Tx_TYPE_BODY.
        Added support for another bullet character.

diff --git a/filters/kpresenter/powerpoint/PptToOdp.cpp b/filters/kpresenter/powerpoint/PptToOdp.cpp
index 7a78767..56eb6d1 100644
--- a/filters/kpresenter/powerpoint/PptToOdp.cpp
+++ b/filters/kpresenter/powerpoint/PptToOdp.cpp
@@ -1339,8 +1339,8 @@ void PptToOdp::defineListStyle(KoGenStyle& style, quint8 depth,
 
 QChar
 getBulletChar(const PptTextPFRun& pf) {
-    quint16 v = (quint16)pf.bulletChar();
-    if (v == 0xf06c) { // 0xF06C from windings is similar to ●
+    quint16 v = (quint16) pf.bulletChar();
+    if ((v == 0xf06c) || (v == 0x006c)) { // 0xF06C from windings is similar to ●
         return QChar(0x25cf); //  "●"
     }
     if (v == 0xf02d) { // 0xF02D from symbol is similar to –
diff --git a/filters/kpresenter/powerpoint/pptstyle.cpp b/filters/kpresenter/powerpoint/pptstyle.cpp
index b32863b..ee640c3 100644
--- a/filters/kpresenter/powerpoint/pptstyle.cpp
+++ b/filters/kpresenter/powerpoint/pptstyle.cpp
@@ -149,14 +149,16 @@ const TextMasterStyleLevel* getBaseLevel(const MasterOrSlideContainer* m,
     const TextMasterStyleAtom* ms = 0;
     const TextMasterStyleLevel* ml = 0;
 
-    //NOTE: following rules were discussed at the Office File Formats Forum
+    //NOTE: following rules were discussed at the Office File Formats Forum,
+    //fine tuning is still required
 
     if (textType == Tx_TYPE_CENTERTITLE) {
         ms = getTextMasterStyleAtom(m, Tx_TYPE_TITLE);
         ml = getTextMasterStyleLevel(ms, level);
     }
     //TODO: fine tuning on test documents required
-    else if (textType == Tx_TYPE_CENTERBODY ||
+    else if (textType == Tx_TYPE_BODY ||
+             textType == Tx_TYPE_CENTERBODY ||
              textType == Tx_TYPE_HALFBODY ||
              textType == Tx_TYPE_QUARTERBODY)
     {
[prev in list] [next in list] [prev in thread] [next in thread]