sfx2/source/doc/objmisc.cxx | 3 ++- vcl/headless/svpgdi.cxx | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-)
New commits: commit 6757821bc10f4d59cfba115651166ac27200a78c Author: Caolán McNamara <[email protected]> AuthorDate: Wed Aug 7 12:58:01 2019 +0100 Commit: Andras Timar <[email protected]> CommitDate: Sun Oct 10 21:24:10 2021 +0200 expand pyuno path separators Change-Id: Ic97649ed6d4be595b308922c7bdc880cbb60b239 Reviewed-on: https://gerrit.libreoffice.org/77102 Reviewed-by: Michael Stahl <[email protected]> Tested-by: Jenkins Reviewed-by: Stephan Bergmann <[email protected]> (cherry picked from commit 75903a0298218f89a199a5ac151ee0166f4469d7) Reviewed-on: https://gerrit.libreoffice.org/77115 diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index f0f5c377bcea..aaafcc58e038 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -1366,7 +1366,8 @@ bool SfxObjectShell::UnTrustedScript(const OUString& rScriptURL) if (!sfUri.is()) return false; - OUString sScript = sfUri->getName(); + // pyuno encodes path separator as | + OUString sScript = sfUri->getName().replace('|', '/'); // check if any path portion matches LibreLogo and ban it if it does sal_Int32 nIndex = 0; commit f86dcbc20ceff110ade29c08d0da190de8d790dd Author: Caolán McNamara <[email protected]> AuthorDate: Sat Aug 4 15:30:46 2018 +0100 Commit: Andras Timar <[email protected]> CommitDate: Sun Oct 10 21:23:49 2021 +0200 crashtesting: bubble surface creation failure notification upwards e.g. on converting moz858095-2.svg to odg Change-Id: I1a222f1745cff9c4cb225f6c0c216072fb17b4f7 Reviewed-on: https://gerrit.libreoffice.org/58587 Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Caolán McNamara <[email protected]> diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx index f4ef3b21fe33..9ee5bc3ab909 100644 --- a/vcl/headless/svpgdi.cxx +++ b/vcl/headless/svpgdi.cxx @@ -1307,6 +1307,11 @@ SalBitmap* SvpSalGraphics::getBitmap( long nX, long nY, long nWidth, long nHeigh } cairo_surface_t* target = SvpSalGraphics::createCairoSurface(pBitmap->GetBuffer()); + if (!target) + { + SAL_WARN("vcl.gdi", "SvpSalGraphics::getBitmap, cannot create cairo surface"); + return nullptr; + } cairo_t* cr = cairo_create(target); SalTwoRect aTR(nX, nY, nWidth, nHeight, 0, 0, nWidth, nHeight);
