[Libreoffice-commits] .: desktop/unx

[Christian Lohmaier]

 desktop/unx/source/start.c |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit f748f8818428626f0e31cddebd4164190ab6b92b
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Mon May 9 19:49:15 2011 +0200

    WaE unused method (Mac)/use REL_PATH in both places, not only once (non-Mac)

diff --git a/desktop/unx/source/start.c b/desktop/unx/source/start.c
index b6ae8aa..26d771b 100755
--- a/desktop/unx/source/start.c
+++ b/desktop/unx/source/start.c
@@ -728,23 +728,25 @@ system_checks( void )
 /* re-use the pagein code */
 extern int pagein_execute (int argc, char **argv);
 
-#define REL_PATH "/../basis-link/program"
+#ifndef MACOSX
+#define REL_PATH "/../basis-link/program/"
 static char *build_pagein_path (Args *args, const char *pagein_name)
 {
     char *path;
     rtl_String *app_path;
 
     app_path = ustr_to_str (args->pAppPath);
-    path = malloc (app_path->length + strlen (pagein_name) + sizeof (REL_PATH) + 8);
+    path = malloc (app_path->length + strlen (pagein_name) + sizeof (REL_PATH) + 1);
     strcpy (path, "@");
     strcpy (path + 1, rtl_string_getStr (app_path));
-    strcat (path, "/../basis-link/program/");
+    strcat (path, REL_PATH);
     strcat (path, pagein_name);
 
     rtl_string_release( app_path );
 
     return path;
 }
+#endif
 
 void
 exec_pagein (Args *args)