ooo-build r15124 - in trunk: . patches/dev300

[kyoshida svn gnome org]

Author: kyoshida
Date: Thu Jan 22 03:30:11 2009
New Revision: 15124
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15124&view=rev

Log:
2009-01-21  Kohei Yoshida  <kyoshida novell com>

	* patches/dev300/calc-external-defined-names-enable.diff:
	* patches/dev300/apply: re-enable the external range name feature which
	has been upstreamed but disabled.


Added:
   trunk/patches/dev300/calc-external-defined-names-enable.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Thu Jan 22 03:30:11 2009
@@ -2004,8 +2004,8 @@
 calc-external-defined-names-svtools.diff, i#3740, i#4385, n#355685, kohei
 
 [ CalcFixes >= dev300-m38 ]
-# Implement external range names.
-# TODO: this feature is partially upstreamed.  Enable this in ooo-build.
+# Enable external defined name import on xls documents.
+calc-external-defined-names-enable.diff, kohei
 
 [ CalcFixes ]
 # Don't adjust row height on xls load for better layout preservation and

Added: trunk/patches/dev300/calc-external-defined-names-enable.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/calc-external-defined-names-enable.diff	Thu Jan 22 03:30:11 2009
@@ -0,0 +1,13 @@
+diff --git sc/source/filter/excel/excform8.cxx sc/source/filter/excel/excform8.cxx
+index 2580ef8..1ece12d 100644
+--- sc/source/filter/excel/excform8.cxx
++++ sc/source/filter/excel/excform8.cxx
+@@ -642,7 +642,7 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn,
+                              * external name reference can be stored in ODF, 
+                              * which remains to be done for #i3740#. Until then 
+                              * create a #NAME? token. */
+-#if 0
++#if 1
+                             sal_uInt16 nFileId;
+                             if (!GetExternalFileIdFromXti(nXtiIndex, nFileId) || !pExtName->HasFormulaTokens())
+                             {