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

List:       kde-commits
Subject:    branches/work/koffice-essen/filters/kpresenter/pptx
From:       Carlos Licea <carlos_licea () hotmail ! com>
Date:       2010-11-26 6:42:53
Message-ID: 20101126064253.1CBB0AC8A2 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1200889 by clicea:

Don't copy the default style when the level is 0. That means that we actually
have no list.
I didn't remove the qMax as that shields us on negative levels.

@sebastian: ok?

CCMAIL:mail@dipe.org

 M  +6 -0      PptxXmlSlideReader.cpp  


--- branches/work/koffice-essen/filters/kpresenter/pptx/PptxXmlSlideReader.cpp #1200888:1200889
@@ -1901,6 +1901,9 @@
 
 void PptxXmlSlideReader::inheritDefaultTextStyle(KoGenStyle& targetStyle)
 {
+    if(m_currentListLevel == 1)
+        return;
+
     const int listLevel = qMax(1, m_currentListLevel);
     if (m_context->defaultTextStyles.size() >= listLevel) {
         MSOOXML::Utils::copyPropertiesFromStyle(m_context->defaultTextStyles[listLevel-1],
@@ -1949,6 +1952,9 @@
 
 void PptxXmlSlideReader::inheritTextStyle(KoGenStyle& targetStyle)
 {
+    if(m_currentListLevel == 1)
+        return;
+
     const int listLevel = qMax(1, m_currentListLevel); // if m_currentListLevel==0 then use level1
 
     // Idx must be first for masterslide, due to initial use case
[prev in list] [next in list] [prev in thread] [next in thread]