summaryrefslogtreecommitdiff
path: root/sc/inc
diff options
context:
space:
mode:
authorRelease Engineers <releng@openoffice.org>2009-07-03 11:00:47 +0000
committerRelease Engineers <releng@openoffice.org>2009-07-03 11:00:47 +0000
commit220c5f9de6dfe8e7a9b343be0480be3d4d3ca3cb (patch)
treea6640745a104caa9636f9fbcbbfcba55c40b6e98 /sc/inc
parent9aaf80e791554eb568df3fd27d9c97472a84c68f (diff)
CWS-TOOLING: integrate CWS koheiformula03
2009-04-24 17:45:29 +0200 kohei r271229 : #i101330# Extend Excel's maximum column to Calc's maximum column upon import. 2009-04-14 21:45:35 +0200 kohei r270810 : #i101048# fixed - now the autofilter menu item is disabled when the current cursor overlaps a datapilot table. 2009-04-14 21:41:22 +0200 kohei r270809 : #i101047# fixed by removing all merge flags when a new row is inserted. The old code did remove merge flags, but it didn't remove SC_MF_BUTTON flag. 2009-04-14 18:00:16 +0200 kohei r270806 : #i101091# fixed the issue. When creating a data sequence via passing a range representation, the syntax must be the Calc A1 syntax regardless of current formula syntax. However, for other operations that affects chart's UI, the syntax must be the current formula syntax. In the future we should have an API to directly pass formula reference tokens to chart objects. 2009-04-14 17:46:36 +0200 kohei r270804 : #i101090# fixed the issue of referenced ranges not being highlighted & formula tooltip not working when the separators are not ';'. 2009-04-14 17:37:55 +0200 kohei r270802 : #i101043# Fixed. Defining a named range via the named range box should now work for non-default formula syntax. 2009-04-14 17:35:08 +0200 kohei r270800 : #i101041# Fixed. Always interpret DDE's address using the Calc A1 syntax regardless of current formula syntax.
Diffstat (limited to 'sc/inc')
-rw-r--r--sc/inc/compiler.hxx1
-rw-r--r--sc/inc/document.hxx2
-rw-r--r--sc/inc/reftokenhelper.hxx3
3 files changed, 4 insertions, 2 deletions
diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx
index 214099872..c41c15d9d 100644
--- a/sc/inc/compiler.hxx
+++ b/sc/inc/compiler.hxx
@@ -353,6 +353,7 @@ public:
static BOOL EnQuote( String& rStr );
+ sal_Unicode GetNativeAddressSymbol( Convention::SpecialSymbolType eType ) const;
// Check if it is a valid english function name
bool IsEnglishSymbol( const String& rName );
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 4070837a6..451c590ee 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -593,7 +593,7 @@ public:
SC_DLLPUBLIC BOOL IsActiveScenario( SCTAB nTab ) const;
SC_DLLPUBLIC void SetActiveScenario( SCTAB nTab, BOOL bActive ); // nur fuer Undo etc.
SC_DLLPUBLIC formula::FormulaGrammar::AddressConvention GetAddressConvention() const;
- formula::FormulaGrammar::Grammar GetGrammar() const;
+ SC_DLLPUBLIC formula::FormulaGrammar::Grammar GetGrammar() const;
void SetGrammar( formula::FormulaGrammar::Grammar eGram );
SC_DLLPUBLIC BYTE GetLinkMode( SCTAB nTab ) const;
BOOL IsLinked( SCTAB nTab ) const;
diff --git a/sc/inc/reftokenhelper.hxx b/sc/inc/reftokenhelper.hxx
index b1159cc4a..d7b335f9b 100644
--- a/sc/inc/reftokenhelper.hxx
+++ b/sc/inc/reftokenhelper.hxx
@@ -56,7 +56,8 @@ public:
* The source range may consist of multiple ranges separated by ';'s.
*/
static void compileRangeRepresentation(
- ::std::vector<ScSharedTokenRef>& rRefTokens, const ::rtl::OUString& rRangeStr, ScDocument* pDoc);
+ ::std::vector<ScSharedTokenRef>& rRefTokens, const ::rtl::OUString& rRangeStr, ScDocument* pDoc,
+ ::formula::FormulaGrammar::Grammar eGrammar = ::formula::FormulaGrammar::GRAM_ENGLISH);
static bool getRangeFromToken(ScRange& rRange, const ScSharedTokenRef& pToken, bool bExternal = false);