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

[kyoshida svn gnome org]

Author: kyoshida
Date: Mon Feb  2 16:25:46 2009
New Revision: 15274
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15274&view=rev

Log:
2009-02-02  Kohei Yoshida  <kyoshida novell com>

	* patches/dev300/calc-external-defined-names-enable.diff: removed by 
	accident.  We still need this patch.

	* patches/dev300/calc-formula-variable-separators-officecfg.diff: 
	restored the old config node "FormulaSyntax" in order to get the 
	migration to work.  The migration work is, however, met with one major
	difficulty in that the config cache refreshing no longer works probably
	due to the 3-layer thing. (n#466064)


Added:
   trunk/patches/dev300/calc-external-defined-names-enable.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/calc-formula-variable-separators-officecfg.diff

Added: trunk/patches/dev300/calc-external-defined-names-enable.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/calc-external-defined-names-enable.diff	Mon Feb  2 16:25:46 2009
@@ -0,0 +1,26 @@
+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())
+                             {
+diff --git sc/source/core/tool/compiler.cxx sc/source/core/tool/compiler.cxx
+index 4cb6bdd..ad87394 100644
+--- sc/source/core/tool/compiler.cxx
++++ sc/source/core/tool/compiler.cxx
+@@ -2909,7 +2909,7 @@ bool ScCompiler::IsExternalNamedRange( const String& rSymbol )
+      * spec first. Until then don't pretend to support external names that 
+      * wouldn't survive a save and reload cycle, return false instead. */
+ 
+-#if 0
++#if 1
+     if (!pConv)
+         return false;
+ 

Modified: trunk/patches/dev300/calc-formula-variable-separators-officecfg.diff
==============================================================================
--- trunk/patches/dev300/calc-formula-variable-separators-officecfg.diff	(original)
+++ trunk/patches/dev300/calc-formula-variable-separators-officecfg.diff	Mon Feb  2 16:25:46 2009
@@ -1,8 +1,40 @@
 diff --git officecfg/registry/schema/org/openoffice/Office/Calc.xcs officecfg/registry/schema/org/openoffice/Office/Calc.xcs
-index 8f02c5f..e6e2ec6 100644
+index 6a6a533..ef0bd3d 100644
 --- officecfg/registry/schema/org/openoffice/Office/Calc.xcs
 +++ officecfg/registry/schema/org/openoffice/Office/Calc.xcs
-@@ -1202,6 +1202,64 @@
+@@ -1204,6 +1204,31 @@
+ 					</info>
+ 					<value>true</value>
+ 				</prop>
++				<prop oor:name="FormulaSyntax" oor:type="xs:int">
++					<!-- UIHints: Tools - Options  Spreadsheet  Calculate -->
++					<!-- This node is deprecated, but we still need to keep it for migration purposes. -->
++					<info>
++						<author>kyoshida</author>
++						<desc>Specifies what formula syntax type to use.</desc>
++					</info>
++					<constraints>
++						<enumeration oor:value="0">
++							<info>
++								<desc>Calc A1</desc>
++							</info>
++						</enumeration>
++						<enumeration oor:value="1">
++							<info>
++								<desc>Excel A1</desc>
++							</info>
++						</enumeration>
++						<enumeration oor:value="2">
++							<info>
++								<desc>Excel R1C1</desc>
++							</info>
++						</enumeration>
++					</constraints>
++				</prop>
+ 				<node-ref oor:name="Date" oor:node-type="Date">
+ 					<info>
+ 						<desc>Specifies the date that is represented by the number 0.</desc>
+@@ -1211,6 +1236,64 @@
  				</node-ref>
  			</group>
  		</group>