[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - scp2/source

[Stephan Bergmann]

 scp2/source/ooo/file_ooo.scp |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit cbf7cb4ab0c76932dd5e0db3958c163fac459114
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Nov 6 14:11:35 2014 +0100

    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/12289
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>

diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 9b11d66..0bb375d 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;