Attachment #65498 for issue #106130

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

Lines 610-616 Link Here

(-)svx.orig/inc/svx/svdfppt.hxx (-1 / +1 lines)
610	UINT32& nMappedFontId, Font& rFont, char nDefault ) const;	610	UINT32& nMappedFontId, Font& rFont, char nDefault ) const;
611	const PptDocumentAtom& GetDocumentAtom() const { return aDocAtom; }	611	const PptDocumentAtom& GetDocumentAtom() const { return aDocAtom; }
612	virtual const PptSlideLayoutAtom* GetSlideLayoutAtom() const;	612	virtual const PptSlideLayoutAtom* GetSlideLayoutAtom() const;
613	SdrObject* CreateTable( SdrObject* pGroupObject, sal_uInt32* pTableArry, SvxMSDffSolverContainer* ) const;	613	SdrObject* CreateTable( SdrObject* pGroupObject, sal_uInt32* pTableArry, SvxMSDffSolverContainer* );
614	};	614	};
615		615
616	////////////////////////////////////////////////////////////////////////////////////////////////////	616	////////////////////////////////////////////////////////////////////////////////////////////////////




        delete pWrapPolygon;
}

/* vi:set tabstop=4 shiftwidth=4 expandtab: */

void SvxMSDffManager::insertShapeId( sal_Int32 nShapeId, SdrObject* pShape )
{
	maShapeIdContainer[nShapeId] = pShape;
}

namespace
{
	class IsShape : public std::unary_function<SvxMSDffShapeIdContainer::value_type, bool>
	const SvxMSDffShapeIdContainer::iterator aEnd( maShapeIdContainer.end() );
	while( aIter != aEnd )
	{
		const SdrObject *mpShape;
	public:
		IsShape(const SdrObject *pShape) : mpShape(pShape) {}
		bool operator()(const SvxMSDffShapeIdContainer::value_type& rVal)
		{
			return rVal.second == mpShape;
			break;
		}
	};
}

void SvxMSDffManager::removeShapeId( SdrObject* pShape )
{
        const SvxMSDffShapeIdContainer::iterator aEnd( maShapeIdContainer.end() );
	SvxMSDffShapeIdContainer::iterator aIter = std::find_if(maShapeIdContainer.begin(), aEnd, IsShape(pShape));
	if (aIter != aEnd)
		maShapeIdContainer.erase( aIter );
}

SdrObject* SvxMSDffManager::getShapeForId( sal_Int32 nShapeId )

	SvxMSDffShapeIdContainer::iterator aIter( maShapeIdContainer.find(nShapeId) );
	return aIter != maShapeIdContainer.end() ? (*aIter).second : 0;
}

/* vi:set tabstop=4 shiftwidth=4 expandtab: */




	}
}

SdrObject* SdrPowerPointImport::CreateTable( SdrObject* pGroup, sal_uInt32* pTableArry, SvxMSDffSolverContainer* pSolverContainer )
{
	SdrObject* pRet = pGroup;
	sal_uInt32 nRows = pTableArry[ 1 ];

				pTable->uno_unlock();
				pTable->SetSnapRect( pGroup->GetSnapRect() );
				pRet = pTable;


				//Remove Objects from shape map
				SdrObjListIter aIter( *pGroup, IM_DEEPWITHGROUPS );
				while( aIter.IsMore() )
				{
					SdrObject* pPartObj = aIter.Next();
					removeShapeId( pPartObj );
				}


				SdrObject::Free( pGroup );
			}
			catch( Exception& )

Return to issue 106130

Lines 7957-7981 Link Here

