ooo-build r11969 - in trunk: . patches/src680

[kyoshida svn gnome org]

Author: kyoshida
Date: Thu Mar 20 23:07:16 2008
New Revision: 11969
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11969&view=rev

Log:
2008-03-20  Kohei Yoshida  <kyoshida novell com>

	* patches/src680/sc-fix-range-ref-window.diff: use the current formula
	syntax during cell range reference mode.  Previously it was hard-coded 
	to use the Calc A1 style which broke the selection border drawing when
	the current syntax is Excel A1 or Excel R1C1 (n#358558).

	* patches/src680/apply: apply the above patch.


Added:
   trunk/patches/src680/sc-fix-range-ref-window.diff
Modified:
   trunk/ChangeLog
   trunk/patches/src680/apply

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Thu Mar 20 23:07:16 2008
@@ -1549,11 +1549,15 @@
 
 [ CalcFixes ]
 
-# Allow comma as cell separators in functions, and add a formula syntax 
+# Support several different formula syntax, and add a formula syntax 
 # configuration option in the Options page.
 # The patch depends on the cws-xmlfilter03 stuff
 sc-localized-arg-separator.diff, n#358558, kohei
 
+# fix the cell range reference window so that it draws current selection
+# for XL_A1 and XL_R1C1.  This is part of the formula syntax support.
+sc-fix-range-ref-window.diff, n#358558, kohei
+
 # Toggle gridline display per sheet.
 sc-sheet-gridline-toggle.diff, kohei
 

Added: trunk/patches/src680/sc-fix-range-ref-window.diff
==============================================================================
--- (empty file)
+++ trunk/patches/src680/sc-fix-range-ref-window.diff	Thu Mar 20 23:07:16 2008
@@ -0,0 +1,22 @@
+diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/source/ui/miscdlgs/anyrefdg.cxx sc/source/ui/miscdlgs/anyrefdg.cxx
+--- sc.clean/source/ui/miscdlgs/anyrefdg.cxx	2008-03-20 17:57:30.000000000 -0400
++++ sc/source/ui/miscdlgs/anyrefdg.cxx	2008-03-20 18:04:43.000000000 -0400
+@@ -668,7 +668,7 @@ void ScAnyRefDlg::ShowSimpleReference( c
+ 			pTabViewShell->DoneRefMode( FALSE );
+ 			pTabViewShell->ClearHighlightRanges();
+ 
+-			if(aRangeList.Parse(rStr ,pDoc))
++			if(aRangeList.Parse(rStr ,pDoc, SCA_VALID, pDoc->GetAddressConvention()))
+ 			{
+ 				ScRange* pRangeEntry=aRangeList.First();
+ 
+@@ -699,7 +699,8 @@ void ScAnyRefDlg::ShowFormulaReference( 
+ 			SCTAB nTab = pViewData->GetTabNo();
+ 			ScAddress aPos( nCol, nRow, nTab );
+ 
+-			ScTokenArray* pScTokA=pRefComp->CompileString(rStr);
++            ScAddress::Convention eConv = pViewData->GetDocument()->GetAddressConvention();
++			ScTokenArray* pScTokA=pRefComp->CompileString(rStr, eConv);
+ 			//pRefComp->CompileTokenArray();
+ 
+ 			if(pTabViewShell!=NULL && pScTokA!=NULL)