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

[kyoshida svn gnome org]

Author: kyoshida
Date: Thu Aug 28 14:29:04 2008
New Revision: 13708
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13708&view=rev

Log:
2008-08-28  Kohei Yoshida  <kyoshida novell com>

	* patches/dev300/calc-external-defined-names.diff: fixed a problem with
	importing external names from .ods files.


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

Modified: trunk/patches/dev300/calc-external-defined-names.diff
==============================================================================
--- trunk/patches/dev300/calc-external-defined-names.diff	(original)
+++ trunk/patches/dev300/calc-external-defined-names.diff	Thu Aug 28 14:29:04 2008
@@ -715,7 +715,7 @@
      /** Xcl import may play dirty tricks with OpCode!=ocExternal.
          Others don't use! */
 diff --git sc/source/core/data/cell.cxx sc/source/core/data/cell.cxx
-index a68efc0..ed6a75e 100644
+index 538f982..ba0a973 100644
 --- sc/source/core/data/cell.cxx
 +++ sc/source/core/data/cell.cxx
 @@ -689,7 +689,12 @@ ScFormulaCell::ScFormulaCell( ScDocument* pDoc, const ScAddress& rNewPos,
@@ -1528,7 +1528,7 @@
  }
  
 diff --git sc/source/core/tool/compiler.cxx sc/source/core/tool/compiler.cxx
-index ee424fd..efaf1dc 100644
+index ee424fd..82bbbc1 100644
 --- sc/source/core/tool/compiler.cxx
 +++ sc/source/core/tool/compiler.cxx
 @@ -74,9 +74,11 @@
@@ -2291,6 +2291,15 @@
  BOOL ScCompiler::IsDBRange( const String& rName )
  {
      USHORT n;
+@@ -3216,7 +3780,7 @@ BOOL ScCompiler::NextNewToken( bool bInArray )
+         if (mnPredetectedReference)
+         {
+             String aStr( cSymbol);
+-            if (!IsPredetectedReference( aStr))
++            if (!IsPredetectedReference( aStr) && !IsExternalNamedRange( aStr))
+             {
+                 /* TODO: it would be nice to generate a #REF! error here, which
+                  * would need an ocBad token with additional error value.
 @@ -3279,6 +3843,7 @@ BOOL ScCompiler::NextNewToken( bool bInArray )
                && !(bAllowBooleans && IsBoolean( aUpper ))
                && !IsValue( aUpper )
@@ -6054,7 +6063,7 @@
  //------------------------------------------------------------------
  
 diff --git sc/source/filter/xml/xmlexprt.cxx sc/source/filter/xml/xmlexprt.cxx
-index 52f5145..c8c629e 100644
+index 441f463..535ed45 100644
 --- sc/source/filter/xml/xmlexprt.cxx
 +++ sc/source/filter/xml/xmlexprt.cxx
 @@ -68,6 +68,7 @@
@@ -6459,7 +6468,7 @@
  				}
  				if (getExportFlags() & EXPORT_MASTERSTYLES)
  				{
-@@ -3316,6 +3336,183 @@ void ScXMLExport::WriteNamedExpressions(const com::sun::star::uno::Reference <co
+@@ -3333,6 +3353,183 @@ void ScXMLExport::WriteNamedExpressions(const com::sun::star::uno::Reference <co
  	}
  }
  
@@ -6644,7 +6653,7 @@
  void ScXMLExport::WriteConsolidation()
  {
 diff --git sc/source/filter/xml/xmlexprt.hxx sc/source/filter/xml/xmlexprt.hxx
-index 779f94e..6a366f5 100644
+index 47171b6..e8477e5 100644
 --- sc/source/filter/xml/xmlexprt.hxx
 +++ sc/source/filter/xml/xmlexprt.hxx
 @@ -98,6 +98,7 @@ class ScXMLExport : public SvXMLExport
@@ -6655,7 +6664,7 @@
      rtl::OUString               sAttrName;
      rtl::OUString               sAttrStyleName;
      rtl::OUString               sAttrColumnsRepeated;
-@@ -194,6 +195,7 @@ class ScXMLExport : public SvXMLExport
+@@ -195,6 +196,7 @@ class ScXMLExport : public SvXMLExport
  	void WriteTheLabelRanges(const com::sun::star::uno::Reference< com::sun::star::sheet::XSpreadsheetDocument >& xSpreadDoc);
  	void WriteLabelRanges( const com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess >& xRangesIAccess, sal_Bool bColumn );
  	void WriteNamedExpressions(const com::sun::star::uno::Reference <com::sun::star::sheet::XSpreadsheetDocument>& xSpreadDoc);