sc/source/filter/xcl97/xcl97rec.cxx | 2 +- vcl/skia/gdiimpl.cxx | 2 +- vcl/skia/win/gdiimpl.cxx | 1 + vcl/skia/x11/gdiimpl.cxx | 1 + 4 files changed, 4 insertions(+), 2 deletions(-)
New commits: commit 44b593c4f8ac277db63f2a6f43ba83febea48a14 Author: Serge Krot <[email protected]> AuthorDate: Tue Jul 21 16:05:15 2020 +0200 Commit: Christian Lohmaier <[email protected]> CommitDate: Wed Jul 29 20:18:31 2020 +0200 tdf#134769 XLSX export fix: unable to open with MS Excel Change-Id: I8fff01118e25768ca54c816fcb0eb522da6f38bb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99149 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <[email protected]> (cherry picked from commit 641dbafcb4c7b00bc9e56b58d12c95a6f05ee88d) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99394 (cherry picked from commit 6bb924a5d2b48336bbae47244210bbc78763b2ed) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99404 Reviewed-by: Xisco Fauli <[email protected]> Reviewed-by: Serge Krot <[email protected]> Reviewed-by: Eike Rathke <[email protected]> Reviewed-by: Christian Lohmaier <[email protected]> Tested-by: Christian Lohmaier <[email protected]> diff --git a/sc/source/filter/xcl97/xcl97rec.cxx b/sc/source/filter/xcl97/xcl97rec.cxx index 503d78ad75f2..3227937b3c03 100644 --- a/sc/source/filter/xcl97/xcl97rec.cxx +++ b/sc/source/filter/xcl97/xcl97rec.cxx @@ -365,8 +365,8 @@ void XclExpObjList::SaveXml( XclExpXmlStream& rStrm ) return; SaveDrawingMLObjects( *this, rStrm ); - SaveFormControlObjects( *this, rStrm ); SaveVmlObjects( *this, rStrm, mnVmlCount ); + SaveFormControlObjects( *this, rStrm ); } void XclExpObjList::ResetCounters() commit cc5f97ad017b71f909135f5970286ac731449967 Author: Luboš Luňák <[email protected]> AuthorDate: Wed Jul 15 12:16:47 2020 +0200 Commit: Christian Lohmaier <[email protected]> CommitDate: Wed Jul 29 20:18:15 2020 +0200 flush all Skia drawing before drawing to the screen Otherwise xor drawing might not get applied. Change-Id: Ic1f9496c76c8f1162951e2ac4acbcd131c714a3b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98885 Tested-by: Jenkins Reviewed-by: Luboš Luňák <[email protected]> (cherry picked from commit b0ba9e835060f8f5daf3943a03039ed443705eba) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98846 Reviewed-by: Michael Stahl <[email protected]> Reviewed-by: Adolfo Jayme Barrientos <[email protected]> Reviewed-by: Christian Lohmaier <[email protected]> Tested-by: Christian Lohmaier <[email protected]> diff --git a/vcl/skia/gdiimpl.cxx b/vcl/skia/gdiimpl.cxx index 11b59d30d8ed..cddb8f78290f 100644 --- a/vcl/skia/gdiimpl.cxx +++ b/vcl/skia/gdiimpl.cxx @@ -1082,7 +1082,7 @@ Color SkiaSalGraphicsImpl::getPixel(long nX, long nY) SkiaZone zone; checkSurface(); SAL_INFO("vcl.skia.trace", "getpixel(" << this << "): " << Point(nX, nY)); - mSurface->getCanvas()->flush(); + flushDrawing(); // This is presumably slow, but getPixel() should be generally used only by unit tests. SkBitmap bitmap; if (!bitmap.tryAllocN32Pixels(GetWidth(), GetHeight())) diff --git a/vcl/skia/win/gdiimpl.cxx b/vcl/skia/win/gdiimpl.cxx index 43ced4e9639f..c42bd79fa22a 100644 --- a/vcl/skia/win/gdiimpl.cxx +++ b/vcl/skia/win/gdiimpl.cxx @@ -66,6 +66,7 @@ void WinSkiaSalGraphicsImpl::freeResources() {} void WinSkiaSalGraphicsImpl::performFlush() { SkiaZone zone; + flushDrawing(); if (mWindowContext) mWindowContext->swapBuffers(); } diff --git a/vcl/skia/x11/gdiimpl.cxx b/vcl/skia/x11/gdiimpl.cxx index 4754bfc64f95..93025c0ef7d1 100644 --- a/vcl/skia/x11/gdiimpl.cxx +++ b/vcl/skia/x11/gdiimpl.cxx @@ -128,6 +128,7 @@ void X11SkiaSalGraphicsImpl::freeResources() {} void X11SkiaSalGraphicsImpl::performFlush() { SkiaZone zone; + flushDrawing(); // TODO XPutImage() is somewhat inefficient, XShmPutImage() should be preferred. mWindowContext->swapBuffers(); } _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
