diff options
| author | Pierre-Eric Pelloux-Prayer <pelloux@gmail.com> | 2015-03-12 22:37:54 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2015-04-04 10:49:22 +0200 |
| commit | ed98c97cc2e6e47bf6a31f338f8bd44ad1f52926 (patch) | |
| tree | c85978881167a50d03ab391538a5cc518010f0b4 /vcl | |
| parent | 1424fc97c024e880704635cc2140ec1ddad11402 (diff) | |
vcl/text: fix duplicate text in fontwork tdf#81876
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 <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 162f11cdb94b415ff9d58674e94fb01a745a69eb)
Reviewed-on: https://gerrit.libreoffice.org/14898
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/outdev/text.cxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx index bb6369df428a..55ffe71bf4f7 100644 --- a/vcl/source/outdev/text.cxx +++ b/vcl/source/outdev/text.cxx @@ -2583,6 +2583,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. |