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

[kyoshida svn gnome org]

Author: kyoshida
Date: Tue Jan 27 22:58:10 2009
New Revision: 15183
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15183&view=rev

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

	* patches/dev300/calc-dde-always-ooo-conv-m39.diff:
	* patches/dev300/calc-dde-always-ooo-conv.diff:
	* patches/dev300/apply: adjusted for dev300-m40.



Added:
   trunk/patches/dev300/calc-dde-always-ooo-conv-m39.diff   (props changed)
      - copied unchanged from r15169, /trunk/patches/dev300/calc-dde-always-ooo-conv.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/calc-dde-always-ooo-conv.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Jan 27 22:58:10 2009
@@ -1106,7 +1106,11 @@
 # fix 'Identify Categories' greakage on grouping.
 calc-dp-group-ident-category-fix.diff, n#447182, i#96171, kohei
 
-[ CalcFixes ]
+[ CalcFixes <= dev300-m39 ]
+# always use OOo address convention when parsing address in DDE function.
+calc-dde-always-ooo-conv-m39.diff, n#442143, kohei
+
+[ CalcFixes > dev300-m39 ]
 # always use OOo address convention when parsing address in DDE function.
 calc-dde-always-ooo-conv.diff, n#442143, kohei
 

Modified: trunk/patches/dev300/calc-dde-always-ooo-conv.diff
==============================================================================
--- trunk/patches/dev300/calc-dde-always-ooo-conv.diff	(original)
+++ trunk/patches/dev300/calc-dde-always-ooo-conv.diff	Tue Jan 27 22:58:10 2009
@@ -7,7 +7,7 @@
  		}
  	}
 -	ScRange aRange;
--    ScAddress::Convention eConv = aDocument.GetAddressConvention();
+-    formula::FormulaGrammar::AddressConvention eConv = aDocument.GetAddressConvention();
 -	BOOL bValid = ( ( aRange.Parse( aPos, &aDocument, eConv ) & SCA_VALID ) ||
 -					( aRange.aStart.Parse( aPos, &aDocument, eConv ) & SCA_VALID ) );
 +
@@ -16,8 +16,8 @@
 +    // because the address item in a DDE entry is *not* normalized when saved
 +    // into ODF.
 +    ScRange aRange;
-+    bool bValid = ( (aRange.Parse(aPos, &aDocument, ScAddress::CONV_OOO ) & SCA_VALID) ||
-+                    (aRange.aStart.Parse(aPos, &aDocument, ScAddress::CONV_OOO) & SCA_VALID) );
++    bool bValid = ( (aRange.Parse(aPos, &aDocument, formula::FormulaGrammar::CONV_OOO ) & SCA_VALID) ||
++                    (aRange.aStart.Parse(aPos, &aDocument, formula::FormulaGrammar::CONV_OOO) & SCA_VALID) );
  
  	ScServerObject* pObj = NULL;			// NULL = error
  	if ( bValid )