diff options
| author | Joseph Powers <jpowers27@cox.net> | 2010-12-08 22:38:24 -0800 |
|---|---|---|
| committer | Kohei Yoshida <kyoshida@novell.com> | 2010-12-09 18:05:21 -0500 |
| commit | 6eefbb4beea48b007e0a6e8ceeaa800319b9f5d8 (patch) | |
| tree | b1b9bb47248baf395774fca931443997e23e5c9a /sc/inc/rangelst.hxx | |
| parent | bf9ed0595b1ec5900523f7a2f322c8310f8b6772 (diff) | |
Remove another DECLARE_LIST() from Calc
Signed-off-by: Kohei Yoshida <kyoshida@novell.com>
Diffstat (limited to 'sc/inc/rangelst.hxx')
| -rw-r--r-- | sc/inc/rangelst.hxx | 36 |
1 files changed, 20 insertions, 16 deletions
diff --git a/sc/inc/rangelst.hxx b/sc/inc/rangelst.hxx index 3584a9d2b2a7..d26b4ab3c229 100644 --- a/sc/inc/rangelst.hxx +++ b/sc/inc/rangelst.hxx @@ -32,45 +32,49 @@ #include "global.hxx" #include "address.hxx" #include <tools/solar.h> +#include <vector> class ScDocument; typedef ScRange* ScRangePtr; -DECLARE_LIST( ScRangeListBase, ScRangePtr ) +typedef ::std::vector< ScRangePtr > ScRangeListBase; class SC_DLLPUBLIC ScRangeList : public ScRangeListBase, public SvRefBase { -private: - using ScRangeListBase::operator==; - using ScRangeListBase::operator!=; - public: ScRangeList() {} ScRangeList( const ScRangeList& rList ); virtual ~ScRangeList(); ScRangeList& operator=(const ScRangeList& rList); - void RemoveAll(); void Append( const ScRange& rRange ) { ScRangePtr pR = new ScRange( rRange ); - Insert( pR, LIST_APPEND ); + push_back( pR ); } + USHORT Parse( const String&, ScDocument* = NULL, USHORT nMask = SCA_VALID, formula::FormulaGrammar::AddressConvention eConv = formula::FormulaGrammar::CONV_OOO, sal_Unicode cDelimiter = 0 ); + void Format( String&, USHORT nFlags = 0, ScDocument* = NULL, formula::FormulaGrammar::AddressConvention eConv = formula::FormulaGrammar::CONV_OOO, sal_Unicode cDelimiter = 0 ) const; - void Join( const ScRange&, BOOL bIsInList = FALSE ); - BOOL UpdateReference( UpdateRefMode, ScDocument*, - const ScRange& rWhere, - SCsCOL nDx, SCsROW nDy, SCsTAB nDz ); + + void Join( const ScRange&, bool bIsInList = false ); + + bool UpdateReference( UpdateRefMode, ScDocument*, + const ScRange& rWhere, + SCsCOL nDx, + SCsROW nDy, + SCsTAB nDz + ); + ScRange* Find( const ScAddress& ) const; - BOOL operator==( const ScRangeList& ) const; - BOOL operator!=( const ScRangeList& r ) const; - BOOL Intersects( const ScRange& ) const; - BOOL In( const ScRange& ) const; - ULONG GetCellCount() const; + bool operator==( const ScRangeList& ) const; + bool operator!=( const ScRangeList& r ) const; + bool Intersects( const ScRange& ) const; + bool In( const ScRange& ) const; + size_t GetCellCount() const; }; SV_DECL_IMPL_REF( ScRangeList ); |