Changeset 42cf8c9 in tol

Timestamp:

Aug 18, 2010, 1:17:08 PM (16 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

075e4f0

Parents:

7d960bd

Message:

refs #851, sheet indices are 1-based

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@2481 be4846ae-f051-483a-831f-b64e7d08527f

Location:

tol/contrib/excel

Files:

• test.tol (modified) (1 diff)
• tolExcel.cpp (modified) (2 diffs)

tol/contrib/excel/test.tol

@@ -1 +1 @@
 Text my.dir = GetAbsolutePath(".") + "/";
 Real id = Excel.Open( my.dir + "test.xls" );
-Real Excel.ActivateWS( id, 0 );
+Real Excel.ActivateWS( id, 1 );
 
 WriteLn( "Lectura Anyhting ..." );

tol/contrib/excel/tolExcel.cpp

@@ -621 +621 @@
   if ( index.IsKnown() ) {
     int idx = int( index.Value() );
-    if ( idx >= 0 ) {
+    if ( idx > 0 ) {
       TolExcel *xls = TolExcel::decode_addr( addr );
       if ( xls ) {
-        bool status = xls->SetActiveWS( size_t( idx ) );
+        bool status = xls->SetActiveWS( size_t( idx - 1 ) );
         if ( !status ) {
           char buffer[16];
@@ -641 +641 @@
     } else {
       Error( BText( "Excel.ActivateWS: " ) +
-             I2( "invalid work sheet index, must be >= 0",
-                 "indice de hoja invalido, debe ser >= 0") );
+             I2( "invalid work sheet index, must be >= 1",
+                 "indice de hoja invalido, debe ser >= 1") );
       contens_ = BDat( 0.0 );
     }