From: <prn...@us...> - 2011-09-18 16:23:17
|
Revision: 8553 http://octave.svn.sourceforge.net/octave/?rev=8553&view=rev Author: prnienhuis Date: 2011-09-18 16:23:11 +0000 (Sun, 18 Sep 2011) Log Message: ----------- Fixed complaint about "matlab-style short-circuit' etc. Modified Paths: -------------- trunk/octave-forge/main/io/inst/chk_spreadsheet_support.m Modified: trunk/octave-forge/main/io/inst/chk_spreadsheet_support.m =================================================================== --- trunk/octave-forge/main/io/inst/chk_spreadsheet_support.m 2011-09-18 16:22:25 UTC (rev 8552) +++ trunk/octave-forge/main/io/inst/chk_spreadsheet_support.m 2011-09-18 16:23:11 UTC (rev 8553) @@ -81,6 +81,7 @@ % 2011-06-06 Fix for javaclasspath format in *nix w. octave-java-1.2.8 pkg % '' Fixed wrong return value update when adding UNO classes % 2011-09-03 Small fix to better detect Basis* subdir when searching unoil.jar +% 2011-09-18 FIxed 'Matlab style short circuit' warning in L. 152 jcp = []; retval = 0; if (nargin < 3); path_to_ooo= ''; end %if @@ -149,7 +150,7 @@ % Under *nix the classpath must first be split up. % Matlab is braindead here. For ML we need a replacement for Octave's builtin strsplit() % This is found on ML Central (BSD license so this is allowed) & adapted for input arg order - if (isunix & ~iscell (jcp)); jcp = strsplit (char (jcp), ':'); end %if + if (isunix && ~iscell (jcp)); jcp = strsplit (char (jcp), ':'); end %if if (dbug > 1) % Check JVM virtual memory settings jrt = javaMethod ('getRuntime', 'java.lang.Runtime'); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |