[Libreoffice-commits] .: oox/source

[Markus Mohrhard]

 oox/source/xls/formulaparser.cxx |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit eca67243b72bfabb6b69e68d148991aa304ecc32
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Wed Jul 13 10:01:46 2011 +0200

    fix for fdo#39023: shared formulas are not imported correctly from xlsx

diff --git a/oox/source/xls/formulaparser.cxx b/oox/source/xls/formulaparser.cxx
index 6c81c4e..efe700a 100644
--- a/oox/source/xls/formulaparser.cxx
+++ b/oox/source/xls/formulaparser.cxx
@@ -32,6 +32,7 @@
 #include <com/sun/star/sheet/ComplexReference.hpp>
 #include <com/sun/star/sheet/ExternalReference.hpp>
 #include <com/sun/star/sheet/FormulaToken.hpp>
+#include <com/sun/star/sheet/NameToken.hpp>
 #include <com/sun/star/sheet/ReferenceFlags.hpp>
 #include <com/sun/star/sheet/SingleReference.hpp>
 #include "oox/core/filterbase.hxx"
@@ -2860,7 +2861,10 @@ ApiTokenSequence FormulaParser::convertNameToFormula( sal_Int32 nTokenIndex ) co
 
     ApiTokenSequence aTokens( 1 );
     aTokens[ 0 ].OpCode = OPCODE_NAME;
-    aTokens[ 0 ].Data <<= nTokenIndex;
+    NameToken aNameTokenData;
+    aNameTokenData.Global = sal_True;
+    aNameTokenData.Index = nTokenIndex;
+    aTokens[ 0 ].Data <<= aNameTokenData;
     return aTokens;
 }