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

List:       kde-commits
Subject:    koffice/kpresenter/part
From:       Sebastian Sauer <mail () dipe ! org>
Date:       2010-10-13 16:07:50
Message-ID: 20101013160750.4EEBCAC895 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1185530 by sebsauer:

Fix crash.

[KCrash Handler]
#6  0x00007fac17497dee in KoShape::d_func (this=0x0) at \
/home/kdab/src/kde/trunk/koffice/libs/flake/KoShape.h:953 #7  0x00007fac17491692 in \
KoShape::userData (this=0x0) at \
/home/kdab/src/kde/trunk/koffice/libs/flake/KoShape.cpp:549 #8  0x00007fac04ed886f in \
KPrPlaceholderTextStrategy::saveOdf (this=0xda2520, context=...) at \
/home/kdab/src/kde/trunk/koffice/kpresenter/part/KPrPlaceholderTextStrategy.cpp:108 \
#9  0x00007fac04ed6a97 in KPrPlaceholderShape::saveOdf (this=0xda2410, context=...) \
at /home/kdab/src/kde/trunk/koffice/kpresenter/part/KPrPlaceholderShape.cpp:86 #10 \
0x00007fac174c2ad1 in KoShapeLayer::saveOdf (this=0xfa7400, context=...) at \
/home/kdab/src/kde/trunk/koffice/libs/flake/KoShapeLayer.cpp:68 #11 \
0x00007fac04c36bae in KoPAPageBase::saveOdfShapes (this=0xddb970, context=...) at \
/home/kdab/src/kde/trunk/koffice/libs/kopageapp/KoPAPageBase.cpp:114 #12 \
0x00007fac04c36844 in KoPAPageBase::saveOdfPageContent (this=0xddb970, paContext=...) \
at /home/kdab/src/kde/trunk/koffice/libs/kopageapp/KoPAPageBase.cpp:83 #13 \
0x00007fac04c38964 in KoPAMasterPage::saveOdf (this=0xddb970, context=...) at \
/home/kdab/src/kde/trunk/koffice/libs/kopageapp/KoPAMasterPage.cpp:70 #14 \
0x00007fac04c1f59d in KoPADocument::saveOdfPages (this=0x74c8c0, paContext=..., \
pages=..., masterPages=...) at \
/home/kdab/src/kde/trunk/koffice/libs/kopageapp/KoPADocument.cpp:298 #15 \
0x00007fac04c3e347 in KoPAPastePage::process (this=0x7fff07ae5000, body=..., \
odfStore=...) at /home/kdab/src/kde/trunk/koffice/libs/kopageapp/KoPAPastePage.cpp:90 \
#16 0x00007fac171c2941 in KoOdfPaste::paste (this=0x7fff07ae5000, \
documentType=KoOdf::Presentation, bytes=...) at \
/home/kdab/src/kde/trunk/koffice/libs/odf/KoOdfPaste.cpp:80 #17 0x00007fac171c2516 in \
KoOdfPaste::paste (this=0x7fff07ae5000, documentType=KoOdf::Presentation, \
data=0xce4c50) at /home/kdab/src/kde/trunk/koffice/libs/odf/KoOdfPaste.cpp:45 #18 \
0x00007fac04c2974b in KoPAView::pagePaste (this=0x9a76c0) at \
/home/kdab/src/kde/trunk/koffice/libs/kopageapp/KoPAView.cpp:473 #19 \
0x00007fac04c490f5 in KoPADocumentStructureDocker::editPaste (this=0xff87a0) at \
/home/kdab/src/kde/trunk/koffice/libs/kopageapp/KoPADocumentStructureDocker.cpp:699



 M  +2 -0      KPrPlaceholderTextStrategy.cpp  


--- trunk/koffice/kpresenter/part/KPrPlaceholderTextStrategy.cpp #1185529:1185530
@@ -105,6 +105,7 @@
 
 void KPrPlaceholderTextStrategy::saveOdf( KoShapeSavingContext & context )
 {
+    if (m_textShape) {
     if (KoTextShapeData *shapeData = \
                qobject_cast<KoTextShapeData*>(m_textShape->userData())) {
         KoStyleManager *styleManager = \
                KoTextDocument(shapeData->document()).styleManager();
         KoTextShapeData *shapeData = \
qobject_cast<KoTextShapeData*>(m_textShape->userData()); @@ -115,6 +116,7 @@
             context.xmlWriter().addAttribute("draw:text-style-name", styleName);
         }
     }
+    }
     KPrPlaceholderStrategy::saveOdf( context );
 }
 


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