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

List:       kde-commits
Subject:    =?utf-8?q?=5Bcalligra=5D_filters/libmsooxml=3A_Pptx_filter=3A_Fi?=
From:       Lassi Nieminen <lassniem () gmail ! com>
Date:       2011-05-25 8:29:08
Message-ID: 20110525082908.3DD57A60A4 () git ! kde ! org
[Download RAW message or body]

Git commit dbbb573cf2b031d2391a11ca6e7954c0532fa901 by Lassi Nieminen.
Committed on 25/05/2011 at 10:28.
Pushed by lassin into branch 'master'.

Pptx filter: Fixed a crash.

M  +5    -7    filters/libmsooxml/MsooXmlCommonReaderDrawingMLImpl.h     

http://commits.kde.org/calligra/dbbb573cf2b031d2391a11ca6e7954c0532fa901

diff --git a/filters/libmsooxml/MsooXmlCommonReaderDrawingMLImpl.h \
b/filters/libmsooxml/MsooXmlCommonReaderDrawingMLImpl.h index 9b37705..a5bf640 100644
--- a/filters/libmsooxml/MsooXmlCommonReaderDrawingMLImpl.h
+++ b/filters/libmsooxml/MsooXmlCommonReaderDrawingMLImpl.h
@@ -5191,9 +5191,6 @@ KoFilter::ConversionStatus MSOOXML_CURRENT_CLASS::read_fld()
 
     TRY_READ_ATTR_WITHOUT_NS(type)
 
-    m_currentTextStyleProperties = new KoCharacterStyle();
-    m_currentTextStyle = KoGenStyle(KoGenStyle::TextAutoStyle, "text");
-
     MSOOXML::Utils::XmlWriteBuffer fldBuf;
     body = fldBuf.setWriter(body);
 
@@ -5209,7 +5206,12 @@ KoFilter::ConversionStatus MSOOXML_CURRENT_CLASS::read_fld()
         BREAK_IF_END_OF(CURRENT_EL)
         if (isStartElement()) {
             if (QUALIFIED_NAME_IS(rPr)) {
+                m_currentTextStyleProperties = new KoCharacterStyle();
+                m_currentTextStyle = KoGenStyle(KoGenStyle::TextAutoStyle, "text");
                 TRY_READ(DrawingML_rPr)
+                m_currentTextStyleProperties->saveOdf(m_currentTextStyle);
+                delete m_currentTextStyleProperties;
+                m_currentTextStyleProperties = 0;
             }
             else if (QUALIFIED_NAME_IS(pPr)) {
                 TRY_READ(DrawingML_pPr)
@@ -5219,7 +5221,6 @@ KoFilter::ConversionStatus MSOOXML_CURRENT_CLASS::read_fld()
         }
     }
 
-    m_currentTextStyleProperties->saveOdf(m_currentTextStyle);
 #ifdef PPTXXMLSLIDEREADER_CPP
     if (m_context->type == SlideMaster || m_context->type == NotesMaster) {
         m_currentTextStyle.setAutoStyleInStylesDotXml(true);
@@ -5246,9 +5247,6 @@ KoFilter::ConversionStatus MSOOXML_CURRENT_CLASS::read_fld()
     body->endElement(); // text:page-number, some date format
     body->endElement(); //text:span
 
-    delete m_currentTextStyleProperties;
-    m_currentTextStyleProperties = 0;
-
     READ_EPILOGUE
 }
 


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