[ooo-build-commit] scratch/mso-dumper

[Kohei Yoshida]

 scratch/mso-dumper/src/xlsrecord.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 8032744538f64eca89dc65beeda71f05c861e5cd
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Mon Jan 4 23:51:15 2010 -0500

    [xls-dump] Use the new parser for FORMULA record in flat dump mode.
    
    * scratch/mso-dumper/src/xlsrecord.py:

diff --git a/scratch/mso-dumper/src/xlsrecord.py b/scratch/mso-dumper/src/xlsrecord.py
index 76799b0..c898008 100644
--- a/scratch/mso-dumper/src/xlsrecord.py
+++ b/scratch/mso-dumper/src/xlsrecord.py
@@ -520,7 +520,7 @@ class Formula(BaseRecordHandler):
 
     def parseBytes (self):
         self.__parseBytes()
-        fparser = formula.FormulaParser(self.header, self.tokens)
+        fparser = formula.FormulaParser2(self.header, self.tokens)
         fparser.parse()
         ftext = fparser.getText()
 
@@ -531,7 +531,7 @@ class Formula(BaseRecordHandler):
         self.appendLine("calculate on open: %d"%self.calcOnOpen)
         self.appendLine("shared formula: %d"%self.sharedFormula)
         self.appendLine("formula bytes: %s"%globals.getRawBytes(self.tokens, True, False))
-        self.appendLine("tokens: "+ftext)
+        self.appendLine("formula string: "+ftext)
 
     def fillModel (self, model):
         self.__parseBytes()