diff options
| author | Patrick Luby <plubius@neooffice.org> | 2022-12-10 14:16:39 -0500 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2022-12-11 20:02:53 +0000 |
| commit | 9eb732a32023e74c44ac8c3b5af9f5424273bb6c (patch) | |
| tree | 3b40f9d61aae45470f07c489f7089cbfcb704ab1 /vcl/osx/salinst.cxx | |
| parent | d7f969a133d4eb8258b5d90ed88532cfcdbc9b28 (diff) | |
Related: tdf#146842 Convert SkiaSalBitmap to QuartzSalBitmap
Commit de3f13e2175564316eb5a62dee65e9ff8f31b460 disabled Skia for printing.
However, since all SalBitmaps created are either all QuartzSalBitmaps or all
SkiaSalBitmaps, a crash occurs whenever a SkiaSalBitmap is passed to a
printer's SalGraphics instance which is now always non-Skia.
Change-Id: I7c1b0e1a9993e21db18ba5695a106cb10cc4088a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143939
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/osx/salinst.cxx')
| -rw-r--r-- | vcl/osx/salinst.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx index e7f202ae7ae5..22a024bc265d 100644 --- a/vcl/osx/salinst.cxx +++ b/vcl/osx/salinst.cxx @@ -524,7 +524,11 @@ void AquaSalInstance::handleAppDefinedEvent( NSEvent* pEvent ) bool AquaSalInstance::RunInMainYield( bool bHandleAllCurrentEvents ) { OSX_SALDATA_RUNINMAIN_UNION( DoYield( false, bHandleAllCurrentEvents), boolean ) - assert( false && "Don't call this from the main thread!" ); + + // PrinterController::removeTransparencies() calls this frequently on the + // main thread so reduce the severity from an assert so that printing still + // works in a debug builds + SAL_WARN_IF( true, "vcl", "Don't call this from the main thread!" ); return false; } |