GNOME.org
 

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

Author: kyoshida
Date: Fri Apr 25 23:19:41 2008
New Revision: 12344
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12344&view=rev

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

	* patches/dev300/sc-formula-syntax-ui.diff: forgot to commit the formula
	syntax option value to user configuration.


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

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	Fri Apr 25 23:19:41 2008
@@ -1,16 +1,16 @@
 diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/inc/docoptio.hxx sc/inc/docoptio.hxx
---- sc.clean/inc/docoptio.hxx	2008-04-21 18:06:00.000000000 -0400
-+++ sc/inc/docoptio.hxx	2008-04-22 12:32:23.000000000 -0400
-@@ -52,6 +52,8 @@
+--- sc.clean/inc/docoptio.hxx	2008-04-25 18:54:41.000000000 -0400
++++ sc/inc/docoptio.hxx	2008-04-25 19:01:33.000000000 -0400
+@@ -36,6 +36,8 @@
+ #include "scdllapi.h"
  #include "optutil.hxx"
- #endif
  
 +#include "grammar.hxx"
 +
  class SC_DLLPUBLIC ScDocOptions
  {
  	double fIterEps;				// Epsilon-Wert dazu
-@@ -69,6 +71,7 @@ class SC_DLLPUBLIC ScDocOptions
+@@ -53,6 +55,7 @@ class SC_DLLPUBLIC ScDocOptions
  	BOOL   bDoAutoSpell;			// Auto-Spelling
  	BOOL   bLookUpColRowNames;		// Spalten-/Zeilenbeschriftungen automagisch suchen
      BOOL   bFormulaRegexEnabled;    // regular expressions in formulas enabled
@@ -18,7 +18,7 @@
  
  public:
  				ScDocOptions();
-@@ -117,6 +120,9 @@ public:
+@@ -101,6 +104,9 @@ public:
  
      void    SetFormulaRegexEnabled( BOOL bVal ) { bFormulaRegexEnabled = bVal; }
      BOOL    IsFormulaRegexEnabled() const       { return bFormulaRegexEnabled; }
@@ -28,7 +28,7 @@
  };
  
  
-@@ -137,6 +143,7 @@ inline void ScDocOptions::CopyTo(ScDocOp
+@@ -121,6 +127,7 @@ inline void ScDocOptions::CopyTo(ScDocOp
  	rOpt.bDoAutoSpell			= bDoAutoSpell;
  	rOpt.bLookUpColRowNames		= bLookUpColRowNames;
      rOpt.bFormulaRegexEnabled   = bFormulaRegexEnabled;
@@ -36,7 +36,7 @@
  }
  
  inline const ScDocOptions& ScDocOptions::operator=( const ScDocOptions& rCpy )
-@@ -156,6 +163,7 @@ inline const ScDocOptions& ScDocOptions:
+@@ -140,6 +147,7 @@ inline const ScDocOptions& ScDocOptions:
  	bDoAutoSpell		= rCpy.bDoAutoSpell;
  	bLookUpColRowNames	= rCpy.bLookUpColRowNames;
      bFormulaRegexEnabled= rCpy.bFormulaRegexEnabled;
@@ -44,7 +44,7 @@
  
  	return *this;
  }
-@@ -178,6 +186,7 @@ inline int ScDocOptions::operator==( con
+@@ -162,6 +170,7 @@ inline int ScDocOptions::operator==( con
  			&&	rOpt.bDoAutoSpell			== bDoAutoSpell
  			&&	rOpt.bLookUpColRowNames		== bLookUpColRowNames
              &&  rOpt.bFormulaRegexEnabled   == bFormulaRegexEnabled
@@ -52,11 +52,11 @@
  			);
  }
  
-Only in sc/inc: docoptio.hxx.~1.6.~
+Only in sc/inc: docoptio.hxx.orig
 diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/source/core/data/documen3.cxx sc/source/core/data/documen3.cxx
