tdf#134736 move nLastBgAction to also include any trailing pops
RemoveTransparenciesFromMetaFile is a very fragile thing
Change-Id: I8feeb436426d16087ab5fbaddf6b39ac32574e5c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113981
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
diff --git a/vcl/source/gdi/print2.cxx b/vcl/source/gdi/print2.cxx
index 285818e..f7e4d88 100644
--- a/vcl/source/gdi/print2.cxx
+++ b/vcl/source/gdi/print2.cxx
@@ -788,6 +788,18 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf,
++nActionNum;
}
if (nLastBgAction != -1)
{
size_t nActionSize = rInMtf.GetActionSize();
// tdf#134736 move nLastBgAction to also include any trailing pops
for (size_t nPostLastBgAction = nLastBgAction + 1; nPostLastBgAction < nActionSize; ++nPostLastBgAction)
{
if (rInMtf.GetAction(nPostLastBgAction)->GetType() != MetaActionType::POP)
break;
nLastBgAction = nPostLastBgAction;
}
}
aMapModeVDev->ClearStack(); // clean up aMapModeVDev
// fast-forward until one after the last background action
