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

[kyoshida svn gnome org]

Author: kyoshida
Date: Fri Mar 21 04:02:09 2008
New Revision: 11973
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11973&view=rev

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

	* patches/src680/sc-localized-arg-separator.diff: more formula syntax
	support: database range dialog, sort dialog, standard and advanced 
	filter dialogs.  more to come.


Modified:
   trunk/ChangeLog
   trunk/patches/src680/sc-localized-arg-separator.diff

Modified: trunk/patches/src680/sc-localized-arg-separator.diff
==============================================================================
--- trunk/patches/src680/sc-localized-arg-separator.diff	(original)
+++ trunk/patches/src680/sc-localized-arg-separator.diff	Fri Mar 21 04:02:09 2008
@@ -987,6 +987,243 @@
  						 );
  			pDoc->SetDocOptions( rNewOpt );
  			pDocSh->SetDocumentModified();
+diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/source/ui/dbgui/dbnamdlg.cxx sc/source/ui/dbgui/dbnamdlg.cxx
+--- sc.clean/source/ui/dbgui/dbnamdlg.cxx	2008-03-03 11:24:49.000000000 -0500
++++ sc/source/ui/dbgui/dbnamdlg.cxx	2008-03-20 23:08:31.000000000 -0400
+@@ -263,7 +263,7 @@ void ScDbNameDlg::Init()
+ 		theCurArea = ScRange( ScAddress( nStartCol, nStartRow, nStartTab ),
+ 							  ScAddress( nEndCol,   nEndRow,   nEndTab ) );
+ 
+-		theCurArea.Format( theAreaStr, ABS_DREF3D, pDoc );
++		theCurArea.Format( theAreaStr, ABS_DREF3D, pDoc, pDoc->GetAddressConvention() );
+ 
+ 		if ( pDBColl )
+ 		{
+@@ -342,7 +342,7 @@ void ScDbNameDlg::SetReference( const Sc
+ 		theCurArea = rRef;
+ 
+ 		String aRefStr;
+-        theCurArea.Format( aRefStr, ABS_DREF3D, pDocP );
++        theCurArea.Format( aRefStr, ABS_DREF3D, pDocP, pDocP->GetAddressConvention() );
+ 		aEdAssign.SetRefString( aRefStr );
+ 		aBtnHeader.Enable();
+ 		aBtnDoSize.Enable();
+@@ -437,7 +437,7 @@ void ScDbNameDlg::UpdateDBData( const St
+ 		pData->GetArea( nTab, nColStart, nRowStart, nColEnd, nRowEnd );
+ 		theCurArea = ScRange( ScAddress( nColStart, nRowStart, nTab ),
+ 							  ScAddress( nColEnd,	nRowEnd,   nTab ) );
+-		theCurArea.Format( theArea, ABS_DREF3D, pDoc );
++		theCurArea.Format( theArea, ABS_DREF3D, pDoc, pDoc->GetAddressConvention() );
+ 		aEdAssign.SetText( theArea );
+ 		aBtnAdd.SetText( aStrModify );
+ 		aBtnHeader.Check( pData->HasHeader() );
+@@ -511,7 +511,7 @@ IMPL_LINK( ScDbNameDlg, AddBtnHdl, void 
+ 			//	weil jetzt editiert werden kann, muss erst geparst werden
+ 			ScRange aTmpRange;
+ 			String aText = aEdAssign.GetText();
+-			if ( aTmpRange.ParseAny( aText, pDoc ) & SCA_VALID )
++			if ( aTmpRange.ParseAny( aText, pDoc, pDoc->GetAddressConvention() ) & SCA_VALID )
+ 			{
+ 				theCurArea = aTmpRange;
+ 				ScAddress aStart = theCurArea.aStart;
+@@ -730,7 +730,7 @@ IMPL_LINK( ScDbNameDlg, AssModifyHdl, vo
+ 
+ 	ScRange aTmpRange;
+ 	String aText = aEdAssign.GetText();
+-	if ( aTmpRange.ParseAny( aText, pDoc ) & SCA_VALID )
++	if ( aTmpRange.ParseAny( aText, pDoc, pDoc->GetAddressConvention() ) & SCA_VALID )
+ 		theCurArea = aTmpRange;
+ 
+ 	return 0;
+diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/source/ui/dbgui/filtdlg.cxx sc/source/ui/dbgui/filtdlg.cxx
+--- sc.clean/source/ui/dbgui/filtdlg.cxx	2008-03-03 11:24:49.000000000 -0500
++++ sc/source/ui/dbgui/filtdlg.cxx	2008-03-20 23:37:05.000000000 -0400
+@@ -316,7 +316,7 @@ void ScFilterDlg::SetReference( const Sc
+ 		if ( rRef.aStart != rRef.aEnd )
+ 			RefInputStart( &aEdCopyArea );
+ 		String aRefStr;
+-        rRef.aStart.Format( aRefStr, SCA_ABS_3D, pDocP );
++        rRef.aStart.Format( aRefStr, SCA_ABS_3D, pDocP, pDocP->GetAddressConvention() );
+ 		aEdCopyArea.SetRefString( aRefStr );
+ 	}
+ }
+@@ -545,7 +545,7 @@ ScQueryItem* ScFilterDlg::GetOutputItem(
+ 		if ( STRING_NOTFOUND != nColonPos )
+ 			theCopyStr.Erase( nColonPos );
+ 
+-		USHORT nResult = theCopyPos.Parse( theCopyStr, pDoc );
++		USHORT nResult = theCopyPos.Parse( theCopyStr, pDoc, pDoc->GetAddressConvention() );
+ 		bCopyPosOk = ( SCA_VALID == (nResult & SCA_VALID) );
+ 	}
+ 
+diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/source/ui/dbgui/foptmgr.cxx sc/source/ui/dbgui/foptmgr.cxx
+--- sc.clean/source/ui/dbgui/foptmgr.cxx	2008-03-03 11:24:49.000000000 -0500
++++ sc/source/ui/dbgui/foptmgr.cxx	2008-03-20 23:42:36.000000000 -0400
+@@ -153,8 +153,9 @@ void ScFilterOptionsMgr::Init()
+ 		ScDBCollection*	pDBColl		= pDoc->GetDBCollection();
+ 		String			theDbArea;
+ 		String			theDbName	= rStrNoName;
++        const ScAddress::Convention eConv = pDoc->GetAddressConvention();
+ 
+-		theCurArea.Format( theAreaStr, SCR_ABS_3D, pDoc );
++		theCurArea.Format( theAreaStr, SCR_ABS_3D, pDoc, eConv );
+ 
+ 		// Zielbereichsliste fuellen
+ 
+@@ -169,7 +170,7 @@ void ScFilterOptionsMgr::Init()
+ 		{
+ 			USHORT nInsert = rLbCopyPos.InsertEntry( aName );
+ 
+-			aRange.aStart.Format( aRefStr, SCA_ABS_3D, pDoc );
++			aRange.aStart.Format( aRefStr, SCA_ABS_3D, pDoc, eConv );
+ 			rLbCopyPos.SetEntryData( nInsert, new String( aRefStr ) );
+ 		}
+ 
+@@ -218,7 +219,7 @@ void ScFilterOptionsMgr::Init()
+ 			ScAddress( rQueryData.nDestCol,
+ 					   rQueryData.nDestRow,
+ 					   rQueryData.nDestTab
+-					 ).Format( aString, SCA_ABS_3D, pDoc );
++					 ).Format( aString, SCA_ABS_3D, pDoc, eConv );
+ 
+ 			rBtnCopyResult.Check( TRUE );
+ 			rEdCopyPos.SetText( aString );
+@@ -253,7 +254,7 @@ BOOL ScFilterOptionsMgr::VerifyPosStr( c
+ 	if ( STRING_NOTFOUND != nColonPos )
+ 		aPosStr.Erase( nColonPos );
+ 
+-	USHORT nResult = ScAddress().Parse( aPosStr, pDoc );
++	USHORT nResult = ScAddress().Parse( aPosStr, pDoc, pDoc->GetAddressConvention() );
+ 
+ 	return ( SCA_VALID == (nResult & SCA_VALID) );
+ }
+@@ -288,7 +289,7 @@ IMPL_LINK( ScFilterOptionsMgr, EdPosModi
+ 	if ( pEd == &rEdCopyPos )
+ 	{
+ 		String	theCurPosStr = pEd->GetText();
+-		USHORT	nResult = ScAddress().Parse( theCurPosStr, pDoc );
++		USHORT	nResult = ScAddress().Parse( theCurPosStr, pDoc, pDoc->GetAddressConvention() );
+ 
+ 		if ( SCA_VALID == (nResult & SCA_VALID) )
+ 		{
+diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/source/ui/dbgui/sfiltdlg.cxx sc/source/ui/dbgui/sfiltdlg.cxx
+--- sc.clean/source/ui/dbgui/sfiltdlg.cxx	2008-03-03 11:24:49.000000000 -0500
++++ sc/source/ui/dbgui/sfiltdlg.cxx	2008-03-20 23:51:04.000000000 -0400
+@@ -197,7 +197,7 @@ void __EXPORT ScSpecialFilterDlg::Init( 
+ 		if (rQueryItem.GetAdvancedQuerySource(aAdvSource))
+ 		{
+ 			String aRefStr;
+-			aAdvSource.Format( aRefStr, SCR_ABS_3D, pDoc );
++			aAdvSource.Format( aRefStr, SCR_ABS_3D, pDoc, pDoc->GetAddressConvention() );
+ 			aEdFilterArea.SetRefString( aRefStr );
+ 		}
+ 	}
+@@ -260,11 +260,12 @@ void ScSpecialFilterDlg::SetReference( c
+ 			RefInputStart( pRefInputEdit );
+ 
+ 		String aRefStr;
++        const ScAddress::Convention eConv = pDocP->GetAddressConvention();
+ 
+ 		if ( pRefInputEdit == &aEdCopyArea)
+-			rRef.aStart.Format( aRefStr, SCA_ABS_3D, pDocP );
++			rRef.aStart.Format( aRefStr, SCA_ABS_3D, pDocP, eConv );
+ 		else if ( pRefInputEdit == &aEdFilterArea)
+-			rRef.Format( aRefStr, SCR_ABS_3D, pDocP );
++			rRef.Format( aRefStr, SCR_ABS_3D, pDocP, eConv );
+ 
+ 		pRefInputEdit->SetRefString( aRefStr );
+ 	}
+@@ -334,6 +335,7 @@ IMPL_LINK( ScSpecialFilterDlg, EndDlgHdl
+ 		BOOL			bEditInputOk	= TRUE;
+ 		BOOL			bQueryOk		= FALSE;
+ 		ScRange			theFilterArea;
++        const ScAddress::Convention eConv = pDoc->GetAddressConvention();
+ 
+ 		if ( aBtnCopyResult.IsChecked() )
+ 		{
+@@ -342,7 +344,7 @@ IMPL_LINK( ScSpecialFilterDlg, EndDlgHdl
+ 			if ( STRING_NOTFOUND != nColonPos )
+ 				theCopyStr.Erase( nColonPos );
+ 
+-			USHORT nResult = theAdrCopy.Parse( theCopyStr, pDoc );
++			USHORT nResult = theAdrCopy.Parse( theCopyStr, pDoc, eConv );
+ 
+ 			if ( SCA_VALID != (nResult & SCA_VALID) )
+ 			{
+@@ -357,7 +359,7 @@ IMPL_LINK( ScSpecialFilterDlg, EndDlgHdl
+ 
+ 		if ( bEditInputOk )
+ 		{
+-			USHORT nResult = ScRange().Parse( theAreaStr, pDoc );
++			USHORT nResult = ScRange().Parse( theAreaStr, pDoc, eConv );
+ 
+ 			if ( SCA_VALID != (nResult & SCA_VALID) )
+ 			{
+@@ -375,7 +377,7 @@ IMPL_LINK( ScSpecialFilterDlg, EndDlgHdl
+ 			 * ein ScQueryParam zu erzeugen:
+ 			 */
+ 
+-			USHORT	nResult = theFilterArea.Parse( theAreaStr, pDoc );
++			USHORT	nResult = theFilterArea.Parse( theAreaStr, pDoc, eConv );
+ 
+ 			if ( SCA_VALID == (nResult & SCA_VALID) )
+ 			{
+diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/source/ui/dbgui/tpsort.cxx sc/source/ui/dbgui/tpsort.cxx
+--- sc.clean/source/ui/dbgui/tpsort.cxx	2008-03-03 11:24:49.000000000 -0500
++++ sc/source/ui/dbgui/tpsort.cxx	2008-03-20 23:33:16.000000000 -0400
+@@ -633,6 +633,7 @@ void ScTabPageSortOptions::Init()
+ 		String			theDbArea;
+ 		String			theDbName	= aStrNoName;
+ 		const SCTAB	nCurTab		= pViewData->GetTabNo();
++        const ScAddress::Convention eConv = pDoc->GetAddressConvention();
+ 
+ 		aLbOutPos.Clear();
+ 		aLbOutPos.InsertEntry( aStrUndefined, 0 );
+@@ -646,7 +647,7 @@ void ScTabPageSortOptions::Init()
+ 		{
+ 			USHORT nInsert = aLbOutPos.InsertEntry( aName );
+ 
+-			aRange.aStart.Format( aRefStr, SCA_ABS_3D, pDoc );
++			aRange.aStart.Format( aRefStr, SCA_ABS_3D, pDoc, eConv );
+ 			aLbOutPos.SetEntryData( nInsert, new String( aRefStr ) );
+ 		}
+ 
+@@ -661,7 +662,7 @@ void ScTabPageSortOptions::Init()
+ 		ScAddress aScAddress( rSortData.nCol1, rSortData.nRow1, nCurTab );
+ 		ScRange( aScAddress,
+ 				 ScAddress( rSortData.nCol2, rSortData.nRow2, nCurTab )
+-			   ).Format( theArea, SCR_ABS, pDoc );
++			   ).Format( theArea, SCR_ABS, pDoc, eConv );
+ 
+ 		if ( pDBColl )
+ 		{
+@@ -762,7 +763,7 @@ void __EXPORT ScTabPageSortOptions::Rese
+ 					   rSortData.nDestRow,
+ 					   rSortData.nDestTab );
+ 
+-		theOutPos.Format( aStr, nFormat, pDoc );
++		theOutPos.Format( aStr, nFormat, pDoc, pDoc->GetAddressConvention() );
+ 		aBtnCopyResult.Check();
+ 		aLbOutPos.Enable();
+ 		aEdOutPos.Enable();
+@@ -874,7 +875,7 @@ int __EXPORT ScTabPageSortOptions::Deact
+ 			thePos.SetTab( pViewData->GetTabNo() );
+ 		}
+ 
+-		USHORT nResult = thePos.Parse( thePosStr, pDoc );
++		USHORT nResult = thePos.Parse( thePosStr, pDoc, pDoc->GetAddressConvention() );
+ 
+ 		bPosInputOk = ( SCA_VALID == (nResult & SCA_VALID) );
+ 
+@@ -993,7 +994,7 @@ void __EXPORT ScTabPageSortOptions::EdOu
+ 	if ( pEd == &aEdOutPos )
+ 	{
+ 		String	theCurPosStr = aEdOutPos.GetText();
+-		USHORT	nResult = ScAddress().Parse( theCurPosStr, pDoc );
++		USHORT	nResult = ScAddress().Parse( theCurPosStr, pDoc, pDoc->GetAddressConvention() );
+ 
+ 		if ( SCA_VALID == (nResult & SCA_VALID) )
+ 		{
 diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/source/ui/formdlg/formula.cxx sc/source/ui/formdlg/formula.cxx
 --- sc.clean/source/ui/formdlg/formula.cxx	2008-03-03 11:24:49.000000000 -0500
 +++ sc/source/ui/formdlg/formula.cxx	2008-03-20 16:17:02.000000000 -0400