presentationfragmenthandler.cxx (ca5ec200) presentationfragmenthandler.cxx (4b2c1a94)
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 254 unchanged lines hidden (view full) ---

263 if ( xPresentationPage.is() )
264 {
265 Reference< XDrawPage > xNotesPage( xPresentationPage->getNotesPage() );
266 if ( xNotesPage.is() )
267 {
268 SlidePersistPtr pNotesPersistPtr( new SlidePersist( rFilter, sal_False, sal_True, xNotesPage,
269 ShapePtr( new PPTShape( Slide, "com.sun.star.drawing.GroupShape" ) ), mpTextListStyle ) );
270 FragmentHandlerRef xNotesFragmentHandler( new SlideFragmentHandler( getFilter(), aNotesFragmentPath, pNotesPersistPtr, Slide ) );
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 254 unchanged lines hidden (view full) ---

263 if ( xPresentationPage.is() )
264 {
265 Reference< XDrawPage > xNotesPage( xPresentationPage->getNotesPage() );
266 if ( xNotesPage.is() )
267 {
268 SlidePersistPtr pNotesPersistPtr( new SlidePersist( rFilter, sal_False, sal_True, xNotesPage,
269 ShapePtr( new PPTShape( Slide, "com.sun.star.drawing.GroupShape" ) ), mpTextListStyle ) );
270 FragmentHandlerRef xNotesFragmentHandler( new SlideFragmentHandler( getFilter(), aNotesFragmentPath, pNotesPersistPtr, Slide ) );
271 // import notesMaster slide for notes slide shapes format
272 OUString aNotesMasterFragmentPath = xNotesFragmentHandler->getFragmentPathFromFirstType( CREATE_OFFICEDOC_RELATION_TYPE( "notesMaster" ) );
273 SlidePersistPtr pNotesMasterPersistPtr( new SlidePersist( rFilter, sal_True/*sal_False*/, sal_True, xNotesPage,
274 ShapePtr( new PPTShape( Slide, "com.sun.star.drawing.GroupShape" ) ), mpTextListStyle ) );
275 FragmentHandlerRef xNotesMasterFragmentHandler( new SlideFragmentHandler( getFilter(), aNotesMasterFragmentPath, pNotesMasterPersistPtr, Slide ) );
276 importSlide( xNotesMasterFragmentHandler, pNotesMasterPersistPtr );
277 pNotesMasterPersistPtr->createXShapes( rFilter );
278 pNotesPersistPtr->setMasterPersist(pNotesMasterPersistPtr);
271 rFilter.getNotesPages().push_back( pNotesPersistPtr );
272 rFilter.setActualSlidePersist( pNotesPersistPtr );
273 importSlide( xNotesFragmentHandler, pNotesPersistPtr );
274 pNotesPersistPtr->createBackground( rFilter );
275 pNotesPersistPtr->createXShapes( rFilter );
276 }
277 }
278 }

--- 111 unchanged lines hidden --- 		279 rFilter.getNotesPages().push_back( pNotesPersistPtr );
280 rFilter.setActualSlidePersist( pNotesPersistPtr );
281 importSlide( xNotesFragmentHandler, pNotesPersistPtr );
282 pNotesPersistPtr->createBackground( rFilter );
283 pNotesPersistPtr->createXShapes( rFilter );
284 }
285 }
286 }

--- 111 unchanged lines hidden ---