ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

CID 1539919: Null pointer dereferences

Browse Source 
The problem was introduced in 631964a2ce
tfd#112687 Combine adjacent lines into one shape

Change-Id: I4c064a22e5fcc0040e249dbde09ee591ac2693c7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155686
Tested-by: Jenkins
Tested-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
This commit is contained in:
Regina Henschel
2023-08-15 09:52:30 +02:00
committed by Caolán McNamara
parent 61a78a523a
commit 64121a303b
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
slideshow/source/engine/slideshowimpl.cxx
+7 -5
View File
@@ -1445,14 +1445,16 @@ void lcl_setPropertiesToShape(const drawing::PointSequenceSequence& rPoints,
aXPropSet->setPropertyValue("LineCap", uno::Any(eLC));
//LineColor
sal_uInt32 nLineColor;
nLineColor = pCanvasPolyPoly->getRGBALineColor();
sal_uInt32 nLineColor = 0;
if (pCanvasPolyPoly)
nLineColor = pCanvasPolyPoly->getRGBALineColor();
//Transform polygon color from RRGGBBAA to AARRGGBB
aXPropSet->setPropertyValue("LineColor", uno::Any(RGBAColor2UnoColor(nLineColor)));
//LineWidth
double fLineWidth;
fLineWidth = pCanvasPolyPoly->getStrokeWidth();
double fLineWidth = 0;
if (pCanvasPolyPoly)
fLineWidth = pCanvasPolyPoly->getStrokeWidth();
aXPropSet->setPropertyValue("LineWidth", uno::Any(static_cast<sal_Int32>(fLineWidth)));
}
@@ -1509,7 +1511,7 @@ void SlideShowImpl::registerUserPaintPolygons( const uno::Reference< lang::XMult
// We collect these points into one B2DPolygon and use that to generate the shape on the
// slide.
::basegfx::B2DPolygon aDrawingPoints;
cppcanvas::PolyPolygonSharedPtr pFirstPolyPoly; // for style properties
cppcanvas::PolyPolygonSharedPtr pFirstPolyPoly = aPolygons.front(); // for style properties
for( const auto& pPolyPoly : aPolygons )
{
// Actually, each item in aPolygons has two points, but wrapped in a cppcanvas::PopyPolygon.