[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - vcl/source

[Julien Nabet]

 vcl/source/gdi/pdfwriter_impl.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b35798df2c1f6a05d8a3a28843c64c6da548f741
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Thu Oct 13 21:22:55 2016 +0200

    tdf#34212: Accented Characters and Umlauts are missing with Type1 fonts
    
    Following the revert of previous patch:
    https://cgit.freedesktop.org/libreoffice/core/commit/?id=297b22bd49ea11a90063ab8503fb83090f351668
    Gilbert Röhrbein proposed this patch
    See https://bugs.documentfoundation.org/show_bug.cgi?id=34212#c14
    
    Change-Id: I1a30427cd88f5602e7633894ba35307104c2ed8d
    Reviewed-on: https://gerrit.libreoffice.org/29792
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: jan iversen <jani at documentfoundation.org>
    (cherry picked from commit 52040395e3046ac42b8c3dd385c7b1cb26b929f3)
    Reviewed-on: https://gerrit.libreoffice.org/30852
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index 3891303..458ecba 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -3539,7 +3539,7 @@ std::map< sal_Int32, sal_Int32 > PDFWriterImpl::emitEmbeddedFont( const Physical
                 "<</Type/Font/Subtype/Type1/BaseFont/" );
             appendName( aInfo.m_aPSName, aLine );
             aLine.append( "\n" );
-            if( !pFont->IsSymbolFont() &&  pEncoding == nullptr )
+            if( !pFont->IsSymbolFont() && ( pEncoding == nullptr || pFont->GetCharSet() == RTL_TEXTENCODING_MS_1252 ))
                 aLine.append( "/Encoding/WinAnsiEncoding\n" );
             if( nToUnicodeStream )
             {