diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-11-25 15:56:29 +0000 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-11-25 19:53:25 +0000 |
| commit | d10ae9cc61f2982efaa8d5135b719b3ea24a7640 (patch) | |
| tree | 3106c78ca304a03ddd6b1a28ec438734bd6b3f05 | |
| parent | c633627500e408219bbd67639a27489b50d87386 (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.
(cherry picked from commit 297b22bd49ea11a90063ab8503fb83090f351668)
Change-Id: I9dd8de2a68ad276cce769545186d169160880e09
Reviewed-on: https://gerrit.libreoffice.org/13121
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
| -rw-r--r-- | vcl/source/gdi/pdfwriter_impl.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index 55486298cd62..2f44dd57744f 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() ) + if( !pFont->IsSymbolFont() && pEncoding == 0 ) aLine.append( "/Encoding/WinAnsiEncoding\n" ); if( nToUnicodeStream ) { |