pptshapecontext.cxx (ca5ec200) pptshapecontext.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

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

159 {
160 oox::drawingml::ShapePtr pPlaceholder;
161 if ( eShapeLocation == Layout ) // for layout objects the referenced object can be found within the same shape tree
162 pPlaceholder = findPlaceholder( nFirstPlaceholder, nSecondPlaceholder, -1, mpSlidePersistPtr->getShapes()->getChildren() );
163 else if ( eShapeLocation == Slide ) // normal slide shapes have to search within the corresponding master tree for referenced objects
164 {
165 SlidePersistPtr pMasterPersist( mpSlidePersistPtr->getMasterPersist() );
166 if ( pMasterPersist.get() )
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

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

159 {
160 oox::drawingml::ShapePtr pPlaceholder;
161 if ( eShapeLocation == Layout ) // for layout objects the referenced object can be found within the same shape tree
162 pPlaceholder = findPlaceholder( nFirstPlaceholder, nSecondPlaceholder, -1, mpSlidePersistPtr->getShapes()->getChildren() );
163 else if ( eShapeLocation == Slide ) // normal slide shapes have to search within the corresponding master tree for referenced objects
164 {
165 SlidePersistPtr pMasterPersist( mpSlidePersistPtr->getMasterPersist() );
166 if ( pMasterPersist.get() )
167 pPlaceholder = findPlaceholder( nFirstPlaceholder, nSecondPlaceholder,
168 pPPTShapePtr->getSubTypeIndex(), pMasterPersist->getShapes()->getChildren() );
167 {
168 if ( mpSlidePersistPtr->isNotesPage() )
169 pPlaceholder = findPlaceholder( nFirstPlaceholder, nSecondPlaceholder, -1, pMasterPersist->getShapes()->getChildren() );
170 else
171 pPlaceholder = findPlaceholder( nFirstPlaceholder, nSecondPlaceholder,
172 pPPTShapePtr->getSubTypeIndex(), pMasterPersist->getShapes()->getChildren() );
173 }
169 }
170 if ( pPlaceholder.get() )
171 {
172 mpShapePtr->applyShapeReference( *pPlaceholder.get() );
173 PPTShape* pPPTShape = dynamic_cast< PPTShape* >( pPlaceholder.get() );
174 if ( pPPTShape )
175 pPPTShape->setReferenced( sal_True );
176 }

--- 36 unchanged lines hidden --- 		174 }
175 if ( pPlaceholder.get() )
176 {
177 mpShapePtr->applyShapeReference( *pPlaceholder.get() );
178 PPTShape* pPPTShape = dynamic_cast< PPTShape* >( pPlaceholder.get() );
179 if ( pPPTShape )
180 pPPTShape->setReferenced( sal_True );
181 }

--- 36 unchanged lines hidden ---