CWS-TOOLING: integrate CWS mooxlsc

2008-12-12 09:32:19 +0100 dr  r265390 : #i10000# warning
2008-12-11 14:54:26 +0100 dr  r265301 : add strings from dr66 to meet ui freeze
2008-12-11 14:53:20 +0100 dr  r265300 : add strings from dr66 to meet ui freeze
2008-12-08 14:43:25 +0100 er  r264997 : DBG_... need semicolon
2008-12-04 19:16:50 +0100 er  r264872 : DBG_... needs semicolon
2008-12-04 11:09:27 +0100 er  r264824 : DBG_ERROR needs semicolon
2008-12-03 13:29:46 +0100 er  r264770 : CWS-TOOLING: rebase CWS mooxlsc to trunk@264325 (milestone: DEV300:m36)
2008-12-02 16:49:09 +0100 er  r264722 : disable code for named references #i4385# import as long as #i3740# isn't fully implemented
2008-12-02 16:45:04 +0100 er  r264721 : some compilers attempt to be too smart; persuade them it's really meant what was written
2008-12-02 16:04:56 +0100 er  r264715 : #i3740# no storage in ODF for external name references
2008-11-29 02:20:50 +0100 er  r264575 : some huge performance improvement when reading repeated empty rows for the external references cache from ODF, as they often occur in the sparse matrix
2008-11-29 01:14:55 +0100 er  r264574 : WriteExternalRefCaches: for table:number-columns-repeated write used columns instead of MAXCOLCOUNT
2008-11-28 18:30:04 +0100 er  r264570 : #i3740# write/read external name references as bracketed references, as proposed on the ODFF list
2008-11-27 20:36:54 +0100 er  r264521 : merge i95068 from cws calc46 for code correctness
2008-11-21 20:39:34 +0100 kohei  r264174 : fixed a crash when importing a BIFF8 document with per-sheet external names.
For now, we don't support per-sheet external names.  Let's throw in NoName
error until they are supported.
2008-11-21 18:47:27 +0100 kohei  r264168 : I forgot to process cached range references in the EXTERNNAME record, which 
prevented cached external names with range references from being imported 
correctly.
P.S. I swear I thought I had covered this....
2008-11-20 23:07:22 +0100 er  r264104 : #i4385# parse external defined names in MOOXML import
2008-11-14 23:18:54 +0100 er  r263700 : #i92797# parse external sheet references under aspects of MOOXML import and new ScExternalRefManager
2008-11-14 18:49:48 +0100 er  r263696 : remove infinity assertion, leftover from binary file format; coded double error may occur via filter import
2008-11-12 13:29:44 +0100 er  r263593 : make references to entire rows/columns, such as A:A or 3:3, actually work in MOOXML import
2008-11-03 12:35:11 +0100 er  r263282 : a struct is a struct is a ...
2008-10-31 00:30:59 +0100 er  r262843 : aTableRowCellAttrTokenMap needed
2008-10-31 00:26:07 +0100 er  r262842 : GetTableRowCellAttrTokenMap() is not unused
2008-10-31 00:13:53 +0100 er  r262841 : merge error
2008-10-31 00:05:39 +0100 er  r262840 : merge error
2008-10-30 23:17:48 +0100 er  r262839 : unresolved merge conflict!?!
2008-10-30 22:59:11 +0100 er  r262838 : merge error
2008-10-30 16:31:04 +0100 hr  r262833 : CWS-TOOLING: rebase CWS mooxlsc to trunk@262620 (milestone: DEV300:m34)
2008-10-16 21:57:51 +0200 er  r262272 : migrate CWS mooxlsc to SVN

1 files changed, 11 insertions, 8 deletions

diff --git a/sc/source/ui/unoobj/nameuno.cxx b/sc/source/ui/unoobj/nameuno.cxx
index 2e378c03c..beffb2fea 100644
--- a/sc/source/ui/unoobj/nameuno.cxx
+++ b/sc/source/ui/unoobj/nameuno.cxx
@@ -1,13 +1,13 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: nameuno.cxx,v $
- * $Revision: 1.21 $
+ * $Revision: 1.21.132.2 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -313,11 +313,11 @@ uno::Sequence<sheet::FormulaToken> SAL_CALL ScNamedRangeObj::getTokens() throw(u
     ScUnoGuard aGuard;
     uno::Sequence<sheet::FormulaToken> aSequence;
     ScRangeData* pData = GetRangeData_Impl();
-    if (pData)
+    if (pData && pDocShell)
     {
         ScTokenArray* pTokenArray = pData->GetCode();
         if ( pTokenArray )
-            (void)ScTokenConversion::ConvertToTokenSequence( aSequence, *pTokenArray );
+            (void)ScTokenConversion::ConvertToTokenSequence( *pDocShell->GetDocument(), aSequence, *pTokenArray );
     }
     return aSequence;
 }
@@ -325,10 +325,13 @@ uno::Sequence<sheet::FormulaToken> SAL_CALL ScNamedRangeObj::getTokens() throw(u
 void SAL_CALL ScNamedRangeObj::setTokens( const uno::Sequence<sheet::FormulaToken>& rTokens ) throw(uno::RuntimeException)
 {
     ScUnoGuard aGuard;
-    ScTokenArray aTokenArray;
-    (void)ScTokenConversion::ConvertToTokenArray( aTokenArray, rTokens );
-    // GRAM_PODF_A1 for API compatibility.
-    Modify_Impl( NULL, &aTokenArray, NULL, NULL, NULL, ScGrammar::GRAM_PODF_A1 );
+    if( pDocShell )
+    {
+        ScTokenArray aTokenArray;
+        (void)ScTokenConversion::ConvertToTokenArray( *pDocShell->GetDocument(), aTokenArray, rTokens );
+        // GRAM_PODF_A1 for API compatibility.
+        Modify_Impl( NULL, &aTokenArray, NULL, NULL, NULL, ScGrammar::GRAM_PODF_A1 );
+    }
 }