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

From: kyoshida svn gnome org
To: svn-commits-list gnome org
Subject: ooo-build r12405 - in trunk: . patches/dev300
Date: Wed, 30 Apr 2008 17:45:45 +0100 (BST)
Author: kyoshida
Date: Wed Apr 30 16:45:45 2008
New Revision: 12405
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12405&view=rev

Log:
2008-04-30  Kohei Yoshida  <kyoshida novell com>

	* patches/dev300/sc-formula-syntax-core.diff,
	* patches/dev300/sc-formula-syntax-ui.diff: fixed a regression where 
	a valid print range, repeat row and colum ranges get "Invalid sheet
	address" error in the Print Area dialog when the default formula syntax
	is used (i#88884).


Modified:
   trunk/ChangeLog
   trunk/patches/dev300/sc-formula-syntax-core.diff
   trunk/patches/dev300/sc-formula-syntax-ui.diff

Modified: trunk/patches/dev300/sc-formula-syntax-core.diff
==============================================================================
--- trunk/patches/dev300/sc-formula-syntax-core.diff	(original)
+++ trunk/patches/dev300/sc-formula-syntax-core.diff	Wed Apr 30 16:45:45 2008
@@ -225,16 +225,16 @@
 ===================================================================
 RCS file: /cvs/sc/sc/source/core/data/documen2.cxx,v
 retrieving revision 1.72
-retrieving revision 1.71.12.6
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.72 -r1.71.12.6
+retrieving revision 1.71.12.7
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.72 -r1.71.12.7
 --- sc/source/core/data/documen2.cxx	10 Apr 2008 19:22:32 -0000	1.72
-+++ sc/source/core/data/documen2.cxx	23 Apr 2008 15:10:39 -0000	1.71.12.6
++++ sc/source/core/data/documen2.cxx	30 Apr 2008 15:41:07 -0000	1.71.12.7
 @@ -197,7 +197,7 @@
          nInDdeLinkUpdate( 0 ),
          bInUnoBroadcast( FALSE ),
          bInUnoListenerCall( FALSE ),
 -        eAddrConv( ScAddress::CONV_OOO ),
-+        eGrammar( ScGrammar::GRAM_DEFAULT ),
++        eGrammar( ScGrammar::GRAM_NATIVE ),
          bStyleSheetUsageInvalid( TRUE ),
          bUndoEnabled( TRUE ),
          mbAdjustHeightEnabled( true ),
@@ -1876,21 +1876,28 @@
 Index: sc/source/ui/inc/undotab.hxx
 ===================================================================
 RCS file: /cvs/sc/sc/source/ui/inc/undotab.hxx,v
-retrieving revision 1.9
-retrieving revision 1.9.414.1
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.9 -r1.9.414.1
---- sc/source/ui/inc/undotab.hxx	18 Oct 2006 12:28:14 -0000	1.9
-+++ sc/source/ui/inc/undotab.hxx	19 Mar 2008 17:37:14 -0000	1.9.414.1
-@@ -60,6 +60,8 @@
+retrieving revision 1.10
+retrieving revision 1.9.414.3
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.10 -r1.9.414.3
+--- sc/source/ui/inc/undotab.hxx	10 Apr 2008 23:35:54 -0000	1.10
++++ sc/source/ui/inc/undotab.hxx	24 Apr 2008 13:34:04 -0000	1.9.414.3
+@@ -33,6 +33,7 @@
  
- #endif
- #include <com/sun/star/uno/Sequence.hxx>
+ #include "undobase.hxx"
+ #include "markdata.hxx"
 +#include "grammar.hxx"
+ #include <tools/color.hxx>
+ 
+ #ifndef _SVSTDARR_SHORTS
+@@ -48,6 +49,7 @@
+ #include <svtools/svstdarr.hxx>
+ 
+ #endif
 +
+ #include <com/sun/star/uno/Sequence.hxx>
  
  class ScDocShell;
- class ScDocument;
-@@ -478,13 +480,13 @@
+@@ -464,13 +466,13 @@
  };
  
  
