summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-11-25 15:56:29 +0000
committerCaolán McNamara <caolanm@redhat.com>2014-11-25 16:01:55 +0000
commit297b22bd49ea11a90063ab8503fb83090f351668 (patch)
treeec53ce031db07a6085309d7e79908db5d1ccaea2
parent60f822e4e193c31892d5dc7a8466eba52950b015 (diff)
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.
-rw-r--r--vcl/source/gdi/pdfwriter_impl.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index ad6d04d86603..06a7fe0c51e8 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 )
{