diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-11-06 14:11:35 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-11-06 14:13:02 +0100 |
| commit | f3f63f555df87449b2d2a33718589b3afb3d9ddf (patch) | |
| tree | 36a3d34002b7cb1843da62c891adf9a76c9b4186 | |
| parent | SwFrmDlg ctor: turn sRestype into an OUString (diff) | |
| download | core-f3f63f555df87449b2d2a33718589b3afb3d9ddf.tar.gz core-f3f63f555df87449b2d2a33718589b3afb3d9ddf.zip | |
fdo#82038: senddoc, uri-encode got lost on Mac
Change-Id: I2f104c64601b22ce3ef078295c7da3cb21a133f9
| -rw-r--r-- | Repository.mk | 2 | ||||
| -rw-r--r-- | scp2/source/ooo/file_ooo.scp | 2 | ||||
| -rw-r--r-- | shell/Module_shell.mk | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Repository.mk b/Repository.mk index 970435f2fb5b..0e7b9b9ad7fa 100644 --- a/Repository.mk +++ b/Repository.mk @@ -144,7 +144,7 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,ooo, \ gengal \ $(if $(filter unx-TRUE,$(GUIBASE)-$(ENABLE_NPAPI_FROM_BROWSER)),pluginapp.bin) \ $(if $(filter unx-TRUE,$(GUIBASE)-$(ENABLE_TDE)),tdefilepicker) \ - $(if $(filter unx,$(GUIBASE)),uri-encode) \ + $(if $(filter WNT,$(OS)),,uri-encode) \ ui-previewer \ $(if $(filter WNT,$(OS)), \ senddoc \ diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index 86128d090956..5f31ae4f328d 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -158,7 +158,7 @@ End #endif -#if defined UNX && ! defined MACOSX +#if defined UNX File gid_File_Bin_Senddoc BIN_FILE_BODY; Dir = FILELIST_DIR; diff --git a/shell/Module_shell.mk b/shell/Module_shell.mk index 4a291ded9486..98f6c87690a7 100644 --- a/shell/Module_shell.mk +++ b/shell/Module_shell.mk @@ -115,7 +115,6 @@ ifneq ($(filter-out MACOSX WNT,$(OS)),) $(eval $(call gb_Module_add_targets,shell,\ Executable_gnome_open_url \ - Executable_uri_encode \ Library_recentfile \ Package_scripts \ Package_scripts_gnome \ @@ -127,6 +126,7 @@ endif ifneq ($(OS),WNT) $(eval $(call gb_Module_add_targets,shell,\ + Executable_uri_encode \ Library_cmdmail \ Package_senddoc \ )) |