Kaydet (Commit) fef972da authored tarafından Kohei Yoshida's avatar Kohei Yoshida

Remove CalcAbsIfRel() virtual method from ScToken and all its children.

Change-Id: I8d9c869161356a7adad9c57d34b001ebcf8992ce
üst c43c3e3c
......@@ -74,7 +74,6 @@ public:
virtual ScComplexRefData& GetDoubleRef();
virtual const ScSingleRefData& GetSingleRef2() const;
virtual ScSingleRefData& GetSingleRef2();
virtual void CalcAbsIfRel( const ScAddress& );
virtual const ScMatrix* GetMatrix() const;
virtual ScMatrix* GetMatrix();
virtual ScJumpMatrix* GetJumpMatrix() const;
......@@ -124,7 +123,6 @@ public:
ScToken( r ), aSingleRef( r.aSingleRef ) {}
virtual const ScSingleRefData& GetSingleRef() const;
virtual ScSingleRefData& GetSingleRef();
virtual void CalcAbsIfRel( const ScAddress& );
virtual bool operator==( const formula::FormulaToken& rToken ) const;
virtual FormulaToken* Clone() const { return new ScSingleRefToken(*this); }
......@@ -155,7 +153,6 @@ public:
virtual ScComplexRefData& GetDoubleRef();
virtual const ScSingleRefData& GetSingleRef2() const;
virtual ScSingleRefData& GetSingleRef2();
virtual void CalcAbsIfRel( const ScAddress& );
virtual bool operator==( const formula::FormulaToken& rToken ) const;
virtual FormulaToken* Clone() const { return new ScDoubleRefToken(*this); }
......@@ -197,7 +194,6 @@ public:
virtual const String& GetString() const;
virtual const ScSingleRefData& GetSingleRef() const;
virtual ScSingleRefData& GetSingleRef();
virtual void CalcAbsIfRel( const ScAddress& );
virtual bool operator==( const formula::FormulaToken& rToken ) const;
virtual FormulaToken* Clone() const { return new ScExternalSingleRefToken(*this); }
};
......@@ -224,7 +220,6 @@ public:
virtual ScSingleRefData& GetSingleRef2();
virtual const ScComplexRefData& GetDoubleRef() const;
virtual ScComplexRefData& GetDoubleRef();
virtual void CalcAbsIfRel( const ScAddress& );
virtual bool operator==( const formula::FormulaToken& rToken ) const;
virtual FormulaToken* Clone() const { return new ScExternalDoubleRefToken(*this); }
};
......@@ -276,7 +271,6 @@ public:
ScToken( formula::svRefList ) {}
ScRefListToken( const ScRefListToken & r ) :
ScToken( r ), aRefList( r.aRefList ) {}
virtual void CalcAbsIfRel( const ScAddress& );
virtual const ScRefList* GetRefList() const;
virtual ScRefList* GetRefList();
virtual bool operator==( const formula::FormulaToken& rToken ) const;
......
......@@ -704,11 +704,6 @@ ScSingleRefData& ScToken::GetSingleRef2()
return aDummySingleRef;
}
void ScToken::CalcAbsIfRel( const ScAddress& /* rPos */ )
{
OSL_FAIL( "ScToken::CalcAbsIfRel: virtual dummy called" );
}
const ScMatrix* ScToken::GetMatrix() const
{
OSL_FAIL( "ScToken::GetMatrix: virtual dummy called" );
......@@ -747,8 +742,6 @@ ScRefList* ScToken::GetRefList()
const ScSingleRefData& ScSingleRefToken::GetSingleRef() const { return aSingleRef; }
ScSingleRefData& ScSingleRefToken::GetSingleRef() { return aSingleRef; }
void ScSingleRefToken::CalcAbsIfRel( const ScAddress& rPos )
{ aSingleRef.CalcAbsIfRel( rPos ); }
bool ScSingleRefToken::operator==( const FormulaToken& r ) const
{
return FormulaToken::operator==( r ) && aSingleRef == static_cast<const ScToken&>(r).GetSingleRef();
......@@ -770,8 +763,6 @@ const ScComplexRefData& ScDoubleRefToken::GetDoubleRef() const { return aDo
ScComplexRefData& ScDoubleRefToken::GetDoubleRef() { return aDoubleRef; }
const ScSingleRefData& ScDoubleRefToken::GetSingleRef2() const { return aDoubleRef.Ref2; }
ScSingleRefData& ScDoubleRefToken::GetSingleRef2() { return aDoubleRef.Ref2; }
void ScDoubleRefToken::CalcAbsIfRel( const ScAddress& rPos )
{ aDoubleRef.CalcAbsIfRel( rPos ); }
bool ScDoubleRefToken::operator==( const FormulaToken& r ) const
{
return FormulaToken::operator==( r ) && aDoubleRef == static_cast<const ScToken&>(r).GetDoubleRef();
......@@ -795,11 +786,6 @@ void ScDoubleRefToken::Dump() const
const ScRefList* ScRefListToken::GetRefList() const { return &aRefList; }
ScRefList* ScRefListToken::GetRefList() { return &aRefList; }
void ScRefListToken::CalcAbsIfRel( const ScAddress& rPos )
{
for (ScRefList::iterator it( aRefList.begin()); it != aRefList.end(); ++it)
(*it).CalcAbsIfRel( rPos);
}
bool ScRefListToken::operator==( const FormulaToken& r ) const
{
return FormulaToken::operator==( r ) && &aRefList == static_cast<const ScToken&>(r).GetRefList();
......@@ -860,11 +846,6 @@ ScSingleRefData& ScExternalSingleRefToken::GetSingleRef()
return maSingleRef;
}
void ScExternalSingleRefToken::CalcAbsIfRel( const ScAddress& rPos )
{
maSingleRef.CalcAbsIfRel( rPos );
}
bool ScExternalSingleRefToken::operator ==( const FormulaToken& r ) const
{
if (!FormulaToken::operator==(r))
......@@ -941,11 +922,6 @@ ScComplexRefData& ScExternalDoubleRefToken::GetDoubleRef()
return maDoubleRef;
}
void ScExternalDoubleRefToken::CalcAbsIfRel( const ScAddress& rPos )
{
maDoubleRef.CalcAbsIfRel( rPos );
}
bool ScExternalDoubleRefToken::operator ==( const FormulaToken& r ) const
{
if (!ScToken::operator==(r))
......
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