diff options
| author | Oliver Bolte <obo@openoffice.org> | 2007-06-13 08:04:48 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2007-06-13 08:04:48 +0000 |
| commit | e21529abb233e2b13205620b438f26c604b4286a (patch) | |
| tree | 0c93005883a8d520582b410b39fa70807c07f8c9 /sc/inc/compiler.hxx | |
| parent | fae86222c6f12dcf2f75ce1fc473c21386df0e5f (diff) | |
INTEGRATION: CWS jgarrays (1.29.54); FILE MERGED
2007/06/04 18:33:34 er 1.29.54.3: RESYNC: (1.29-1.30); FILE MERGED
2007/05/08 21:16:01 jodygoldberg 1.29.54.2: Issue number: 32342
Submitted by: jodygoldberg
Reviewed by: er
- Inline boolean support in ScMatrix
- parsing for booleans in inline arrays
- update ScMatrix to string code to factor out AppendString and AppendDouble
2007/04/26 12:25:58 jodygoldberg 1.29.54.1: Issue number: 32342
Submitted by: jodygoldberg
Reviewed by: er,dr
Some small updates to the patch in issuezilla, resynced to m210.
It still needs the small re-factoring er suggested
re: ScCompiler::AppendString
Diffstat (limited to 'sc/inc/compiler.hxx')
| -rw-r--r-- | sc/inc/compiler.hxx | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx index 0c3b48345caf..f1ec31b99a07 100644 --- a/sc/inc/compiler.hxx +++ b/sc/inc/compiler.hxx @@ -4,9 +4,9 @@ * * $RCSfile: compiler.hxx,v $ * - * $Revision: 1.30 $ + * $Revision: 1.31 $ * - * last change: $Author: rt $ $Date: 2007-04-25 15:56:13 $ + * last change: $Author: obo $ $Date: 2007-06-13 09:04:48 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -289,7 +289,7 @@ private: BOOL bImportXML; BOOL GetToken(); - BOOL NextNewToken(); + BOOL NextNewToken(bool bAllowBooleans = false); OpCode NextToken(); void PutCode( ScTokenRef& ); void Factor(); @@ -315,11 +315,17 @@ private: BOOL IsNamedRange( const String& ); BOOL IsDBRange( const String& ); BOOL IsColRowName( const String& ); + BOOL IsBoolean( const String& ); void AutoCorrectParsedSymbol(); void AdjustReference( SingleRefData& r ); void PushTokenArray( ScTokenArray*, BOOL = FALSE ); void PopTokenArray(); void SetRelNameReference(); + void CreateStringFromScMatrix( rtl::OUStringBuffer& rBuffer, const ScMatrix* pMatrix ); + + void AppendBoolean( rtl::OUStringBuffer& rBuffer, bool bVal ); + void AppendDouble( rtl::OUStringBuffer& rBuffer, double fVal ); + void AppendString( rtl::OUStringBuffer& rBuffer, const String & rStr ); public: ScCompiler(ScDocument* pDocument, const ScAddress& ); |