Kaydet (Commit) f8f34f8c authored tarafından Kohei Yoshida's avatar Kohei Yoshida Kaydeden (comit) Fridrich Štrba

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.
üst ddd9cef6
...@@ -242,6 +242,8 @@ public: ...@@ -242,6 +242,8 @@ public:
including an address reference convention. */ including an address reference convention. */
inline FormulaGrammar::Grammar GetGrammar() const { return meGrammar; } inline FormulaGrammar::Grammar GetGrammar() const { return meGrammar; }
static void UpdateSeparatorsNative( const rtl::OUString& rSep, const rtl::OUString& rArrayColSep, const rtl::OUString& rArrayRowSep );
protected: protected:
virtual String FindAddInFunction( const String& rUpperName, BOOL bLocalFirst ) const; virtual String FindAddInFunction( const String& rUpperName, BOOL bLocalFirst ) const;
virtual void fillFromAddInCollectionUpperName( NonConstOpCodeMapPtr xMap ) const; virtual void fillFromAddInCollectionUpperName( NonConstOpCodeMapPtr xMap ) const;
......
...@@ -1678,6 +1678,17 @@ void FormulaCompiler::AppendString( rtl::OUStringBuffer& rBuffer, const String & ...@@ -1678,6 +1678,17 @@ void FormulaCompiler::AppendString( rtl::OUStringBuffer& rBuffer, const String &
rBuffer.append(sal_Unicode('"')); 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() OpCode FormulaCompiler::NextToken()
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment