canvas/source/vcl/canvashelper.cxx | 25 +++----------------------
configure.ac | 2 +-
2 files changed, 4 insertions(+), 23 deletions(-)
New commits:
commit 1c3b876576bce38f0469e76d5ac026095958823a
Author: Aron Budea <aron.bu...@collabora.com>
AuthorDate: Fri Sep 27 18:12:11 2024 +0930
Commit: Aron Budea <aron.bu...@collabora.com>
CommitDate: Fri Sep 27 18:12:11 2024 +0930
Bump version to 7.6.7.2.M5
Change-Id: I38b8662f0d15582754dd7ac718d7d34761c9784c
diff --git a/configure.ac b/configure.ac
index 3f5e603e7bcb..5387075f50d4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
# several non-alphanumeric characters, those are split off and used only for
the
# ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no
idea.
-AC_INIT([LibreOffice],[7.6.7.2.M4],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[7.6.7.2.M5],[],[],[http://documentfoundation.org/])
dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just
fine if it is installed
dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails
hard
commit 42c282997666e84ef2be30e051dac21751393750
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Wed Sep 25 15:52:44 2024 +0500
Commit: Aron Budea <aron.bu...@collabora.com>
CommitDate: Fri Sep 27 17:04:45 2024 +0930
tdf#163145: revert commit 6f224a17dbf635319503a81ce4038b1ae2ad6de0
I can't reproduce the problem from tdf#136933 anymore (using kf5
and qt5), while it's reproducible using v.7.0 bibisect repo with
qt5. I conclude, that the problem got resolved in the meanwhile.
So it seems to make sense to just revert the problematic commit.
The incorrect line drawing still may need to be fixed eventually.
There seem to be no way to test SlideImpl::getCurrentSlideBitmap,
which eventually calls CanvasHelper::strokePolyPolygon. So this
change has no unit test, unfortunately.
Change-Id: I1d82b6f734a4f69d93c9d61732f55ef8158cfbe6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173933
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
(cherry picked from commit 12e08b3cba0e75f1bd3a42f30e4830d723b24ece)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173910
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
(cherry picked from commit f3e221388e10826aaac6d31631f81709951aae2a)
diff --git a/canvas/source/vcl/canvashelper.cxx
b/canvas/source/vcl/canvashelper.cxx
index cbbd18a376d9..3aa16f1baf4e 100644
--- a/canvas/source/vcl/canvashelper.cxx
+++ b/canvas/source/vcl/canvashelper.cxx
@@ -315,31 +315,12 @@ namespace vclcanvas
::basegfx::B2DPolyPolygon aPolyPoly(
::basegfx::unotools::b2DPolyPolygonFromXPolyPolygon2D(xPolyPolygon) );
- std::vector<double> aDashArray;
- if( strokeAttributes.DashArray.hasElements() )
- aDashArray = ::comphelper::sequenceToContainer<
std::vector<double> >(strokeAttributes.DashArray);
-
- // First try to draw directly using VCL.
- bool directFailed = false;
- setupOutDevState( viewState, renderState, LINE_COLOR );
- for( sal_uInt32 i=0; i<aPolyPoly.count(); ++i )
- {
- if( !mpOutDevProvider->getOutDev().DrawPolyLineDirect(
aMatrix, aPolyPoly.getB2DPolygon(i),
- strokeAttributes.StrokeWidth, 0, !aDashArray.empty() ?
&aDashArray : nullptr,
- b2DJoineFromJoin(strokeAttributes.JoinType),
unoCapeFromCap(strokeAttributes.StartCapType)))
- {
- directFailed = true;
- break;
- }
- }
- if(!directFailed)
- return uno::Reference< rendering::XCachedPrimitive >(nullptr);
-
- // Do it all manually.
-
// apply dashing, if any
if( strokeAttributes.DashArray.hasElements() )
{
+ const std::vector<double>& aDashArray(
+ ::comphelper::sequenceToContainer< std::vector<double>
>(strokeAttributes.DashArray) );
+
::basegfx::B2DPolyPolygon aDashedPolyPoly;
for( sal_uInt32 i=0; i<aPolyPoly.count(); ++i )