---- sc.clean/source/core/data/documen3.cxx	2008-04-21 18:06:05.000000000 -0400
-+++ sc/source/core/data/documen3.cxx	2008-04-22 12:26:11.000000000 -0400
-@@ -1762,6 +1762,7 @@ void ScDocument::SetDocOptions( const Sc
+--- sc.clean/source/core/data/documen3.cxx	2008-04-25 18:54:50.000000000 -0400
++++ sc/source/core/data/documen3.cxx	2008-04-25 19:01:33.000000000 -0400
+@@ -1757,6 +1757,7 @@ void ScDocument::SetDocOptions( const Sc
  	pFormatter->ChangeNullDate( d,m,y );
  	pFormatter->ChangeStandardPrec( (USHORT)rOpt.GetStdPrecision() );
  	pFormatter->SetYear2000( rOpt.GetYear2000() );
@@ -64,10 +64,11 @@
  }
  
  const ScViewOptions& ScDocument::GetViewOptions() const
+Only in sc/source/core/data: documen3.cxx.orig
 diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/source/core/tool/docoptio.cxx sc/source/core/tool/docoptio.cxx
---- sc.clean/source/core/tool/docoptio.cxx	2008-04-21 18:06:06.000000000 -0400
-+++ sc/source/core/tool/docoptio.cxx	2008-04-22 12:26:21.000000000 -0400
-@@ -50,6 +50,7 @@
+--- sc.clean/source/core/tool/docoptio.cxx	2008-04-25 18:54:50.000000000 -0400
++++ sc/source/core/tool/docoptio.cxx	2008-04-25 19:16:28.000000000 -0400
+@@ -45,6 +45,7 @@
  #include "scresid.hxx"
  #include "sc.hrc"
  #include "miscuno.hxx"
@@ -75,7 +76,7 @@
  
  using namespace utl;
  using namespace rtl;
-@@ -105,7 +106,8 @@ ScDocOptions::ScDocOptions( const ScDocO
+@@ -100,7 +101,8 @@ ScDocOptions::ScDocOptions( const ScDocO
  			bMatchWholeCell( rCpy.bMatchWholeCell ),
  			bDoAutoSpell( rCpy.bDoAutoSpell ),
              bLookUpColRowNames( rCpy.bLookUpColRowNames ),
@@ -85,7 +86,7 @@
  {
  }
  
-@@ -212,6 +214,7 @@ void ScDocOptions::ResetDocOptions()
+@@ -207,6 +209,7 @@ void ScDocOptions::ResetDocOptions()
  	bDoAutoSpell		= FALSE;
  	bLookUpColRowNames	= TRUE;
      bFormulaRegexEnabled= TRUE;
@@ -93,7 +94,7 @@
  }
  
  //========================================================================
-@@ -287,7 +290,8 @@ SfxPoolItem* __EXPORT ScTpCalcItem::Clon
+@@ -282,7 +285,8 @@ SfxPoolItem* __EXPORT ScTpCalcItem::Clon
  #define SCCALCOPT_SEARCHCRIT		9
  #define SCCALCOPT_FINDLABEL			10
  #define SCCALCOPT_REGEX             11
@@ -103,7 +104,7 @@
  
  #define CFGPATH_DOCLAYOUT	"Office.Calc/Layout/Other"
  
-@@ -310,7 +314,8 @@ Sequence<OUString> ScDocCfg::GetCalcProp
+@@ -305,7 +309,8 @@ Sequence<OUString> ScDocCfg::GetCalcProp
  		"Other/Precision",					// SCCALCOPT_PRECISION
  		"Other/SearchCriteria",				// SCCALCOPT_SEARCHCRIT
          "Other/FindLabel",                  // SCCALCOPT_FINDLABEL
@@ -113,7 +114,7 @@
  	};
  	Sequence<OUString> aNames(SCCALCOPT_COUNT);
  	OUString* pNames = aNames.getArray();
-@@ -403,6 +408,33 @@ ScDocCfg::ScDocCfg() :
+@@ -398,6 +403,33 @@ ScDocCfg::ScDocCfg() :
                      case SCCALCOPT_REGEX :
                          SetFormulaRegexEnabled( ScUnoHelpFunctions::GetBoolFromAny( pValues[nProp] ) );
                          break;
@@ -147,11 +148,28 @@
  				}
  			}
  		}
