From c9d2a2b7dfb33ea55477f3991915106ff8cae998 Mon Sep 17 00:00:00 2001 From: Pierre-Eric Pelloux-Prayer Date: Thu, 12 Mar 2015 22:37:54 +0100 Subject: vcl/text: fix duplicate text in fontwork tdf#81876 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Regression introduced by commit 2ba05b4800d6cc322276a6911792363f8eb32051 because space character will take the error code path. The error propagates up to GetTextOutlines which then uses the fallback method. In this case, we now reset any work done before, to avoid having duplicate outlines. Change-Id: Ie15524ac462d4b4bb3c482e49c4fe96a2f2d2c71 Reviewed-on: https://gerrit.libreoffice.org/14850 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara (cherry picked from commit 162f11cdb94b415ff9d58674e94fb01a745a69eb) Reviewed-on: https://gerrit.libreoffice.org/14899 Reviewed-by: Adolfo Jayme Barrientos Tested-by: Adolfo Jayme Barrientos --- vcl/source/outdev/text.cxx | 3 +++ 1 file changed, 3 insertions(+) (limited to 'vcl') diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx index 99ab2502beed..113a42e6e222 100644 --- a/vcl/source/outdev/text.cxx +++ b/vcl/source/outdev/text.cxx @@ -2672,6 +2672,9 @@ bool OutputDevice::GetTextOutlines( ::basegfx::B2DPolyPolygonVector& rVector, if( bRet || (OUTDEV_PRINTER == meOutDevType) || !mpFontEntry ) return bRet; + // reset work done (tdf#81876) + rVector.clear(); + // fall back to bitmap conversion // Here, we can savely assume that the mapping between characters and glyphs // is one-to-one. This is most probably valid for the old bitmap fonts. -- cgit