From ff8b9f6fca5784f62427302026642de0cdb1ef11 Mon Sep 17 00:00:00 2001 From: Luboš Luňák Date: Tue, 22 Mar 2022 12:14:52 +0100 Subject: use dashing info from struct LineInfo in EPS writer (tdf#146804) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It had a random(?) hardcoded '2' as the dashing info. While at it, I've also made few other places use the common implementation of creating the dotdash array instead of doing it manually. Change-Id: Id349ca138c98d08eef47dc0bfe6d162e03fc4a9f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131932 Tested-by: Jenkins Reviewed-by: Luboš Luňák --- vcl/source/gdi/pdfwriter_impl.cxx | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) (limited to 'vcl/source/gdi/pdfwriter_impl.cxx') diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index 1847eb7d7f78..40eab868a80a 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -7780,26 +7780,7 @@ void PDFWriterImpl::convertLineInfoToExtLineInfo( const LineInfo& rIn, PDFWriter rOut.m_eCap = PDFWriter::capButt; rOut.m_eJoin = PDFWriter::joinMiter; rOut.m_fMiterLimit = 10; - rOut.m_aDashArray.clear(); - - // add DashDot to DashArray - const int nDashes = rIn.GetDashCount(); - const int nDashLen = rIn.GetDashLen(); - const int nDistance = rIn.GetDistance(); - - for( int n = 0; n < nDashes; n++ ) - { - rOut.m_aDashArray.push_back( nDashLen ); - rOut.m_aDashArray.push_back( nDistance ); - } - const int nDots = rIn.GetDotCount(); - const int nDotLen = rIn.GetDotLen(); - - for( int n = 0; n < nDots; n++ ) - { - rOut.m_aDashArray.push_back( nDotLen ); - rOut.m_aDashArray.push_back( nDistance ); - } + rOut.m_aDashArray = rIn.GetDotDashArray(); // add LineJoin switch(rIn.GetLineJoin()) -- cgit