-Only in sc/source/core/tool: docoptio.cxx.~1.8.~
+@@ -481,6 +513,16 @@ IMPL_LINK( ScDocCfg, CalcCommitHdl, void
+ 				break;
+             case SCCALCOPT_REGEX :
+                 ScUnoHelpFunctions::SetBoolInAny( pValues[nProp], IsFormulaRegexEnabled() );
++            case SCCALCOPT_FORMULA_SYNTAX :
++            {
++                sal_Int32 nVal = 0;
++                switch (GetFormulaSyntax())
++                {
++                    case ScGrammar::GRAM_NATIVE_XL_A1:    nVal = 1; break;
++                    case ScGrammar::GRAM_NATIVE_XL_R1C1:  nVal = 2; break;
++                }
++                pValues[nProp] <<= nVal;
++            }
+ 		}
+ 	}
+ 	aCalcItem.PutProperties(aNames, aValues);
+Only in sc/source/core/tool: docoptio.cxx.orig
 diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/source/ui/inc/optdlg.hrc sc/source/ui/inc/optdlg.hrc
---- sc.clean/source/ui/inc/optdlg.hrc	2008-04-21 18:06:00.000000000 -0400
-+++ sc/source/ui/inc/optdlg.hrc	2008-04-21 19:57:20.000000000 -0400
-@@ -78,6 +78,8 @@
+--- sc.clean/source/ui/inc/optdlg.hrc	2008-04-25 18:54:43.000000000 -0400
++++ sc/source/ui/inc/optdlg.hrc	2008-04-25 19:01:33.000000000 -0400
+@@ -73,6 +73,8 @@
  #define BTN_MATCH			18
  #define BTN_LOOKUP			19
  #define BTN_REGEX           20
@@ -160,20 +178,20 @@
  
  // TP_VIEW:
  #define BTN_VSCROLL			1
-Only in sc/source/ui/inc: optdlg.hrc.~1.9.~
+Only in sc/source/ui/inc: optdlg.hrc.orig
 diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/source/ui/inc/tpcalc.hxx sc/source/ui/inc/tpcalc.hxx
---- sc.clean/source/ui/inc/tpcalc.hxx	2008-04-21 18:06:00.000000000 -0400
-+++ sc/source/ui/inc/tpcalc.hxx	2008-04-21 19:57:45.000000000 -0400
-@@ -61,6 +61,8 @@
+--- sc.clean/source/ui/inc/tpcalc.hxx	2008-04-25 18:54:43.000000000 -0400
++++ sc/source/ui/inc/tpcalc.hxx	2008-04-25 19:01:33.000000000 -0400
+@@ -39,6 +39,8 @@
+ #include <svtools/stdctrl.hxx>
  #include "editfield.hxx"
- #endif
  
 +#include "vcl/lstbox.hxx"
 +
  //===================================================================
  
  class ScDocOptions;
-@@ -101,6 +103,8 @@ private:
+@@ -79,6 +81,8 @@ private:
  	CheckBox		aBtnMatch;
      CheckBox        aBtnRegex;
  	CheckBox		aBtnLookUp;
@@ -182,11 +200,11 @@
  
  	FixedText		aFtPrec;
  	NumericField	aEdPrec;
-Only in sc/source/ui/inc: tpcalc.hxx.~1.8.~
+Only in sc/source/ui/inc: tpcalc.hxx.orig
 diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/source/ui/optdlg/tpcalc.cxx sc/source/ui/optdlg/tpcalc.cxx
