Kaydet (Commit) dbae716d authored tarafından Caolán McNamara's avatar Caolán McNamara

Resolves: tdf#116483 smart art incorrectly rendered

HasPolyPolygon as true case sets an alternative non-broken region even if its
legacy version would have been broken

Change-Id: I4520b7d7a4032684afad61816380fef7171040f6
Reviewed-on: https://gerrit.libreoffice.org/51632Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 5747ed05
......@@ -1589,13 +1589,12 @@ SvStream& ReadRegion(SvStream& rIStrm, vcl::Region& rRegion)
bool bSuccess = pNewRegionBand->load(rIStrm);
rRegion.mpRegionBand.reset(pNewRegionBand);
if(aCompat.GetVersion() >= 2)
bool bHasPolyPolygon(false);
if (aCompat.GetVersion() >= 2)
{
bool bHasPolyPolygon(false);
rIStrm.ReadCharAsBool( bHasPolyPolygon );
if(bHasPolyPolygon)
if (bHasPolyPolygon)
{
tools::PolyPolygon* pNewPoly = new tools::PolyPolygon();
ReadPolyPolygon( rIStrm, *pNewPoly );
......@@ -1603,9 +1602,9 @@ SvStream& ReadRegion(SvStream& rIStrm, vcl::Region& rRegion)
}
}
if (!bSuccess)
if (!bSuccess && !bHasPolyPolygon)
{
SAL_WARN("vcl.gdi", "bad region band");
SAL_WARN("vcl.gdi", "bad region band:" << bHasPolyPolygon);
rRegion.SetNull();
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment