summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-11-06 14:11:35 +0100
committerCaolán McNamara <caolanm@redhat.com>2014-11-11 16:37:36 +0000
commit3b928e097b61fbed0f6fd97d2755f1158091c9f6 (patch)
treee3bab787c512b574ed784dd262e9294d46362bf3
parentbump product version to 4.3.4.1.0+ (diff)
downloadcore-libreoffice-4-3-4.tar.gz
core-libreoffice-4-3-4.zip
fdo#82038: senddoc, uri-encode got lost on Mac libreoffice-4-3-4
(cherry picked from commit f3f63f555df87449b2d2a33718589b3afb3d9ddf) Conflicts: Repository.mk scp2/source/ooo/file_ooo.scp Change-Id: I2f104c64601b22ce3ef078295c7da3cb21a133f9 Reviewed-on: https://gerrit.libreoffice.org/12336 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com> Reviewed-by: Michael Stahl <mstahl@redhat.com>
-rw-r--r--scp2/source/ooo/file_ooo.scp4
1 files changed, 2 insertions, 2 deletions
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 9b11d66cfc1e..0bb375d73800 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -200,7 +200,7 @@ End
#endif
-#if defined UNX && ! defined MACOSX
+#if defined UNX
File gid_File_Bin_Uri_Encode
BIN_FILE_BODY;
@@ -211,7 +211,7 @@ End
#endif
-#if defined UNX && ! defined MACOSX
+#if defined UNX
File gid_File_Bin_Senddoc
BIN_FILE_BODY;
Dir = FILELIST_DIR;