[libreoffice/f21] Revert: #i63015# always default to WinAnsiEncoding for Type1 pdf export

[Caolán McNamara]

commit 00ad68cace1cdac21db0724bfeed8e0a56782995
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Nov 25 16:09:13 2014 +0000

    Revert: #i63015# always default to WinAnsiEncoding for Type1 pdf export

 ...lves-i63015-always-default-to-WinAnsiEnco.patch |   40 ++++++++++++++++++++
 libreoffice.spec                                   |    4 +-
 2 files changed, 43 insertions(+), 1 deletions(-)
---
diff --git a/0001-Revert-Resolves-i63015-always-default-to-WinAnsiEnco.patch b/0001-Revert-Resolves-i63015-always-default-to-WinAnsiEnco.patch
new file mode 100644
index 0000000..1d24e69
--- /dev/null
+++ b/0001-Revert-Resolves-i63015-always-default-to-WinAnsiEnco.patch
@@ -0,0 +1,40 @@
+From 0b3976fe49ddf6324c9c61842d3f01f89566c4c9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm at redhat.com>
+Date: Tue, 25 Nov 2014 15:56:29 +0000
+Subject: [PATCH] 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
+---
+ vcl/source/gdi/pdfwriter_impl.cxx | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
+index 5548629..2f44dd5 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 )
+             {
+-- 
+1.9.3
+
diff --git a/libreoffice.spec b/libreoffice.spec
index c9d28f8..fba8116 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -350,6 +350,7 @@ Patch51: 0001-Resolves-fdo-86449-backport-rtf-fixes.patch
 Patch52: 0002-Resolves-fdo-86451-guard-all-the-tops-post-pop.patch
 Patch53: 0001-Resolves-fdo-86466-Wrong-background-color-shown-in-f.patch
 Patch54: 0001-rhbz-1167250-Avoid-X11Clipboard-already-being-destro.patch
+Patch55: 0001-Revert-Resolves-i63015-always-default-to-WinAnsiEnco.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/libreoffice
@@ -2320,8 +2321,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %endif
 
 %changelog
-* Mon Nov 24 2014 Stephan Bergmann <sbergman at redhat.com>  - 1:4.3.4.1-7-UNBUILT
+* Tue Nov 25 2014 Stephan Bergmann <sbergman at redhat.com>  - 1:4.3.4.1-7
 - Resolves: fdo#1167250 Crash in clipboard code
+- Revert: #i63015# always default to WinAnsiEncoding for Type1 pdf export
 
 * Fri Nov 21 2014 Caolán McNamara <caolanm at redhat.com> - 1:4.3.4.1-6
 - Resolves: fdo#86466 Wrong background color shown in impress table