From 3b928e097b61fbed0f6fd97d2755f1158091c9f6 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 6 Nov 2014 14:11:35 +0100 Subject: fdo#82038: senddoc, uri-encode got lost on Mac (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 Tested-by: Tor Lillqvist Reviewed-by: Michael Stahl --- scp2/source/ooo/file_ooo.scp | 4 ++-- 1 file 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; -- cgit v1.2.3