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

[Herbert Dürr]

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

New commits:
commit d89756854ed100ed27fda7a8a7716af74332c1a4
Author: Herbert Dürr <hdu at apache.org>
Date:   Wed Oct 15 09:03:39 2014 +0000

    Resolves: #i63015# always default to WinAnsiEncoding...
    
    for non-symbol PDF-Type1 export
    
    Suggested-By: edv at gruene.de
    Reviewed-By: hdu at apache.org
    (cherry picked from commit b8186703cb43d2b57460cb23a7a4e3f989e95426)
    
    Conflicts:
    	vcl/source/gdi/pdfwriter_impl.cxx
    
    Change-Id: I02227724bff301133ac8ce5562ec5ca1ed94f136
    Reviewed-on: https://gerrit.libreoffice.org/11988
    Reviewed-by: Björn Michaelsen <bjoern.michaelsen at canonical.com>
    Tested-by: Björn Michaelsen <bjoern.michaelsen at canonical.com>

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