From: <prn...@us...> - 2011-09-04 20:02:27
|
Revision: 8494 http://octave.svn.sourceforge.net/octave/?rev=8494&view=rev Author: prnienhuis Date: 2011-09-04 20:02:21 +0000 (Sun, 04 Sep 2011) Log Message: ----------- Normal return if no ods support was detected (odsopen will have complained enough) Modified Paths: -------------- trunk/octave-forge/main/io/inst/odsfinfo.m Modified: trunk/octave-forge/main/io/inst/odsfinfo.m =================================================================== --- trunk/octave-forge/main/io/inst/odsfinfo.m 2011-09-04 20:01:36 UTC (rev 8493) +++ trunk/octave-forge/main/io/inst/odsfinfo.m 2011-09-04 20:02:21 UTC (rev 8494) @@ -72,19 +72,16 @@ ## 2010-05-31 Added remark about delays when determining occupied data range ## 2011-03-23 Adapted to odfdom 0.8.7 (changed getXPath method call) ## 2011-05-07 Experimental UNO support added -## 2011-07-29 Catch empty ods struct +## 2011-09-03 Normal return in case of no ODS support (empty ods struct) function [ filetype, sheetnames ] = odsfinfo (filename, reqintf=[]) onscreen = nargout < 1; ods = odsopen (filename, 0, reqintf); + # If no ods support was found, odsopen will have complained. Just return here + if (isempty (ods)), return; endif - if (isempty (ods)) - # odsopen will have complained sufficiently, so we just return here - return; - endif - filetype = 'OpenOffice.org Calc Document'; persistent adj_str; adj_str = ' '; # 30 char filler string This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |