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

[kyoshida svn gnome org]

Author: kyoshida
Date: Fri Dec  5 23:24:52 2008
New Revision: 14765
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14765&view=rev

Log:
2008-12-05  Kohei Yoshida  <kyoshida novell com>

	* patches/dev300/calc-dde-always-ooo-conv.diff: always use OOo A1 
	convention when parsing address string in DDE function, regardless of
	current formula syntax. (n#442143)

	* patches/dev300/apply: apply this new patch.


Added:
   trunk/patches/dev300/calc-dde-always-ooo-conv.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Fri Dec  5 23:24:52 2008
@@ -861,6 +861,9 @@
 # fix 'Identify Categories' greakage on grouping.
 calc-dp-group-ident-category-fix.diff, n#447182, i#96171, kohei
 
+# always use OOo address convention when parsing address in DDE function.
+calc-dde-always-ooo-conv.diff, n#442143, kohei
+
 [ CalcFixes ]
 
 # make biffdumper build

Added: trunk/patches/dev300/calc-dde-always-ooo-conv.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/calc-dde-always-ooo-conv.diff	Fri Dec  5 23:24:52 2008
@@ -0,0 +1,23 @@
+diff --git sc/source/ui/docshell/docsh4.cxx sc/source/ui/docshell/docsh4.cxx
+index 783c7f9..a9a5820 100644
+--- sc/source/ui/docshell/docsh4.cxx
++++ sc/source/ui/docshell/docsh4.cxx
+@@ -2473,10 +2473,14 @@ long __EXPORT ScDocShell::DdeSetData( const String& rItem,
+ 				pData->GetSymbol( aPos );			// continue with the name's contents
+ 		}
+ 	}
+-	ScRange aRange;
+-    ScAddress::Convention eConv = aDocument.GetAddressConvention();
+-	BOOL bValid = ( ( aRange.Parse( aPos, &aDocument, eConv ) & SCA_VALID ) ||
+-					( aRange.aStart.Parse( aPos, &aDocument, eConv ) & SCA_VALID ) );
++
++    // Address in DDE function must be always parsed as CONV_OOO so that it 
++    // would always work regardless of current address convension.  We do this
++    // 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) );
+ 
+ 	ScServerObject* pObj = NULL;			// NULL = error
+ 	if ( bValid )