ooo-build r13401 - in trunk: . scratch/sc-xlsutil/src

[kyoshida svn gnome org]

Author: kyoshida
Date: Sat Jul 26 04:32:22 2008
New Revision: 13401
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13401&view=rev

Log:
2008-07-26  Kohei Yoshida  <kyoshida novell com>

	* scratch/sc-xlsutil/src/formula.py: tweaked the cell range parsing to
	give correct output.  The cell range token doesn't have two sheet IDs
	but it has one externSheet record ID which provides the sheet range.


Modified:
   trunk/ChangeLog
   trunk/scratch/sc-xlsutil/src/formula.py

Modified: trunk/scratch/sc-xlsutil/src/formula.py
==============================================================================
--- trunk/scratch/sc-xlsutil/src/formula.py	(original)
+++ trunk/scratch/sc-xlsutil/src/formula.py	Sat Jul 26 04:32:22 2008
@@ -190,7 +190,7 @@
     def parse (self, i):
         try:
             i += 1
-            self.sheet1 = globals.getSignedInt(self.tokens[i:i+2])
+            self.extSheetId = globals.getSignedInt(self.tokens[i:i+2])
             i += 2
             self.cell = parseCellAddress(self.tokens[i:i+4])
             i += 4
@@ -202,8 +202,7 @@
         if self.cell == None:
             return ''
         cellName = self.cell.getName()
-        sheetName = makeSheetName(self.sheet1, self.sheet1)
-        return "<3dref %s cellAddress='%s'>"%(sheetName, cellName)
+        return "<3dref externSheetID=%d cellAddress='%s'>"%(self.extSheetId, cellName)
 
 
 class Ref3dA(Ref3dV):
@@ -218,9 +217,7 @@
         try:
             op = self.tokens[i]
             i += 1
-            self.sheet1 = globals.getSignedInt(self.tokens[i:i+2])
-            i += 2
-            self.sheet2 = globals.getSignedInt(self.tokens[i:i+2])
+            self.extSheetId = globals.getSignedInt(self.tokens[i:i+2])
             i += 2
             self.cellrange = parseCellRangeAddress(self.tokens[i:i+8])
         except InvalidCellAddress:
@@ -231,8 +228,7 @@
         if self.cellrange == None:
             return ''
         cellRangeName = self.cellrange.getName()
-        sheetName = makeSheetName(self.sheet1, self.sheet2)
-        return "<3drange %s rangeAddress='%s'>"%(sheetName, cellRangeName)
+        return "<3drange externSheetID=%d rangeAddress='%s'>"%(self.extSheetId, cellRangeName)