(-)svx.orig/source/msfilter/msdffimp.cxx (-10 / +18 lines)
7957	delete pWrapPolygon;	7957	delete pWrapPolygon;
7958	}	7958	}
7959		7959
7960	/* vi:set tabstop=4 shiftwidth=4 expandtab: */
7961
7962	void SvxMSDffManager::insertShapeId( sal_Int32 nShapeId, SdrObject* pShape )	7960	void SvxMSDffManager::insertShapeId( sal_Int32 nShapeId, SdrObject* pShape )
7963	{	7961	{
7964	maShapeIdContainer[nShapeId] = pShape;	7962	maShapeIdContainer[nShapeId] = pShape;
7965	}	7963	}
7966		7964
7967	void SvxMSDffManager::removeShapeId( SdrObject* pShape )	7965	namespace
7968	{	7966	{
7969	SvxMSDffShapeIdContainer::iterator aIter( maShapeIdContainer.begin() );	7967	class IsShape : public std::unary_function<SvxMSDffShapeIdContainer::value_type, bool>
7970	const SvxMSDffShapeIdContainer::iterator aEnd( maShapeIdContainer.end() );
7971	while( aIter != aEnd )
7972	{	7968	{
7973	if( (*aIter).second == pShape )	7969	const SdrObject *mpShape;
		7970	public:
		7971	IsShape(const SdrObject *pShape) : mpShape(pShape) {}
		7972	bool operator()(const SvxMSDffShapeIdContainer::value_type& rVal)
7974	{	7973	{
7975	maShapeIdContainer.erase( aIter );	7974	return rVal.second == mpShape;
7976	break;
7977	}	7975	}
7978	}	7976	};
		7977	}
		7978
		7979	void SvxMSDffManager::removeShapeId( SdrObject* pShape )
		7980	{
		7981	const SvxMSDffShapeIdContainer::iterator aEnd( maShapeIdContainer.end() );
		7982	SvxMSDffShapeIdContainer::iterator aIter = std::find_if(maShapeIdContainer.begin(), aEnd, IsShape(pShape));
		7983	if (aIter != aEnd)
		7984	maShapeIdContainer.erase( aIter );
7979	}	7985	}
7980		7986
7981	SdrObject* SvxMSDffManager::getShapeForId( sal_Int32 nShapeId )	7987	SdrObject* SvxMSDffManager::getShapeForId( sal_Int32 nShapeId )
Lines 7983-7985 Link Here
7983	SvxMSDffShapeIdContainer::iterator aIter( maShapeIdContainer.find(nShapeId) );	7989	SvxMSDffShapeIdContainer::iterator aIter( maShapeIdContainer.find(nShapeId) );
7984	return aIter != maShapeIdContainer.end() ? (*aIter).second : 0;	7990	return aIter != maShapeIdContainer.end() ? (*aIter).second : 0;
7985	}	7991	}
		7992
		7993	/* vi:set tabstop=4 shiftwidth=4 expandtab: */

Lines 7492-7498 Link Here

(-)svx.orig/source/svdraw/svdfppt.cxx (-1 / +12 lines)
7492	}	7492	}
7493	}	7493	}
7494		7494
7495	SdrObject* SdrPowerPointImport::CreateTable( SdrObject* pGroup, sal_uInt32* pTableArry, SvxMSDffSolverContainer* pSolverContainer ) const	7495	SdrObject* SdrPowerPointImport::CreateTable( SdrObject* pGroup, sal_uInt32* pTableArry, SvxMSDffSolverContainer* pSolverContainer )
7496	{	7496	{
7497	SdrObject* pRet = pGroup;	7497	SdrObject* pRet = pGroup;
7498	sal_uInt32 nRows = pTableArry[ 1 ];	7498	sal_uInt32 nRows = pTableArry[ 1 ];
Lines 7585-7590 Link Here
7585	pTable->uno_unlock();	7585	pTable->uno_unlock();
7586	pTable->SetSnapRect( pGroup->GetSnapRect() );	7586	pTable->SetSnapRect( pGroup->GetSnapRect() );
7587	pRet = pTable;	7587	pRet = pTable;
		7588
		7589
		7590	//Remove Objects from shape map
		7591	SdrObjListIter aIter( *pGroup, IM_DEEPWITHGROUPS );
		7592	while( aIter.IsMore() )
		7593	{
		7594	SdrObject* pPartObj = aIter.Next();
		7595	removeShapeId( pPartObj );
		7596	}
		7597
		7598
7588	SdrObject::Free( pGroup );	7599	SdrObject::Free( pGroup );
7589	}	7600	}
7590	catch( Exception& )	7601	catch( Exception& )