Attachment #79546 for issue #120967

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




void PPTWriter::ImplCreateTable( uno::Reference< drawing::XShape >& rXShape, EscherSolverContainer& aSolverContainer,
								EscherPropertyContainer& aPropOpt )
{
	mpPptEscherEx->OpenContainer( ESCHER_SpgrContainer );
	mpPptEscherEx->OpenContainer( ESCHER_SpContainer );
	mpPptEscherEx->AddAtom( 16, ESCHER_Spgr, 1 );
	*mpStrm		<< (sal_Int32)maRect.Left()	// Bounding box fuer die Gruppierten shapes an die sie attached werden
				<< (sal_Int32)maRect.Top()
				<< (sal_Int32)maRect.Right()
				<< (sal_Int32)maRect.Bottom();

    sal_uInt32 nShapeId = mpPptEscherEx->GenerateShapeId();
	mpPptEscherEx->AddShape( ESCHER_ShpInst_Min, 0x201, nShapeId );		// Flags: Group | Patriarch
	aSolverContainer.AddShape( rXShape, nShapeId );
	EscherPropertyContainer aPropOpt2;
	try
	{
		static const rtl::OUString	sModel( RTL_CONSTASCII_USTRINGPARAM ( "Model" ) );

				awt::Size aM( ImplMapSize( aS ) );
				aColumns.push_back( std::pair< sal_Int32, sal_Int32 >( nPosition, aM.Width ) );
				nPosition += aM.Width;
				if ( x == nColumnCount - 1  && nPosition != maRect.Right() )
					maRect.Right() = nPosition;
			}

			nPosition = aPosition.Y;

				awt::Size aM( ImplMapSize( aS ) );
				aRows.push_back( std::pair< sal_Int32, sal_Int32 >( nPosition, aM.Height ) );
				nPosition += aM.Height;
				if ( y == nRowCount - 1 && nPosition != maRect.Bottom())
					maRect.Bottom() = nPosition;
			}
			mpPptEscherEx->OpenContainer( ESCHER_SpgrContainer );
			mpPptEscherEx->OpenContainer( ESCHER_SpContainer );
			mpPptEscherEx->AddAtom( 16, ESCHER_Spgr, 1 );
			*mpStrm		<< (sal_Int32)maRect.Left()	// Bounding box fuer die Gruppierten shapes an die sie attached werden
						<< (sal_Int32)maRect.Top()
						<< (sal_Int32)maRect.Right()
						<< (sal_Int32)maRect.Bottom();

			sal_uInt32 nShapeId = mpPptEscherEx->GenerateShapeId();
			mpPptEscherEx->AddShape( ESCHER_ShpInst_Min, 0x201, nShapeId );		// Flags: Group | Patriarch
			aSolverContainer.AddShape( rXShape, nShapeId );
			EscherPropertyContainer aPropOpt2;

			if ( nRowCount )
			{
				SvMemoryStream aMemStrm;

Return to issue 120967

Lines 5738-5755 Link Here

(-)sd/source/filter/eppt/epptso.cxx (-12 / +16 lines)
5738	void PPTWriter::ImplCreateTable( uno::Reference< drawing::XShape >& rXShape, EscherSolverContainer& aSolverContainer,	5738	void PPTWriter::ImplCreateTable( uno::Reference< drawing::XShape >& rXShape, EscherSolverContainer& aSolverContainer,
5739	EscherPropertyContainer& aPropOpt )	5739	EscherPropertyContainer& aPropOpt )
5740	{	5740	{
5741	mpPptEscherEx->OpenContainer( ESCHER_SpgrContainer );
5742	mpPptEscherEx->OpenContainer( ESCHER_SpContainer );
5743	mpPptEscherEx->AddAtom( 16, ESCHER_Spgr, 1 );
5744	*mpStrm << (sal_Int32)maRect.Left() // Bounding box fuer die Gruppierten shapes an die sie attached werden
5745	<< (sal_Int32)maRect.Top()
5746	<< (sal_Int32)maRect.Right()
5747	<< (sal_Int32)maRect.Bottom();
5748
5749	sal_uInt32 nShapeId = mpPptEscherEx->GenerateShapeId();
5750	mpPptEscherEx->AddShape( ESCHER_ShpInst_Min, 0x201, nShapeId ); // Flags: Group \| Patriarch
5751	aSolverContainer.AddShape( rXShape, nShapeId );
5752	EscherPropertyContainer aPropOpt2;
5753	try	5741	try
5754	{	5742	{
5755	static const rtl::OUString sModel( RTL_CONSTASCII_USTRINGPARAM ( "Model" ) );	5743	static const rtl::OUString sModel( RTL_CONSTASCII_USTRINGPARAM ( "Model" ) );
Lines 5778-5783 Link Here
5778	awt::Size aM( ImplMapSize( aS ) );	5766	awt::Size aM( ImplMapSize( aS ) );
5779	aColumns.push_back( std::pair< sal_Int32, sal_Int32 >( nPosition, aM.Width ) );	5767	aColumns.push_back( std::pair< sal_Int32, sal_Int32 >( nPosition, aM.Width ) );
5780	nPosition += aM.Width;	5768	nPosition += aM.Width;
		5769	if ( x == nColumnCount - 1 && nPosition != maRect.Right() )
		5770	maRect.Right() = nPosition;
5781	}	5771	}
5782		5772
5783	nPosition = aPosition.Y;	5773	nPosition = aPosition.Y;
Lines 5789-5796 Link Here
5789	awt::Size aM( ImplMapSize( aS ) );	5779	awt::Size aM( ImplMapSize( aS ) );
5790	aRows.push_back( std::pair< sal_Int32, sal_Int32 >( nPosition, aM.Height ) );	5780	aRows.push_back( std::pair< sal_Int32, sal_Int32 >( nPosition, aM.Height ) );
5791	nPosition += aM.Height;	5781	nPosition += aM.Height;
		5782	if ( y == nRowCount - 1 && nPosition != maRect.Bottom())
		5783	maRect.Bottom() = nPosition;
5792	}	5784	}
		5785	mpPptEscherEx->OpenContainer( ESCHER_SpgrContainer );
		5786	mpPptEscherEx->OpenContainer( ESCHER_SpContainer );
		5787	mpPptEscherEx->AddAtom( 16, ESCHER_Spgr, 1 );
		5788	*mpStrm << (sal_Int32)maRect.Left() // Bounding box fuer die Gruppierten shapes an die sie attached werden
		5789	<< (sal_Int32)maRect.Top()
		5790	<< (sal_Int32)maRect.Right()
		5791	<< (sal_Int32)maRect.Bottom();
5793		5792
		5793	sal_uInt32 nShapeId = mpPptEscherEx->GenerateShapeId();
		5794	mpPptEscherEx->AddShape( ESCHER_ShpInst_Min, 0x201, nShapeId ); // Flags: Group \| Patriarch
		5795	aSolverContainer.AddShape( rXShape, nShapeId );
		5796	EscherPropertyContainer aPropOpt2;
		5797
5794	if ( nRowCount )	5798	if ( nRowCount )
5795	{	5799	{
5796	SvMemoryStream aMemStrm;	5800	SvMemoryStream aMemStrm;