Git commit 2fbec5968cb6e1aa6ca72aee9a041e1f4ac10d72 by Thorsten Zachmann. Committed on 03/03/2012 at 20:42. Pushed by zachmann into branch 'master'.
Fix breakage in of display of master shapes. Remove stuff that was committed in the xml:id patch but does not belong there. Looks like a merge error. This fixes the problem that the shapes of the master page are shown even if they should not be displayed. Can someone please review so I can backport. CCMAIL: calligra-devel@kde.org M +0 -15 filters/stage/pptx/PptxXmlSlideReader.cpp http://commits.kde.org/calligra/2fbec5968cb6e1aa6ca72aee9a041e1f4ac10d72 diff --git a/filters/stage/pptx/PptxXmlSlideReader.cpp b/filters/stage/pptx/PptxXmlSlideReader.cpp index cb0a653..bd2265f 100644 --- a/filters/stage/pptx/PptxXmlSlideReader.cpp +++ b/filters/stage/pptx/PptxXmlSlideReader.cpp @@ -629,21 +629,6 @@ KoFilter::ConversionStatus PptxXmlSlideReader::read_sldInternal() body->addAttribute("draw:name", i18n("Slide %1",m_context->slideNumber+1)); //optional; CASE #P303 body->addAttribute("draw:id", QString("pid%1").arg(m_context->slideNumber)); //optional; unique ID; CASE #P305, #P306 body->addAttribute("xml:id", QString("pid%1").arg(m_context->slideNumber)); //optional; unique ID; CASE #P305, #P306 - //! @todo presentation:use-date-time-name //optional; CASE #P304 - - // First check if we have properties from the slide, then from layout, then from master - if (m_currentDrawStyle->isEmpty()) { - KoGenStyle::copyPropertiesFromStyle(m_context->slideLayoutProperties->m_drawingPageProperties, - *m_currentDrawStyle, KoGenStyle::DrawingPageType); - // Only get properties from master page if they were not defined in the layout - if (m_currentDrawStyle->isEmpty()) { - KoGenStyle::copyPropertiesFromStyle(m_context->slideMasterProperties->m_drawingPageProperties, - *m_currentDrawStyle, KoGenStyle::DrawingPageType); - } - } else { - m_currentDrawStyle->addProperty("presentation:visibility", "visible"); - m_currentDrawStyle->addProperty("presentation:background-objects-visible", true); - } const QString currentPageStyleName(mainStyles->insert(*m_currentDrawStyle, "dp")); body->addAttribute("draw:style-name", currentPageStyleName); // CASE #P302 _______________________________________________ calligra-devel mailing list calligra-devel@kde.org https://mail.kde.org/mailman/listinfo/calligra-devel