@@ -2485,10 +2492,10 @@
 ===================================================================
 RCS file: /cvs/sc/sc/source/ui/pagedlg/areasdlg.cxx,v
 retrieving revision 1.16
-retrieving revision 1.14.314.4
-diff -u -b -I $Revision.*$ -I $Author.*$ -r1.16 -r1.14.314.4
+retrieving revision 1.14.314.5
+diff -u -b -I $Revision.*$ -I $Author.*$ -r1.16 -r1.14.314.5
 --- sc/source/ui/pagedlg/areasdlg.cxx	18 Apr 2008 11:37:48 -0000	1.16
-+++ sc/source/ui/pagedlg/areasdlg.cxx	23 Apr 2008 15:10:02 -0000	1.14.314.4
++++ sc/source/ui/pagedlg/areasdlg.cxx	30 Apr 2008 15:43:02 -0000	1.14.314.5
 @@ -53,6 +53,7 @@
  #include "docsh.hxx"
  #include "globstr.hrc"
@@ -2497,7 +2504,7 @@
  
  // STATIC DATA ---------------------------------------------------------------
  
-@@ -77,10 +78,32 @@
+@@ -77,10 +78,34 @@
  
  // globale Funktionen (->am Ende der Datei):
  
@@ -2507,6 +2514,7 @@
 +bool    lcl_CheckRepeatString( const String& rStr, ScDocument* pDoc, bool bIsRow, ScRange* pRange );
 +void	lcl_GetRepeatRangeString( const ScRange* pRange, ScDocument* pDoc, bool bIsRow, String& rStr );
  
++#if 0
 +static void printAddressFlags(USHORT nFlag)
 +{
 +    if ((nFlag & SCA_COL_ABSOLUTE  ) == SCA_COL_ABSOLUTE  )  printf("SCA_COL_ABSOLUTE \n");
@@ -2530,10 +2538,11 @@
 +    if ((nFlag & SCA_ABS_3D        ) == SCA_ABS_3D        )  printf("SCA_ABS_3D       \n");
 +    if ((nFlag & SCR_ABS_3D        ) == SCR_ABS_3D        )  printf("SCR_ABS_3D       \n");
 +}
++#endif
  
  //============================================================================
  //	class ScPrintAreasDlg
-@@ -182,11 +205,11 @@
+@@ -182,11 +207,11 @@
  			RefInputStart( pRefInputEdit );
  
  		String	aStr;
@@ -2547,7 +2556,7 @@
  
  //			aEdPrintArea.ReplaceSelected( aStr );
  
-@@ -202,7 +225,7 @@
+@@ -202,7 +227,7 @@
  		else
  		{
  			BOOL bRow = ( &aEdRepeatRow == pRefInputEdit );
@@ -2556,7 +2565,7 @@
  			pRefInputEdit->SetRefString( aStr );
  		}
  	}
