#122478# further cleanup for 3layer changes

3 files changed, 14 insertions, 43 deletions

diff --git a/desktop/scripts/unoinfo.sh b/desktop/scripts/unoinfo.sh
index 82fbe57ba22c..bb10207a7e9b 100644
--- a/desktop/scripts/unoinfo.sh
+++ b/desktop/scripts/unoinfo.sh
@@ -34,14 +34,14 @@ sd_prog=`pwd`
 
 case $1 in
 c++)
-    printf '%s' "$sd_prog/../basis-link/ure-link/lib"
+    printf '%s' "$sd_prog"
     ;;
 java)
     printf '0%s\0%s\0%s\0%s\0%s' \
-        "$sd_prog/../basis-link/ure-link/share/java/ridl.jar" \
-        "$sd_prog/../basis-link/ure-link/share/java/jurt.jar" \
-        "$sd_prog/../basis-link/ure-link/share/java/juh.jar" \
-        "$sd_prog/../basis-link/program/classes/unoil.jar" "$sd_prog"
+        "$sd_prog/classes/ridl.jar" \
+        "$sd_prog/classes/jurt.jar" \
+        "$sd_prog/classes/java/juh.jar" \
+        "$sd_prog/classes/unoil.jar" "$sd_prog"
     ;;
 *)
     exit 1
diff --git a/desktop/scripts/unopkg.sh b/desktop/scripts/unopkg.sh
index 71421e40de05..c0b5eac1a0d0 100644
--- a/desktop/scripts/unopkg.sh
+++ b/desktop/scripts/unopkg.sh
@@ -58,7 +58,7 @@ fi
 
 # extend the ld_library_path for java: javaldx checks the sofficerc for us
 if [ -x "$sd_prog/../basis-link/ure-link/bin/javaldx" ] ; then
-    my_path=`"$sd_prog/../basis-link/ure-link/bin/javaldx" $BOOTSTRAPVARS $JVMFWKPARAMS \
+    my_path=`"$sd_prog/javaldx" $BOOTSTRAPVARS $JVMFWKPARAMS \
         "-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc"`
     if [ -n "$my_path" ] ; then
         LD_LIBRARY_PATH=$my_path${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
diff --git a/desktop/win32/source/unoinfo.cxx b/desktop/win32/source/unoinfo.cxx
index 2268fec3048d..dbf34cfa3b4e 100644
--- a/desktop/win32/source/unoinfo.cxx
+++ b/desktop/win32/source/unoinfo.cxx
@@ -66,10 +66,7 @@ void writePath(
     if (end == NULL) {
         exit(EXIT_FAILURE);
     }
-    std::size_t n = (end - path) * sizeof (wchar_t);
-    if (fwrite(path, 1, n, stdout) != n) {
-        exit(EXIT_FAILURE);
-    }
+    fprintf(stdout, "%S", path);
 }
 
 }
@@ -83,23 +80,12 @@ int wmain(int argc, wchar_t ** argv, wchar_t **) {
 #endif
         wchar_t path[MAX_PATH];
         wchar_t * pathEnd = getBrandPath(path);
-        if (tools::buildPath(path, path, pathEnd, MY_STRING(L"..\\basis-link"))
-            == NULL)
-        {
-            exit(EXIT_FAILURE);
-        }
-        pathEnd = tools::resolveLink(path);
-        if (pathEnd == NULL ||
-            (tools::buildPath(path, path, pathEnd, MY_STRING(L"\\ure-link")) ==
-             NULL))
-        {
-            exit(EXIT_FAILURE);
-        }
-        pathEnd = tools::resolveLink(path);
+
         if (pathEnd == NULL) {
             exit(EXIT_FAILURE);
         }
-        writePath(path, pathEnd, MY_STRING(L"\\bin"));
+
+        writePath(path, pathEnd, MY_STRING(L""));
 #ifdef __MINGW32__
     } else if (argc == 2 && strcmp(argv[1], "java") == 0) {
 #else
@@ -111,32 +97,17 @@ int wmain(int argc, wchar_t ** argv, wchar_t **) {
         wchar_t path[MAX_PATH];
         wchar_t * pathEnd = getBrandPath(path);
         writePath(path, pathEnd, MY_STRING(L""));
-        if (tools::buildPath(path, path, pathEnd, MY_STRING(L"..\\basis-link"))
-            == NULL)
-        {
-            exit(EXIT_FAILURE);
-        }
-        pathEnd = tools::resolveLink(path);
         if (pathEnd == NULL) {
             exit(EXIT_FAILURE);
         }
         writeNull();
-        writePath(path, pathEnd, MY_STRING(L"\\program\\classes\\unoil.jar"));
-        if (tools::buildPath(path, path, pathEnd, MY_STRING(L"\\ure-link")) ==
-            NULL)
-        {
-            exit(EXIT_FAILURE);
-        }
-        pathEnd = tools::resolveLink(path);
-        if (pathEnd == NULL) {
-            exit(EXIT_FAILURE);
-        }
+        writePath(path, pathEnd, MY_STRING(L"classes\\unoil.jar"));
         writeNull();
-        writePath(path, pathEnd, MY_STRING(L"\\java\\ridl.jar"));
+        writePath(path, pathEnd, MY_STRING(L"\classes\\ridl.jar"));
         writeNull();
-        writePath(path, pathEnd, MY_STRING(L"\\java\\jurt.jar"));
+        writePath(path, pathEnd, MY_STRING(L"classes\\jurt.jar"));
         writeNull();
-        writePath(path, pathEnd, MY_STRING(L"\\java\\juh.jar"));
+        writePath(path, pathEnd, MY_STRING(L"classes\\juh.jar"));
     } else {
         exit(EXIT_FAILURE);
     }