[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - vcl/source

[Pierre-Eric Pelloux-Prayer]

 vcl/source/outdev/text.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 2cbec343b8aa2460604b7bed8fb9a8860e3f0717
Author: Pierre-Eric Pelloux-Prayer <pelloux at gmail.com>
Date:   Thu Mar 12 22:37:54 2015 +0100

    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 at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    (cherry picked from commit 162f11cdb94b415ff9d58674e94fb01a745a69eb)
    Reviewed-on: https://gerrit.libreoffice.org/14898
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
    Tested-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx
index bb6369d..55ffe71 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.