[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-09-15 19:38:37
Message-ID: 20100915193837.ACCA5AC871 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1175749 by lassin:

Changed pptx layout frames to come earlier so that they act better as background as
their original purpose is.


 M  +9 -9      PptxXmlSlideReader.cpp  


--- trunk/koffice/filters/kpresenter/pptx/PptxXmlSlideReader.cpp #1175748:1175749
@@ -1158,6 +1158,15 @@
 
     d->shapeNumber = 0;
 
+    // Adding extra 'inherited' frames from layout
+    if (m_context->type == Slide) {
+        int index = 0;
+        while (index < m_context->slideLayoutProperties->layoutFrames.size()) {
+            body->addCompleteElement(m_context->slideLayoutProperties->layoutFrames.at(index).toLatin1());
 +            ++index;
+        }
+    }
+
     QByteArray placeholderEl;
     QBuffer placeholderElBuffer(&placeholderEl);
     placeholderElBuffer.open(QIODevice::WriteOnly);
@@ -1178,15 +1187,6 @@
         }
     }
 
-    // Adding extra 'inherited' frames from layout
-    if (m_context->type == Slide) {
-        int index = 0;
-        while (index < m_context->slideLayoutProperties->layoutFrames.size()) {
-            body->addCompleteElement(m_context->slideLayoutProperties->layoutFrames.at(index).toLatin1());
                
-            ++index;
-        }
-    }
-
     placeholderElBuffer.close();
     m_currentPresentationPageLayoutStyle.addProperty(
         QString(), QString::fromUtf8(placeholderEl), KoGenStyle::StyleChildElement);


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