ooo-build r11954 - in trunk: . patches/src680
- From: kyoshida svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r11954 - in trunk: . patches/src680
- Date: Thu, 20 Mar 2008 00:13:59 +0000 (GMT)
Author: kyoshida
Date: Thu Mar 20 00:13:59 2008
New Revision: 11954
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11954&view=rev
Log:
2008-03-19 Kohei Yoshida <kyoshida novell com>
* patches/src680/apply: remove sc-r1c1.diff; this functionality is now
merged with the sc-localized-arg-separator.diff patch.
* patches/src680/sc-localized-arg-separator.diff: use a list box to
provide 3 formula syntax options: Calc A1, Excel A1 and Excel R1C1
(n#372494).
* patches/src680/sc-sheet-gridline-toggle.diff: modified since this
patch previously depended on sc-r1c1.diff which no longer exists.
Modified:
trunk/ChangeLog
trunk/patches/src680/apply
trunk/patches/src680/sc-localized-arg-separator.diff
trunk/patches/src680/sc-sheet-gridline-toggle.diff
Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply (original)
+++ trunk/patches/src680/apply Thu Mar 20 00:13:59 2008
@@ -634,9 +634,6 @@
# row is the column header (depends on sc-natural-sort.diff patch).
sc-simple-sort-include-format-header.diff, i#13829, kohei
-# Add R1C1 address support [ i#49499 for address ]
-sc-r1c1.diff, i#20857, jody
-
# Paste clipboard when ENTER is pressed, then clear clipboard.
sc-paste-on-enter.diff, n#358545, i#28535, jonp
@@ -1549,7 +1546,8 @@
[ CalcFixes ]
-# Allow comma as a cell separators in functions
+# Allow comma as cell separators in functions, 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
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 Thu Mar 20 00:13:59 2008
@@ -89,46 +89,55 @@
BOOL bAllowArrAdvance = FALSE );
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-03-03 11:24:44.000000000 -0500
-+++ sc/inc/docoptio.hxx 2008-03-03 11:33:34.000000000 -0500
-@@ -69,6 +69,7 @@ class SC_DLLPUBLIC ScDocOptions
++++ sc/inc/docoptio.hxx 2008-03-19 18:27:17.000000000 -0400
+@@ -52,6 +52,8 @@
+ #include "optutil.hxx"
+ #endif
+
++#include "address.hxx"
++
+ class SC_DLLPUBLIC ScDocOptions
+ {
+ double fIterEps; // Epsilon-Wert dazu
+@@ -69,6 +71,7 @@ class SC_DLLPUBLIC ScDocOptions
BOOL bDoAutoSpell; // Auto-Spelling
BOOL bLookUpColRowNames; // Spalten-/Zeilenbeschriftungen automagisch suchen
BOOL bFormulaRegexEnabled; // regular expressions in formulas enabled
-+ bool bUseXLFormulaSyntax;
++ ScAddress::Convention eFormulaConv; // formula address convention used to switch different formula syntax
public:
ScDocOptions();
-@@ -117,6 +118,9 @@ public:
+@@ -117,6 +120,9 @@ public:
void SetFormulaRegexEnabled( BOOL bVal ) { bFormulaRegexEnabled = bVal; }
BOOL IsFormulaRegexEnabled() const { return bFormulaRegexEnabled; }
+
-+ void SetXLFormulaSyntax( bool bVal ) { bUseXLFormulaSyntax = bVal; }
-+ bool IsXLFormulaSyntax() const { return bUseXLFormulaSyntax; }
++ void SetFormulaSyntax( ScAddress::Convention eConv ) { eFormulaConv = eConv; }
++ ScAddress::Convention GetFormulaSyntax() const { return eFormulaConv; }
};
-@@ -137,6 +141,7 @@ inline void ScDocOptions::CopyTo(ScDocOp
+@@ -137,6 +143,7 @@ inline void ScDocOptions::CopyTo(ScDocOp
rOpt.bDoAutoSpell = bDoAutoSpell;
rOpt.bLookUpColRowNames = bLookUpColRowNames;
rOpt.bFormulaRegexEnabled = bFormulaRegexEnabled;
-+ rOpt.bUseXLFormulaSyntax = bUseXLFormulaSyntax;
++ rOpt.eFormulaConv = eFormulaConv;
}
inline const ScDocOptions& ScDocOptions::operator=( const ScDocOptions& rCpy )
-@@ -156,6 +161,7 @@ inline const ScDocOptions& ScDocOptions:
+@@ -156,6 +163,7 @@ inline const ScDocOptions& ScDocOptions:
bDoAutoSpell = rCpy.bDoAutoSpell;
bLookUpColRowNames = rCpy.bLookUpColRowNames;
bFormulaRegexEnabled= rCpy.bFormulaRegexEnabled;
-+ bUseXLFormulaSyntax = rCpy.bUseXLFormulaSyntax;
++ eFormulaConv = rCpy.eFormulaConv;
return *this;
}
-@@ -178,6 +184,7 @@ inline int ScDocOptions::operator==( con
+@@ -178,6 +186,7 @@ inline int ScDocOptions::operator==( con
&& rOpt.bDoAutoSpell == bDoAutoSpell
&& rOpt.bLookUpColRowNames == bLookUpColRowNames
&& rOpt.bFormulaRegexEnabled == bFormulaRegexEnabled
-+ && rOpt.bUseXLFormulaSyntax == bUseXLFormulaSyntax
++ && rOpt.eFormulaConv == eFormulaConv
);
}
@@ -193,15 +202,12 @@
//==================================================================
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-03-03 11:24:50.000000000 -0500
-+++ sc/source/core/data/documen3.cxx 2008-03-03 11:33:34.000000000 -0500
-@@ -1757,6 +1757,10 @@ void ScDocument::SetDocOptions( const Sc
++++ sc/source/core/data/documen3.cxx 2008-03-19 18:30:50.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() );
-+ if (rOpt.IsXLFormulaSyntax())
-+ SetAddressConvention(ScAddress::CONV_XL_A1);
-+ else
-+ SetAddressConvention(ScAddress::CONV_OOO);
++ SetAddressConvention( rOpt.GetFormulaSyntax() );
}
const ScViewOptions& ScDocument::GetViewOptions() const
@@ -499,7 +505,7 @@
}
diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/source/core/tool/compiler.cxx sc/source/core/tool/compiler.cxx
--- sc.clean/source/core/tool/compiler.cxx 2008-03-03 11:24:50.000000000 -0500
-+++ sc/source/core/tool/compiler.cxx 2008-03-04 19:27:24.000000000 -0500
++++ sc/source/core/tool/compiler.cxx 2008-03-05 12:07:38.000000000 -0500
@@ -439,6 +439,7 @@ void ScCompiler::SetCompileEnglish( BOOL
if (!pCharClassEnglish)
InitCharClassEnglish();
@@ -790,7 +796,7 @@
void ScCompiler::AppendBoolean( rtl::OUStringBuffer& rBuffer, bool bVal )
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-03-03 11:24:50.000000000 -0500
-+++ sc/source/core/tool/docoptio.cxx 2008-03-03 11:33:34.000000000 -0500
++++ sc/source/core/tool/docoptio.cxx 2008-03-19 18:42:22.000000000 -0400
@@ -50,6 +50,7 @@
#include "scresid.hxx"
#include "sc.hrc"
@@ -805,71 +811,72 @@
bLookUpColRowNames( rCpy.bLookUpColRowNames ),
- bFormulaRegexEnabled( rCpy.bFormulaRegexEnabled )
+ bFormulaRegexEnabled( rCpy.bFormulaRegexEnabled ),
-+ bUseXLFormulaSyntax( rCpy.bUseXLFormulaSyntax )
++ eFormulaConv( rCpy.eFormulaConv )
{
}
-@@ -212,6 +214,11 @@ void ScDocOptions::ResetDocOptions()
+@@ -212,6 +214,7 @@ void ScDocOptions::ResetDocOptions()
bDoAutoSpell = FALSE;
bLookUpColRowNames = TRUE;
bFormulaRegexEnabled= TRUE;
-+ if (ScGlobal::pLocale->Language.equalsAscii("en") && ScGlobal::pLocale->Country.equalsAscii("US"))
-+ // turn this on by default for the English language (for now).
-+ bUseXLFormulaSyntax = true;
-+ else
-+ bUseXLFormulaSyntax = false;
++ eFormulaConv = ScAddress::CONV_OOO;
}
//========================================================================
-@@ -287,7 +294,8 @@ SfxPoolItem* __EXPORT ScTpCalcItem::Clon
+@@ -287,7 +290,8 @@ SfxPoolItem* __EXPORT ScTpCalcItem::Clon
#define SCCALCOPT_SEARCHCRIT 9
#define SCCALCOPT_FINDLABEL 10
#define SCCALCOPT_REGEX 11
-#define SCCALCOPT_COUNT 12
-+#define SCCALCOPT_XL_FORMULA 12
++#define SCCALCOPT_FORMULA_SYNTAX 12
+#define SCCALCOPT_COUNT 13
#define CFGPATH_DOCLAYOUT "Office.Calc/Layout/Other"
-@@ -310,7 +318,8 @@ Sequence<OUString> ScDocCfg::GetCalcProp
+@@ -310,7 +314,8 @@ Sequence<OUString> ScDocCfg::GetCalcProp
"Other/Precision", // SCCALCOPT_PRECISION
"Other/SearchCriteria", // SCCALCOPT_SEARCHCRIT
"Other/FindLabel", // SCCALCOPT_FINDLABEL
- "Other/RegularExpressions" // SCCALCOPT_REGEX
+ "Other/RegularExpressions", // SCCALCOPT_REGEX
-+ "Other/ExcelFormula" // SCCALCOPT_XL_FORMULA
++ "Other/FormulaSyntax" // SCCALCOPT_FORMULA_SYNTAX
};
Sequence<OUString> aNames(SCCALCOPT_COUNT);
OUString* pNames = aNames.getArray();
-@@ -403,6 +412,9 @@ ScDocCfg::ScDocCfg() :
+@@ -403,6 +408,14 @@ ScDocCfg::ScDocCfg() :
case SCCALCOPT_REGEX :
SetFormulaRegexEnabled( ScUnoHelpFunctions::GetBoolFromAny( pValues[nProp] ) );
break;
-+ case SCCALCOPT_XL_FORMULA:
-+ SetXLFormulaSyntax( ScUnoHelpFunctions::GetBoolFromAny( pValues[nProp] ) );
-+ break;
++ case SCCALCOPT_FORMULA_SYNTAX:
++ {
++ if ((pValues[nProp] >>= nIntVal) && nIntVal > ScAddress::CONV_UNSPECIFIED && nIntVal < ScAddress::CONV_LAST)
++ SetFormulaSyntax( static_cast<ScAddress::Convention>(nIntVal) );
++ else
++ SetFormulaSyntax(ScAddress::CONV_OOO);
++ }
++ break;
}
}
}
-@@ -486,6 +498,10 @@ IMPL_LINK( ScDocCfg, CalcCommitHdl, void
+@@ -486,6 +499,10 @@ IMPL_LINK( ScDocCfg, CalcCommitHdl, void
break;
case SCCALCOPT_REGEX :
ScUnoHelpFunctions::SetBoolInAny( pValues[nProp], IsFormulaRegexEnabled() );
+ break;
-+ case SCCALCOPT_XL_FORMULA:
-+ ScUnoHelpFunctions::SetBoolInAny( pValues[nProp], IsXLFormulaSyntax() );
++ case SCCALCOPT_FORMULA_SYNTAX:
++ pValues[nProp] <<= static_cast<sal_Int32>(GetFormulaSyntax());
+ break;
}
}
aCalcItem.PutProperties(aNames, aValues);
diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/source/ui/app/scmod.cxx sc/source/ui/app/scmod.cxx
--- sc.clean/source/ui/app/scmod.cxx 2008-03-03 11:24:45.000000000 -0500
-+++ sc/source/ui/app/scmod.cxx 2008-03-03 11:33:34.000000000 -0500
++++ sc/source/ui/app/scmod.cxx 2008-03-19 17:38:48.000000000 -0400
@@ -1253,6 +1253,7 @@ void ScModule::ModifyOptions( const SfxI
|| rOldOpt.IsMatchWholeCell() != rNewOpt.IsMatchWholeCell()
|| rOldOpt.GetYear2000() != rNewOpt.GetYear2000()
|| rOldOpt.IsFormulaRegexEnabled() != rNewOpt.IsFormulaRegexEnabled()
-+ || rOldOpt.IsXLFormulaSyntax() != rNewOpt.IsXLFormulaSyntax()
++ || rOldOpt.GetFormulaSyntax() != rNewOpt.GetFormulaSyntax()
);
pDoc->SetDocOptions( rNewOpt );
pDocSh->SetDocumentModified();
@@ -1075,124 +1082,138 @@
else
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-03-03 11:24:45.000000000 -0500
-+++ sc/source/ui/inc/optdlg.hrc 2008-03-03 11:33:34.000000000 -0500
-@@ -78,6 +78,7 @@
++++ sc/source/ui/inc/optdlg.hrc 2008-03-19 16:21:34.000000000 -0400
+@@ -78,6 +78,8 @@
#define BTN_MATCH 18
#define BTN_LOOKUP 19
#define BTN_REGEX 20
-+#define BTN_XL_FORMULA 21
++#define FT_FORMULA_SYNTAX 21
++#define LB_FORMULA_SYNTAX 22
// TP_VIEW:
#define BTN_VSCROLL 1
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-03-03 11:24:45.000000000 -0500
-+++ sc/source/ui/inc/tpcalc.hxx 2008-03-03 11:33:34.000000000 -0500
-@@ -101,6 +101,7 @@ private:
++++ sc/source/ui/inc/tpcalc.hxx 2008-03-19 18:34:51.000000000 -0400
+@@ -61,6 +61,8 @@
+ #include "editfield.hxx"
+ #endif
+
++#include "vcl/lstbox.hxx"
++
+ //===================================================================
+
+ class ScDocOptions;
+@@ -101,6 +103,8 @@ private:
CheckBox aBtnMatch;
CheckBox aBtnRegex;
CheckBox aBtnLookUp;
-+ CheckBox aBtnXLFormula;
++ FixedText aFtFormulaSyntax;
++ ListBox aLBFormulaSyntax;
FixedText aFtPrec;
NumericField aEdPrec;
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-03-03 11:24:49.000000000 -0500
-+++ sc/source/ui/optdlg/tpcalc.cxx 2008-03-03 11:33:34.000000000 -0500
-@@ -96,6 +96,7 @@ ScTpCalcOptions::ScTpCalcOptions( Window
++++ sc/source/ui/optdlg/tpcalc.cxx 2008-03-19 18:18:38.000000000 -0400
+@@ -96,6 +96,8 @@ ScTpCalcOptions::ScTpCalcOptions( Window
aBtnMatch ( this, ScResId( BTN_MATCH ) ),
aBtnRegex ( this, ScResId( BTN_REGEX ) ),
aBtnLookUp ( this, ScResId( BTN_LOOKUP ) ),
-+ aBtnXLFormula ( this, ScResId( BTN_XL_FORMULA ) ),
++ aFtFormulaSyntax( this, ScResId( FT_FORMULA_SYNTAX ) ),
++ aLBFormulaSyntax( this, ScResId( LB_FORMULA_SYNTAX ) ),
aFtPrec ( this, ScResId( FT_PREC ) ),
aEdPrec ( this, ScResId( ED_PREC ) ),
pOldOptions ( new ScDocOptions(
-@@ -156,6 +157,7 @@ void __EXPORT ScTpCalcOptions::Reset( co
- aBtnMatch .Check( pLocalOptions->IsMatchWholeCell() );
- aBtnRegex .Check( pLocalOptions->IsFormulaRegexEnabled() );
- aBtnLookUp .Check( pLocalOptions->IsLookUpColRowNames() );
-+ aBtnXLFormula.Check( pLocalOptions->IsXLFormulaSyntax() );
- aBtnIterate.Check( pLocalOptions->IsIter() );
- aEdSteps .SetValue( pLocalOptions->GetIterCount() );
+@@ -161,6 +163,18 @@ void __EXPORT ScTpCalcOptions::Reset( co
aEdPrec .SetValue( pLocalOptions->GetStdPrecision() );
-@@ -192,6 +194,7 @@ BOOL __EXPORT ScTpCalcOptions::FillItemS
+ aEdEps .SetValue( pLocalOptions->GetIterEps(), 6 );
+
++ ScAddress::Convention eConv = pLocalOptions->GetFormulaSyntax();
++ switch (eConv)
++ {
++ case ScAddress::CONV_OOO:
++ case ScAddress::CONV_XL_A1:
++ case ScAddress::CONV_XL_R1C1:
++ aLBFormulaSyntax.SelectEntryPos(static_cast<USHORT>(eConv));
++ break;
++ default:
++ aLBFormulaSyntax.SelectEntryPos(0);
++ }
++
+ pLocalOptions->GetDate( d, m, y );
+
+ switch ( y )
+@@ -192,6 +206,8 @@ BOOL __EXPORT ScTpCalcOptions::FillItemS
pLocalOptions->SetMatchWholeCell( aBtnMatch.IsChecked() );
pLocalOptions->SetFormulaRegexEnabled( aBtnRegex.IsChecked() );
pLocalOptions->SetLookUpColRowNames( aBtnLookUp.IsChecked() );
-+ pLocalOptions->SetXLFormulaSyntax( aBtnXLFormula.IsChecked() );
++ pLocalOptions->SetFormulaSyntax(
++ static_cast<ScAddress::Convention>(aLBFormulaSyntax.GetSelectEntryPos()) );
if ( *pLocalOptions != *pOldOptions )
{
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-03-03 11:24:45.000000000 -0500
-+++ sc/source/ui/src/optdlg.src 2008-03-03 11:33:34.000000000 -0500
-@@ -173,6 +173,13 @@ TabPage RID_SCPAGE_CALC
++++ sc/source/ui/src/optdlg.src 2008-03-19 16:40:53.000000000 -0400
+@@ -173,6 +173,27 @@ TabPage RID_SCPAGE_CALC
Size = MAP_APPFONT ( 239 , 10 ) ;
Text [ en-US ] = "~Automatically find column and row labels " ;
};
+
-+ CheckBox BTN_XL_FORMULA
++ FixedText FT_FORMULA_SYNTAX
+ {
-+ Pos = MAP_APPFONT ( 12, 147 ) ;
-+ Size = MAP_APPFONT ( 239, 10 ) ;
-+ Text [ en-US ] = "Use E~xcel style formula syntax" ;
++ Pos = MAP_APPFONT ( 21, 147 ) ;
++ Size = MAP_APPFONT ( 80, 8 ) ;
++ Text [ en-US ] = "~Formula syntax" ;
++ };
++
++ ListBox LB_FORMULA_SYNTAX
++ {
++ Border = TRUE ;
++ Pos = MAP_APPFONT ( 85, 145 ) ;
++ Size = MAP_APPFONT ( 60, 46 ) ;
++ DropDown = TRUE ;
++ StringList [ en-US ] =
++ {
++ < "Calc A1" ; Default ; > ;
++ < "Excel A1" ; Default ; > ;
++ < "Excel R1C1" ; Default ; > ;
++ };
+ };
};
/**************************************************************************/
-diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
-index 302b24f..e52ce97 100644
---- sc/source/ui/vba/vbarange.cxx
-+++ sc/source/ui/vba/vbarange.cxx
-@@ -761,10 +761,10 @@ protected:
- double aDblValue;
- if ( aValue >>= sFormula )
- {
-- // get current convention
-- ScAddress::Convention eConv = m_pDoc->GetAddressConvention();
-- // only convert/compile 'real' formulas
-- if ( eConv != m_eConv && ( sFormula.trim().indexOf('=') == 0 ) )
-+ // convert to CONV_OOO style formula string because XCell::setFormula
-+ // always compile it in CONV_OOO style. Perhaps css.sheet.FormulaParser
-+ // should be used in future to directly pass formula tokens.
-+ if ( m_eConv != ScAddress::CONV_OOO && ( sFormula.trim().indexOf('=') == 0 ) )
- {
- uno::Reference< uno::XInterface > xIf( xCell, uno::UNO_QUERY_THROW );
- ScCellRangesBase* pUnoRangesBase = dynamic_cast< ScCellRangesBase* >( xIf.get() );
-@@ -775,7 +775,7 @@ protected:
- // compile the string in the format passed in
- aCompiler.CompileString( sFormula, m_eConv );
- // set desired convention to that of the document
-- aCompiler.SetRefConvention( eConv );
-+ aCompiler.SetRefConvention( ScAddress::CONV_OOO );
- String sConverted;
- aCompiler.CreateStringFromTokenArray(sConverted);
- sFormula = EQUALS + sConverted;
-@@ -1429,8 +1429,8 @@ void
- ScVbaRange::setFormula(const uno::Any &rFormula ) throw (uno::RuntimeException)
- {
- // #FIXME converting "=$a$1" e.g. CONV_XL_A1 -> CONV_OOO // results in "=$a$1:a1", temporalily disable conversion
-- //setFormulaValue( rFormula, ScAddress::CONV_XL_A1 );;
-- setFormulaValue( rFormula, ScAddress::CONV_OOO );;
-+ setFormulaValue( rFormula, ScAddress::CONV_XL_A1 );;
-+ //setFormulaValue( rFormula, ScAddress::CONV_OOO );;
- }
-
- uno::Any
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-03-03 11:28:58.000000000 -0500
-+++ officecfg/registry/schema/org/openoffice/Office/Calc.xcs 2008-03-03 11:33:35.000000000 -0500
-@@ -1134,6 +1134,15 @@
++++ officecfg/registry/schema/org/openoffice/Office/Calc.xcs 2008-03-19 18:32:54.000000000 -0400
+@@ -1134,6 +1134,30 @@
</info>
<value>true</value>
</prop>
-+ <prop oor:name="ExcelFormula" oor:type="xs:boolean">
-+ <!-- UIHints: Tools - Options Spreadsheet Calculate [Check box] Enable excel formula arg separator style -->
++ <prop oor:name="FormulaSyntax" oor:type="xs:int">
++ <!-- UIHints: Tools - Options Spreadsheet Calculate -->
+ <info>
+ <author>kyoshida</author>
-+ <desc>Specifies Calc localizes the arg separator, like Excel does.</desc>
-+ <label>Enable localized arg separator in formulas</label>
++ <desc>Specifies what formula syntax type to use.</desc>
+ </info>
-+ <value>false</value>
++ <constraints>
++ <enumeration oor:value="0">
++ <info>
++ <desc>Calc A1</desc>
++ </info>
++ </enumeration>
++ <enumeration oor:value="1">
++ <info>
++ <desc>Excel A1</desc>
++ </info>
++ </enumeration>
++ <enumeration oor:value="2">
++ <info>
++ <desc>Excel R1C1</desc>
++ </info>
++ </enumeration>
++ </constraints>
+ </prop>
<node-ref oor:name="Date" oor:node-type="Date">
<info>
Modified: trunk/patches/src680/sc-sheet-gridline-toggle.diff
==============================================================================
--- trunk/patches/src680/sc-sheet-gridline-toggle.diff (original)
+++ trunk/patches/src680/sc-sheet-gridline-toggle.diff Thu Mar 20 00:13:59 2008
@@ -43,8 +43,7 @@
#define FID_TAB_APPEND (TAB_POPUP_START+5)
#define FID_TAB_INDEX (TAB_POPUP_START+6)
#define FID_TAB_RTL (TAB_POPUP_START+7)
- #define FID_TAB_USE_R1C1 (TAB_POPUP_START+8)
-+#define FID_TAB_TOGGLE_GRID (TAB_POPUP_START+9)
++#define FID_TAB_TOGGLE_GRID (TAB_POPUP_START+8)
#define TAB_POPUP_END (DATA_MENU_END + 20)
@@ -112,7 +111,6 @@
FID_DELETE_TABLE [ ExecMethod = ExecuteTable; StateMethod = GetStateTable; ]
FID_TAB_RENAME [ ExecMethod = ExecuteTable; StateMethod = GetStateTable; ]
FID_TAB_RTL [ ExecMethod = ExecuteTable; StateMethod = GetStateTable; ]
- FID_TAB_USE_R1C1 [ ExecMethod = ExecuteTable; StateMethod = GetStateTable; ]
+ FID_TAB_TOGGLE_GRID [ ExecMethod = ExecuteTable; StateMethod = GetStateTable; ]
SID_TABLE_ACTIVATE [ ExecMethod = Execute; ]
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
