Re: CVS: commit jbrefort abiword-plugins/tools/abigoffice/unix AbiGOChart.cpp AbiGOComponent.cpp

On Thu, 2006-09-07 at 11:24 +0000, cvs@abisource.com wrote:
> Update of /cvsroot/abiword-plugins/tools/abigoffice/unix
> In directory abiword.snt.utwente.nl:/tmp/cvs-serv14701
>
> Modified Files:
> AbiGOChart.cpp AbiGOComponent.cpp
> Log Message:
> Avoid crashes when objects have 0 height. Related to #10482. AbiGOChart.cpp should be fixed in 2.4 too, please backport (or should I do it myself?)

You may, but I'll eventually get to it as well :)

Marc

>
> Index: AbiGOChart.cpp
> ===================================================================
> RCS file: /cvsroot/abiword-plugins/tools/abigoffice/unix/AbiGOChart.cpp,v
> retrieving revision 1.7
> retrieving revision 1.8
> diff -u -d -r1.7 -r1.8
> --- AbiGOChart.cpp 6 Sep 2006 08:52:36 -0000 1.7
> +++ AbiGOChart.cpp 7 Sep 2006 11:24:17 -0000 1.8
> @@ -520,6 +520,10 @@
> {
> return false;
> }
> + if((rec.width == 0) || (rec.height ==0))
> + {
> + return false;
> + }
> GR_Painter painter(getGraphics());
> GR_Image * pImage = painter.genImageFromRectangle(rec);
> UT_ByteBuf * pBuf = NULL;
> @@ -665,6 +669,10 @@
>
> void GOChartView::render(UT_Rect & rec)
> {
> + if((rec.width == 0) || (rec.height ==0))
> + {
> + return false;
> + }
> if (m_pGOMan->getGraphics()->queryProperties(GR_Graphics::DGP_PAPER))
> {
> XAP_UnixGnomePrintGraphics * pUGG = static_cast< XAP_UnixGnomePrintGraphics *>(m_pGOMan->getGraphics());
>
> Index: AbiGOComponent.cpp
> ===================================================================
> RCS file: /cvsroot/abiword-plugins/tools/abigoffice/unix/AbiGOComponent.cpp,v
> retrieving revision 1.9
> retrieving revision 1.10
> diff -u -d -r1.9 -r1.10
> --- AbiGOComponent.cpp 6 Sep 2006 08:52:36 -0000 1.9
> +++ AbiGOComponent.cpp 7 Sep 2006 11:24:17 -0000 1.10
> @@ -431,6 +431,10 @@
> {
> return false;
> }
> + if((rec.width == 0) || (rec.height ==0))
> + {
> + return false;
> + }
> GR_Painter painter(getGraphics());
> GR_Image * pImage = painter.genImageFromRectangle(rec);
> UT_ByteBuf * pBuf = NULL;
>
> -----------------------------------------------
> To unsubscribe from this list, send a message to
> abisource-cvs-commit-request@abisource.com with the word
> unsubscribe in the message body.
Received on Fri Sep 8 10:41:08 2006