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

[kyoshida svn gnome org]

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

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

	* patches/dev300/calc-external-defined-names-empty-cells.diff:
	* patches/dev300/apply: treat non-cached cells as empty cells if the 
	enclosing table itself is cached.  This prevents #REF! error when the 
	referenced external cell is not in cache.


Added:
   trunk/patches/dev300/calc-external-defined-names-empty-cells.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 05:11:25 2009
@@ -2008,6 +2008,9 @@
 calc-external-defined-names-enable.diff, kohei
 
 [ CalcFixes ]
+# Treat non-cache cells as empty cells if the table itself is cached.
+calc-external-defined-names-empty-cells.diff, kohei
+
 # Don't adjust row height on xls load for better layout preservation and
 # faster file load.
 calc-xls-disable-adjust-row-height.diff, kohei

Added: trunk/patches/dev300/calc-external-defined-names-empty-cells.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/calc-external-defined-names-empty-cells.diff	Thu Jan 22 05:11:25 2009
@@ -0,0 +1,24 @@
+diff --git sc/source/ui/docshell/externalrefmgr.cxx sc/source/ui/docshell/externalrefmgr.cxx
+index ae5015d..d3f770b 100644
+--- sc/source/ui/docshell/externalrefmgr.cxx
++++ sc/source/ui/docshell/externalrefmgr.cxx
+@@ -161,7 +161,8 @@ ScExternalRefCache::TokenRef ScExternalRefCache::Table::getCell(SCCOL nCol, SCRO
+     if (itrTable == maRows.end())
+     {
+         // this table doesn't have the specified row.
+-        return TokenRef();
++        TokenRef p(new ScEmptyCellToken(false, false));
++        return p;
+     }
+ 
+     const RowDataType& rRowData = itrTable->second;
+@@ -169,7 +170,8 @@ ScExternalRefCache::TokenRef ScExternalRefCache::Table::getCell(SCCOL nCol, SCRO
+     if (itrRow == rRowData.end())
+     {
+         // this row doesn't have the specified column.
+-        return TokenRef();
++        TokenRef p(new ScEmptyCellToken(false, false));
++        return p;
+     }
+ 
+     const Cell& rCell = itrRow->second;