vcl/source/gdi/print2.cxx | 12 ++++++++++++
1 file changed, 12 insertions(+)
New commits:
commit 7ef44142086670160756705368339a989828653a
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Apr 12 12:11:42 2021 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Apr 12 14:40:19 2021 +0200
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 <caol...@redhat.com>
diff --git a/vcl/source/gdi/print2.cxx b/vcl/source/gdi/print2.cxx
index 285818e7284b..f7e4d8875341 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
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
