[PATCH] Let's assume nobody needs the sbase, scalc etc scripts on OS...

[Tor Lillqvist (via Code Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/3930

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/30/3930/1

Let's assume nobody needs the sbase, scalc etc scripts on OS X

It's always possible to run the soffice executable from the same
location with a --base, --calc etc command-line option instead.

(That is not the normal way for Mac users to open an empty document
for the specific aspect of LibreOffice (Calc, Writer, etc) either.
Instead, the usual way (says cloph) is to keep a corresponding
template document in the Dock and click that.)

Change-Id: Iceea270c03a63f674e7dfdfa95117cb3bdd15184
---
M scp2/source/base/file_base.scp
M scp2/source/calc/file_calc.scp
M scp2/source/draw/file_draw.scp
M scp2/source/impress/file_impress.scp
M scp2/source/math/file_math.scp
M scp2/source/writer/file_writer.scp
6 files changed, 12 insertions(+), 0 deletions(-)



diff --git a/scp2/source/base/file_base.scp b/scp2/source/base/file_base.scp
index fb1a230..122353e 100644
--- a/scp2/source/base/file_base.scp
+++ b/scp2/source/base/file_base.scp
@@ -27,12 +27,14 @@
 
 #include "macros.inc"
 
+#ifndef MACOSX
 File gid_File_Exe_Sbase
     BIN_FILE_BODY;
     Dir = gid_Brand_Dir_Program;
     Name = EXENAME(sbase);
     Styles = (PACKED);
 End
+#endif
 
 #if defined WNT
 File gid_File_Exe_Odbcconfig
diff --git a/scp2/source/calc/file_calc.scp b/scp2/source/calc/file_calc.scp
index 8f5dfbb..6aa84de 100644
--- a/scp2/source/calc/file_calc.scp
+++ b/scp2/source/calc/file_calc.scp
@@ -77,9 +77,11 @@
 End
 #endif
 
+#ifndef MACOSX
 File gid_File_Exe_Scalc
     BIN_FILE_BODY;
     Dir = gid_Brand_Dir_Program;
     Name = EXENAME(scalc);
     Styles = (PACKED);
 End
+#endif
diff --git a/scp2/source/draw/file_draw.scp b/scp2/source/draw/file_draw.scp
index 4b7c4db..c757a05 100644
--- a/scp2/source/draw/file_draw.scp
+++ b/scp2/source/draw/file_draw.scp
@@ -42,9 +42,11 @@
 End
 #endif
 
+#ifndef MACOSX
 File gid_File_Exe_Sdraw
     BIN_FILE_BODY;
     Dir = gid_Brand_Dir_Program;
     Name = EXENAME(sdraw);
     Styles = (PACKED);
 End
+#endif
diff --git a/scp2/source/impress/file_impress.scp b/scp2/source/impress/file_impress.scp
index bff0354..5bcb34d5 100644
--- a/scp2/source/impress/file_impress.scp
+++ b/scp2/source/impress/file_impress.scp
@@ -54,12 +54,14 @@
 End
 #endif
 
+#ifndef MACOSX
 File gid_File_Exe_Simpress
     BIN_FILE_BODY;
     Dir = gid_Brand_Dir_Program;
     Name = EXENAME(simpress);
     Styles = (PACKED);
 End
+#endif
 
 // configuration files for custom animation effects
 
diff --git a/scp2/source/math/file_math.scp b/scp2/source/math/file_math.scp
index 455c9ca..0c016ee 100644
--- a/scp2/source/math/file_math.scp
+++ b/scp2/source/math/file_math.scp
@@ -48,9 +48,11 @@
 End
 #endif
 
+#ifndef MACOSX
 File gid_File_Exe_Smath
     BIN_FILE_BODY;
     Dir = gid_Brand_Dir_Program;
     Name = EXENAME(smath);
     Styles = (PACKED);
 End
+#endif
diff --git a/scp2/source/writer/file_writer.scp b/scp2/source/writer/file_writer.scp
index 19e4efa..43b8127 100644
--- a/scp2/source/writer/file_writer.scp
+++ b/scp2/source/writer/file_writer.scp
@@ -27,12 +27,14 @@
 
 #include "macros.inc"
 
+#ifndef MACOSX
 File gid_File_Exe_Swriter
     BIN_FILE_BODY;
     Dir = gid_Brand_Dir_Program;
     Name = EXENAME(swriter);
     Styles = (PACKED);
 End
+#endif
 
 #ifdef WNT
 File gid_File_Exe_Sweb

-- 
To view, visit https://gerrit.libreoffice.org/3930
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iceea270c03a63f674e7dfdfa95117cb3bdd15184
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Tor Lillqvist <tml at iki.fi>