Mercurial > forge

changeset 12321:46513ae1cc51 octave-forge

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Suppress COM/ActiveX messages if dbug input arg == 0
author prnienhuis
date Fri, 17 Jan 2014 15:28:18 +0000
parents 5c34ac2b0137
children 312fb4e2ef6d
files main/io/inst/chk_spreadsheet_support.m
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/main/io/inst/chk_spreadsheet_support.m	Fri Jan 17 09:41:11 2014 +0000
+++ b/main/io/inst/chk_spreadsheet_support.m	Fri Jan 17 15:28:18 2014 +0000
@@ -167,6 +167,7 @@
 ## 2014-01-07 Style fixes; "forward slash expected" message conditional on dbug
 ## 2014-01-08 Keep track of loaded jars; allow unloading them; return them as output arg
 ##     ''     Return checked interfaces; update texinfo header
+## 2014-01-17 Tame messages about COM/ActiveX if dbug = 0
 
 function  [ retval, sinterfaces, loaded_jars ]  = chk_spreadsheet_support (path_to_jars, dbug, path_to_ooo)
 
@@ -241,10 +242,10 @@
       winpkgind = find (cellfun (@(x) strcmp(x.name, "windows"), pkglist), 1, "first");
       if (! isempty (winpkgind))
         winpkg = pkglist{winpkgind};
-        if (winpkg.loaded)
+        if (winpkg.loaded && dbug)
           printf ("MS-Excel couldn't be started (maybe because of 64-bit MS-Office?)\n");
         endif
-      else
+      elseif (dbug)
         printf ("(windows package is required for COM/ActiveX support)\n");
       endif
       printf ("\n");