diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-03-06 14:18:07 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-03-06 14:18:07 +0000 |
| commit | 717b42efbe1af5283d68e98e202559fe0c14adaa (patch) | |
| tree | c6e56ff729fa75711ec2315613114cc160ca9202 /sc/inc/rangenam.hxx | |
| parent | 518955cefadd2f179d1c3ffcdf47d9cf7b62f1d4 (diff) | |
INTEGRATION: CWS odff (1.12.158); FILE MERGED
2008/02/27 18:29:45 er 1.12.158.4: RESYNC: (1.13-1.14); FILE MERGED
2008/01/21 18:50:59 er 1.12.158.3: RESYNC: (1.12-1.13); FILE MERGED
2008/01/08 19:45:43 er 1.12.158.2: get rid of distracting binfilter legacy
2007/09/06 10:43:07 er 1.12.158.1: #i81063# new ScGrammar; get rid of SetCompileEnglish, SetCompileXML, GetEnglishFormula, ...
Diffstat (limited to 'sc/inc/rangenam.hxx')
| -rw-r--r-- | sc/inc/rangenam.hxx | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/sc/inc/rangenam.hxx b/sc/inc/rangenam.hxx index e50e5f4ea523..0c9d7aa898f0 100644 --- a/sc/inc/rangenam.hxx +++ b/sc/inc/rangenam.hxx @@ -4,9 +4,9 @@ * * $RCSfile: rangenam.hxx,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: vg $ $Date: 2008-01-29 08:01:44 $ + * last change: $Author: kz $ $Date: 2008-03-06 15:18:07 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -45,6 +45,9 @@ #ifndef SC_COLLECT_HXX #include "collect.hxx" #endif +#ifndef SC_GRAMMAR_HXX +#include "grammar.hxx" +#endif //------------------------------------------------------------------------ @@ -98,7 +101,7 @@ public: const String& rSymbol, const ScAddress& rAdr = ScAddress(), RangeType nType = RT_NAME, - BOOL bEnglish = FALSE ); + const ScGrammar::Grammar eGrammar = ScGrammar::GRAM_DEFAULT ); ScRangeData( ScDocument* pDoc, const String& rName, const ScTokenArray& rArr, @@ -109,17 +112,12 @@ public: const ScAddress& rTarget ); // rTarget ist ABSPOS Sprungmarke ScRangeData(const ScRangeData& rScRangeData); - ScRangeData( SvStream& rStream, - ScMultipleReadHeader& rHdr, - USHORT nVer ); virtual ~ScRangeData(); virtual DataObject* Clone() const; - BOOL Store( SvStream& rStream, ScMultipleWriteHeader& rHdr ) const; - BOOL operator== (const ScRangeData& rData) const; void GetName( String& rName ) const { rName = aName; } @@ -138,12 +136,11 @@ public: void AddType( RangeType nType ) { eType = eType|nType; } RangeType GetType() const { return eType; } BOOL HasType( RangeType nType ) const; - void GetSymbol(String& rSymbol) const; - void GetEnglishSymbol(String& rSymbol, BOOL bCompileXML = FALSE) const; + void GetSymbol( String& rSymbol, const ScGrammar::Grammar eGrammar = ScGrammar::GRAM_DEFAULT ) const; void UpdateSymbol( String& rSymbol, const ScAddress&, - BOOL bEnglish = FALSE, BOOL bCompileXML = FALSE ); + const ScGrammar::Grammar eGrammar = ScGrammar::GRAM_DEFAULT ); void UpdateSymbol( rtl::OUStringBuffer& rBuffer, const ScAddress&, - BOOL bEnglish = FALSE, BOOL bCompileXML = FALSE ); + const ScGrammar::Grammar eGrammar = ScGrammar::GRAM_DEFAULT ); void UpdateReference( UpdateRefMode eUpdateRefMode, const ScRange& r, SCsCOL nDx, SCsROW nDy, SCsTAB nDz ); @@ -219,8 +216,6 @@ public: ScRangeData* GetRangeAtCursor( const ScAddress&, BOOL bStartOnly ) const; ScRangeData* GetRangeAtBlock( const ScRange& ) const; - BOOL Load( SvStream& rStream, USHORT nVer ); - BOOL Store( SvStream& rStream ) const; BOOL SearchName( const String& rName, USHORT& rPos ) const; // SearchNameUpper must be called with an upper-case search string BOOL SearchNameUpper( const String& rUpperName, USHORT& rPos ) const; |