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

List:       kde-commits
Subject:    koffice/filters/kpresenter/pptx
From:       Lassi Taneli Nieminen <lassniem () gmail ! com>
Date:       2010-11-29 12:40:32
Message-ID: 20101129124032.72585AC8A4 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1202023 by lassin:

Disabled some drawingML bodyPr inheritance as it was causing damage in some cases. \
Still need to figure out what the correct behavior is.


 M  +12 -2     PptxXmlSlideReader.cpp  


--- trunk/koffice/filters/kpresenter/pptx/PptxXmlSlideReader.cpp #1202022:1202023
@@ -1595,6 +1595,16 @@
 
 void PptxXmlSlideReader::inheritBodyProperties()
 {
+    // TODO:This might not be 100% correct, it is here only temporary until it is \
figured out what is the correct action plan +    // in the following case:
+    // slide phIdx = "2", no bodyPr, slideLayout phIdx = "2", no BodyPr, slideMaster \
phIdx = "2" phType = "dt", bodyPr +    // For looking at msoffice behavior, the \
bodyPr from master was not used in the actual slide +    // It was also noted that \
bullet character that was used in the slide, was either MSOffice default (mentioned \
nowhere) +    // or somehow gotten from bodyStyles in slidemaster (also not mentioned \
anywhere why this would happen) +    if (d->phType.isEmpty()) {
+        return;
+    }
+
     if (m_context->type == SlideMaster) {
         return; // Nothing needed for slidemaster
     }
@@ -1630,7 +1640,7 @@
              }
         }
     }
-    else if (!d->phType.isEmpty()) {
+    if (!d->phType.isEmpty()) {
         // In all cases, we take them first from masterslide
         position = m_context->slideMasterPageProperties->textShapePositions.value(d->phType);
  if (!position.isEmpty()) {
@@ -1688,7 +1698,7 @@
              }
         }
     }
-    else if (!d->phIdx.isEmpty()) {
+    if (!d->phIdx.isEmpty()) {
         position = m_context->slideLayoutProperties->textShapePositions.value(d->phIdx);
  if (!position.isEmpty()) {
             m_shapeTextPosition = position;


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