-@@ -217,8 +240,9 @@
+@@ -217,8 +242,9 @@
  {
  	if ( pRefInputEdit == &aEdPrintArea )
  	{
@@ -2567,7 +2576,7 @@
  		aEdPrintArea.SetText(aVal);
  
  		xub_StrLen nLen = aVal.Len();
-@@ -288,6 +312,8 @@
+@@ -288,6 +314,8 @@
  	//-------------------------
  	aStrRange.Erase();
      String aOne;
@@ -2576,7 +2585,7 @@
      USHORT nRangeCount = pDoc->GetPrintRangeCount( nCurTab );
      for (USHORT i=0; i<nRangeCount; i++)
      {
-@@ -295,9 +321,8 @@
+@@ -295,9 +323,8 @@
          if (pPrintRange)
          {
              if ( aStrRange.Len() )
@@ -2588,7 +2597,7 @@
              aStrRange += aOne;
          }
      }
-@@ -306,13 +331,13 @@
+@@ -306,13 +333,13 @@
  	//-------------------------------
  	// Wiederholungszeile
  	//-------------------------------
@@ -2604,7 +2613,7 @@
  	aEdRepeatCol.SetText( aStrRange );
  
  	Impl_ModifyHdl( &aEdPrintArea );
-@@ -337,9 +362,9 @@
+@@ -337,9 +364,9 @@
  	if ( (aRangeStr.Len() > 0) && &aEdPrintArea != pEd )
  	{
  		ScRange aRange;
@@ -2617,7 +2626,7 @@
  	}
  
  	rItem.SetValue( aRangeStr );
-@@ -360,25 +385,35 @@
+@@ -360,25 +387,35 @@
  	BOOL bPrintAreaOk = TRUE;
  	if ( aStrPrintArea.Len() )
  	{
@@ -2661,7 +2670,7 @@
  
  	// Fehlermeldungen
  
-@@ -414,13 +449,15 @@
+@@ -414,13 +451,15 @@
  	if ( pViewData )
  		bSimple = (pViewData->GetSimpleArea( aRange ) == SC_MARK_SIMPLE);
  
@@ -2679,17 +2688,21 @@
  	}
  
      aLbPrintArea.SetEntryData( SC_AREASDLG_PR_SELECT, new String( aStrRange ) );
-@@ -449,7 +486,8 @@
+@@ -449,11 +488,11 @@
  				{
  					pData->GetName( aName );
  					pData->GetSymbol( aSymbol );
 -					if ( aRange.ParseAny( aSymbol, pDoc ) & SCA_VALID )
-+                    ScAddress::Details aDetails(pDoc->GetAddressConvention(), 0, 0);
-+					if ( aRange.ParseAny( aSymbol, pDoc, aDetails ) & SCA_VALID )
++					if ( aRange.ParseAny( aSymbol, pDoc, eConv ) & SCA_VALID )
  					{
  						if ( pData->HasType( RT_PRINTAREA ) )
  						{
-@@ -461,7 +499,7 @@
+-							aRange.Format( aSymbol, SCR_ABS, pDoc );
++							aRange.Format( aSymbol, SCR_ABS, pDoc, eConv );
+ 							aLbPrintArea.SetEntryData(
+ 								aLbPrintArea.InsertEntry( aName ),
+ 								new String( aSymbol ) );
+@@ -461,7 +500,7 @@
  
  						if ( pData->HasType( RT_ROWHEADER ) )
  						{
@@ -2698,7 +2711,7 @@
  							aLbRepeatRow.SetEntryData(
  								aLbRepeatRow.InsertEntry( aName ),
  								new String( aSymbol ) );
-@@ -469,7 +507,7 @@
+@@ -469,7 +508,7 @@
  
  						if ( pData->HasType( RT_COLHEADER ) )
  						{
@@ -2707,7 +2720,7 @@
  							aLbRepeatCol.SetEntryData(
  								aLbRepeatCol.InsertEntry( aName ),
  								new String( aSymbol ) );
-@@ -661,9 +699,11 @@
+@@ -661,9 +700,11 @@
  //============================================================================
  // globale Funktionen:
  
@@ -2721,7 +2734,7 @@
  {
  	// Zulaessige Syntax fuer rStr:
  	// Row: [$]1-MAXTAB
-@@ -705,115 +745,160 @@
+@@ -705,115 +746,160 @@
  	return bStrOk;
  }
  

Modified: trunk/patches/dev300/sc-formula-syntax-ui.diff
==============================================================================
--- trunk/patches/dev300/sc-formula-syntax-ui.diff	(original)
+++ trunk/patches/dev300/sc-formula-syntax-ui.diff	Wed Apr 30 16:45:45 2008
@@ -90,7 +90,7 @@
  	bDoAutoSpell		= FALSE;
  	bLookUpColRowNames	= TRUE;
      bFormulaRegexEnabled= TRUE;
-+    eFormulaGrammar     = ScGrammar::GRAM_DEFAULT;
++    eFormulaGrammar     = ScGrammar::GRAM_NATIVE;
  }
  
  //========================================================================
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]