Commits

Anonymous committed 771e4c9 Merge

CWS-TOOLING: integrate CWS jsc331

  • Participants
  • Parent commits 1d3040b, afab29b

Comments (0)

Files changed (2)

basic/source/sbx/sbxbool.cxx

             {
                 if( p->pOUString->equalsIgnoreAsciiCase( SbxRes( STRING_TRUE ) ) )
                     nRes = SbxTRUE;
-                else if( p->pOUString->equalsIgnoreAsciiCase( SbxRes( STRING_FALSE ) ) )
+                else if( !p->pOUString->equalsIgnoreAsciiCase( SbxRes( STRING_FALSE ) ) )
                 {
                     // Jetzt kann es noch in eine Zahl konvertierbar sein
                     BOOL bError = TRUE;
 #
 
 use IO::File;
+use File::Basename;
 
 $main::hostname= $ARGV[0];
 $main::sdkpath= $ARGV[1];
 {
 #	$main::OO_SDK_URE_HOME = `cd $main::sdkpath/../ure-link && pwd`;
 } else {
-	$main::OO_SDK_URE_HOME = `cd $main::sdkpath/../../ure && pwd`;
+	$main::OO_SDK_URE_HOME = `cd $main::sdkpath/../ure-link && pwd`;
 }
 chomp($main::OO_SDK_URE_HOME);
 
 {
     my $base= shift;
     my $link= shift;
-    my $linktarget =  readlink "$base/$link"; 
+
+    my $resolvedpath = "$base/$link";
+    my $linktarget =  readlink "$resolvedpath"; 
     my $resolvedlink = "";
 
     while ( $linktarget ne "") {
-	$link = $linktarget;
-	$linktarget = readlink "$base/$link";
+
+	if ( $linktarget =~ m/^\/.*/ )
+	{
+	    $resolvedpath = "$linktarget";
+	} else {
+	    $resolvedpath = `cd $base/$linktarget; pwd`;
+	    chop $resolvedpath;
+	}
+	$base = dirname("$resolvedpath");
+
+	$linktarget = readlink "$resolvedpath";
     }
 
-    $resolvedlink = `cd $base/$link; pwd`;
+    $resolvedlink = `cd $resolvedpath; pwd`;
     chop $resolvedlink;
     return $resolvedlink;
 }
     {
 		if ( $main::operatingSystem =~ m/darwin/ ) {
 			$progDir = resolveLink("/System/Library/Frameworks/JavaVM.Framework/Versions", "CurrentJDK");
+
 			if ( -e "$progDir/$main::OO_SDK_JAVA_BIN_DIR/javac" )
 			{
 				return "$progDir/$main::OO_SDK_JAVA_BIN_DIR";