---- sc.clean/source/ui/optdlg/tpcalc.cxx	2008-04-21 18:06:04.000000000 -0400
-+++ sc/source/ui/optdlg/tpcalc.cxx	2008-04-22 12:09:00.000000000 -0400
-@@ -96,6 +96,8 @@ ScTpCalcOptions::ScTpCalcOptions( Window
+--- sc.clean/source/ui/optdlg/tpcalc.cxx	2008-04-25 18:54:46.000000000 -0400
++++ sc/source/ui/optdlg/tpcalc.cxx	2008-04-25 19:01:33.000000000 -0400
+@@ -91,6 +91,8 @@ ScTpCalcOptions::ScTpCalcOptions( Window
  		aBtnMatch	 	( this, ScResId( BTN_MATCH ) ),
          aBtnRegex       ( this, ScResId( BTN_REGEX ) ),
  		aBtnLookUp   	( this, ScResId( BTN_LOOKUP ) ),
@@ -195,7 +213,7 @@
  		aFtPrec 		( this, ScResId( FT_PREC ) ),
  		aEdPrec 		( this, ScResId( ED_PREC ) ),
  		pOldOptions 	( new ScDocOptions(
-@@ -161,6 +163,22 @@ void __EXPORT ScTpCalcOptions::Reset( co
+@@ -156,6 +158,22 @@ void __EXPORT ScTpCalcOptions::Reset( co
  	aEdPrec    .SetValue( pLocalOptions->GetStdPrecision() );
      aEdEps     .SetValue( pLocalOptions->GetIterEps(), 6 );
  
@@ -218,7 +236,7 @@
  	pLocalOptions->GetDate( d, m, y );
  
  	switch ( y )
-@@ -192,6 +210,20 @@ BOOL __EXPORT ScTpCalcOptions::FillItemS
+@@ -187,6 +205,20 @@ BOOL __EXPORT ScTpCalcOptions::FillItemS
  	pLocalOptions->SetMatchWholeCell( aBtnMatch.IsChecked() );
      pLocalOptions->SetFormulaRegexEnabled( aBtnRegex.IsChecked() );
  	pLocalOptions->SetLookUpColRowNames( aBtnLookUp.IsChecked() );
@@ -239,11 +257,11 @@
  
  	if ( *pLocalOptions != *pOldOptions )
  	{
-Only in sc/source/ui/optdlg: tpcalc.cxx.~1.16.~
+Only in sc/source/ui/optdlg: tpcalc.cxx.orig
 diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/source/ui/src/optdlg.src sc/source/ui/src/optdlg.src
---- sc.clean/source/ui/src/optdlg.src	2008-04-21 18:06:01.000000000 -0400
-+++ sc/source/ui/src/optdlg.src	2008-04-21 19:59:09.000000000 -0400
-@@ -173,6 +173,27 @@ TabPage RID_SCPAGE_CALC
+--- sc.clean/source/ui/src/optdlg.src	2008-04-25 18:54:43.000000000 -0400
++++ sc/source/ui/src/optdlg.src	2008-04-25 19:01:33.000000000 -0400
+@@ -168,6 +168,27 @@ TabPage RID_SCPAGE_CALC
          Size = MAP_APPFONT ( 239 , 10 ) ;
  		Text [ en-US ] = "~Automatically find column and row labels " ;
  	};
@@ -271,11 +289,11 @@
  };
  
  /**************************************************************************/
-Only in sc/source/ui/src: optdlg.src.~1.67.~
+Only in sc/source/ui/src: optdlg.src.orig
 diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=officecfg.vpj officecfg.clean/registry/schema/org/openoffice/Office/Calc.xcs officecfg/registry/schema/org/openoffice/Office/Calc.xcs
---- officecfg.clean/registry/schema/org/openoffice/Office/Calc.xcs	2008-04-21 19:49:20.000000000 -0400
-+++ officecfg/registry/schema/org/openoffice/Office/Calc.xcs	2008-04-21 19:50:15.000000000 -0400
-@@ -1134,6 +1134,30 @@
+--- officecfg.clean/registry/schema/org/openoffice/Office/Calc.xcs	2008-04-25 19:00:58.000000000 -0400
++++ officecfg/registry/schema/org/openoffice/Office/Calc.xcs	2008-04-25 19:01:33.000000000 -0400
+@@ -1129,6 +1129,30 @@
  					</info>
  					<value>true</value>
  				</prop>
@@ -306,4 +324,4 @@
  				<node-ref oor:name="Date" oor:node-type="Date">
  					<info>
  						<desc>Specifies the date that is represented by the number 0.</desc>
-Only in officecfg/registry/schema/org/openoffice/Office: Calc.xcs.~1.21.~
+Only in officecfg/registry/schema/org/openoffice/Office: Calc.xcs.orig
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]