[Libreoffice-commits] core.git: vcl/source

[Caolán McNamara]

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

New commits:
commit 297b22bd49ea11a90063ab8503fb83090f351668
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Nov 25 15:56:29 2014 +0000

    Revert "Resolves: #i63015# always default to WinAnsiEncoding..."
    
    Because under Linux use text
    "'"
    and font "Nimbus Sans L"
    and export as pdf and the output is garbled
    
    If we do want to stick WinAnsiEncoding here then we'll presumably have have to
    test that pEncoding actually matches WinAnsiEncoding and/or generate an
    additional Encoding/Differences from WinAnsiEncoding for that font.
    
    This reverts commit eea16cb3e65a4308caddb7618d31a76ca259dbb1.

diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index ad6d04d..06a7fe0 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -3504,7 +3504,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() )
+            if( !pFont->IsSymbolFont() &&  pEncoding == 0 )
                 aLine.append( "/Encoding/WinAnsiEncoding\n" );
             if( nToUnicodeStream )
             {