[ooo-build-commit] .: 4 commits - formula/inc formula/source officecfg/registry svx/inc
Fridrich Strba
fridrich at kemper.freedesktop.org
Wed Sep 15 12:33:46 PDT 2010
formula/inc/formula/FormulaCompiler.hxx | 2
formula/source/core/api/FormulaCompiler.cxx | 11 +
officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu | 8
officecfg/registry/schema/org/openoffice/Office/Calc.xcs | 83 ++++++++++
svx/inc/svx/dialogs.hrc | 1
5 files changed, 105 insertions(+)
New commits:
commit 46cacfedc577ba683a760f0788ff891942cfd74d
Author: Kohei Yoshida <kyoshida at novell.com>
Date: Wed Sep 15 21:29:01 2010 +0200
calc-formula-variable-separators-officecfg.diff: formula separators changeable
n#447164, i#92056
Make the formula separators changeable per locale setting, and add new
configuration page for formula syntax and separators.
diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index 9139027..2db99d2 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -1217,6 +1217,31 @@
</info>
<value>true</value>
</prop>
+ <prop oor:name="FormulaSyntax" oor:type="xs:int">
+ <!-- UIHints: Tools - Options Spreadsheet Calculate -->
+ <!-- This node is deprecated, but we still need to keep it for migration purposes. -->
+ <info>
+ <author>kyoshida</author>
+ <desc>Specifies what formula syntax type to use.</desc>
+ </info>
+ <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>
<desc>Specifies the date that is represented by the number 0.</desc>
@@ -1224,6 +1249,64 @@
</node-ref>
</group>
</group>
+ <group oor:name="Formula">
+ <info>
+ <desc>Contains settings that affect formula handling.</desc>
+ </info>
+ <group oor:name="Syntax">
+ <info>
+ <desc>Contains settings for formula syntax.</desc>
+ </info>
+ <prop oor:name="Grammar" oor:type="xs:int">
+ <!-- UIHints: Tools - Options Spreadsheet Formula -->
+ <info>
+ <author>kyoshida</author>
+ <desc>Specifies what formula syntax type to use.</desc>
+ </info>
+ <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>
+ <prop oor:name="SeparatorArg" oor:type="xs:string">
+ <!-- UIHints: Tools - Options Spreadsheet Formula -->
+ <info>
+ <author>kyoshida</author>
+ <desc>Argument separator in worksheet function</desc>
+ </info>
+ <value></value>
+ </prop>
+ <prop oor:name="SeparatorArrayRow" oor:type="xs:string">
+ <!-- UIHints: Tools - Options Spreadsheet Formula -->
+ <info>
+ <author>kyoshida</author>
+ <desc>Row separator in array constant</desc>
+ </info>
+ <value></value>
+ </prop>
+ <prop oor:name="SeparatorArrayCol" oor:type="xs:string">
+ <!-- UIHints: Tools - Options Spreadsheet Formula -->
+ <info>
+ <author>kyoshida</author>
+ <desc>Column separator in array constant</desc>
+ </info>
+ <value></value>
+ </prop>
+ </group>
+ </group>
<group oor:name="Revision">
<info>
<desc>Contains settings that affect revision marking.</desc>
commit d1cc491ffc0d01eb7a4e82f65bda7be68a05f26e
Author: Kohei Yoshida <kyoshida at novell.com>
Date: Wed Sep 15 21:27:09 2010 +0200
calc-formula-variable-separators-svx.diff: formula separators changeable
n#447164, i#92056
Make the formula separators changeable per locale setting, and add new
configuration page for formula syntax and separators.
diff --git a/svx/inc/svx/dialogs.hrc b/svx/inc/svx/dialogs.hrc
index d9a7524..af6a944 100755
--- a/svx/inc/svx/dialogs.hrc
+++ b/svx/inc/svx/dialogs.hrc
@@ -1056,3 +1056,4 @@
#endif
+#define SID_SC_TP_FORMULA (SVX_OOO_BUILD_START + 1)
commit 02ea0d7bdd0192fe9349f849926efc7c922b13d4
Author: Kohei Yoshida <kyoshida at novell.com>
Date: Wed Sep 15 21:20:46 2010 +0200
calc-formula-variable-separators-sc.diff: formula separators changeable
n#447164, i#92056
Make the formula separators changeable per locale setting, and add new
configuration page for formula syntax and separators.
diff --git a/formula/inc/formula/FormulaCompiler.hxx b/formula/inc/formula/FormulaCompiler.hxx
index b67d78a..d82e2c8 100644
--- a/formula/inc/formula/FormulaCompiler.hxx
+++ b/formula/inc/formula/FormulaCompiler.hxx
@@ -242,6 +242,8 @@ public:
including an address reference convention. */
inline FormulaGrammar::Grammar GetGrammar() const { return meGrammar; }
+ static void UpdateSeparatorsNative( const rtl::OUString& rSep, const rtl::OUString& rArrayColSep, const rtl::OUString& rArrayRowSep );
+
protected:
virtual String FindAddInFunction( const String& rUpperName, BOOL bLocalFirst ) const;
virtual void fillFromAddInCollectionUpperName( NonConstOpCodeMapPtr xMap ) const;
diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx
index 51e2ca9..508d780 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -1678,6 +1678,17 @@ void FormulaCompiler::AppendString( rtl::OUStringBuffer& rBuffer, const String &
rBuffer.append(sal_Unicode('"'));
}
}
+
+void FormulaCompiler::UpdateSeparatorsNative(
+ const rtl::OUString& rSep, const rtl::OUString& rArrayColSep, const rtl::OUString& rArrayRowSep )
+{
+ NonConstOpCodeMapPtr xSymbolsNative;
+ lcl_fillNativeSymbols(xSymbolsNative);
+ xSymbolsNative->putOpCode(rSep, ocSep);
+ xSymbolsNative->putOpCode(rArrayColSep, ocArrayColSep);
+ xSymbolsNative->putOpCode(rArrayRowSep, ocArrayRowSep);
+}
+
// -----------------------------------------------------------------------------
OpCode FormulaCompiler::NextToken()
{
commit 28f8d9d68f350c4e48a98aa8d3337252018b3273
Author: Kohei Yoshida <kyoshida at novell.com>
Date: Wed Sep 15 21:16:21 2010 +0200
sc-sheet-gridline-toggle.diff: Toggle gridline display per sheet.
i#14893
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index 6b48313..073a2bb 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -1493,6 +1493,14 @@
<value xml:lang="en-US">S~hare Document...</value>
</prop>
</node>
+ <node oor:name=".uno:ToggleSheetGrid" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Toggle Grid Lines for Current Sheet</value>
+ </prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>1</value>
+ </prop>
+ </node>
</node>
<node oor:name="Popups">
<node oor:name=".uno:AuditMenu" oor:op="replace">
More information about the ooo-build-commit
mailing list