Attachment #82913 for issue #124456

View | Details | Raw Unified | Return to issue 124456
Collapse All | Expand All

Lines 273-278 Link Here

(-)oox/source/ppt/presentationfragmenthandler.cxx (+3 lines)
273	SlidePersistPtr pNotesMasterPersistPtr( new SlidePersist( rFilter, sal_True/sal_False/, sal_True, xNotesPage,	273	SlidePersistPtr pNotesMasterPersistPtr( new SlidePersist( rFilter, sal_True/sal_False/, sal_True, xNotesPage,
274	ShapePtr( new PPTShape( Slide, "com.sun.star.drawing.GroupShape" ) ), mpTextListStyle ) );	274	ShapePtr( new PPTShape( Slide, "com.sun.star.drawing.GroupShape" ) ), mpTextListStyle ) );
275	FragmentHandlerRef xNotesMasterFragmentHandler( new SlideFragmentHandler( getFilter(), aNotesMasterFragmentPath, pNotesMasterPersistPtr, Slide ) );	275	FragmentHandlerRef xNotesMasterFragmentHandler( new SlideFragmentHandler( getFilter(), aNotesMasterFragmentPath, pNotesMasterPersistPtr, Slide ) );
		276
		277	// TODO: Theme support is missing, theme pointer in SlidePersist is null and used later
		278
276	importSlide( xNotesMasterFragmentHandler, pNotesMasterPersistPtr );	279	importSlide( xNotesMasterFragmentHandler, pNotesMasterPersistPtr );
277	pNotesMasterPersistPtr->createXShapes( rFilter );	280	pNotesMasterPersistPtr->createXShapes( rFilter );
278	pNotesPersistPtr->setMasterPersist(pNotesMasterPersistPtr);	281	pNotesPersistPtr->setMasterPersist(pNotesMasterPersistPtr);

Lines 141-150 Link Here

(-)oox/source/ppt/slidefragmenthandler.cxx (-4 / +9 lines)
141		141
142	case PPT_TOKEN( bgRef ): // a:CT_StyleMatrixReference	142	case PPT_TOKEN( bgRef ): // a:CT_StyleMatrixReference
143	{	143	{
144	FillPropertiesPtr pFillPropertiesPtr( new FillProperties(	144	oox::drawingml::ThemePtr pTheme = mpSlidePersistPtr->getTheme();
145	*mpSlidePersistPtr->getTheme()->getFillStyle( xAttribs->getOptionalValue( XML_idx ).toInt32() ) ) );	145	if (pTheme)
146	xRet.set( new ColorContext( *this, mpSlidePersistPtr->getBackgroundColor() ) );	146	{
147	mpSlidePersistPtr->setBackgroundProperties( pFillPropertiesPtr );	147	FillPropertiesPtr pFillPropertiesPtr( new FillProperties(
		148	*pTheme->getFillStyle( xAttribs->getOptionalValue( XML_idx ).toInt32() ) ) );
		149	mpSlidePersistPtr->setBackgroundProperties( pFillPropertiesPtr );
		150	}
		151	xRet.set( new ColorContext( *this, mpSlidePersistPtr->getBackgroundColor() ) );
		152
148	}	153	}
149	break;	154	break;
150		155

Return to issue 124456