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

Make these non-inline.

Change-Id: I99cf45edfe584f69fb6465de84cdcff5842e37a6
üst 7409a57d
...@@ -78,9 +78,9 @@ struct SC_DLLPUBLIC ScSingleRefData ...@@ -78,9 +78,9 @@ struct SC_DLLPUBLIC ScSingleRefData
inline void SetRelName( bool bVal ) { Flags.bRelName = (bVal ? true : false ); } inline void SetRelName( bool bVal ) { Flags.bRelName = (bVal ? true : false ); }
inline bool IsRelName() const { return Flags.bRelName; } inline bool IsRelName() const { return Flags.bRelName; }
inline bool Valid() const; bool Valid() const;
/// In external references nTab is -1 /// In external references nTab is -1
inline bool ValidExternal() const; bool ValidExternal() const;
ScAddress toAbs( const ScAddress& rPos ) const; ScAddress toAbs( const ScAddress& rPos ) const;
void SetAddress( const ScAddress& rAddr, const ScAddress& rPos ); void SetAddress( const ScAddress& rAddr, const ScAddress& rPos );
...@@ -96,20 +96,6 @@ struct SC_DLLPUBLIC ScSingleRefData ...@@ -96,20 +96,6 @@ struct SC_DLLPUBLIC ScSingleRefData
#endif #endif
}; };
inline bool ScSingleRefData::Valid() const
{
return nCol >= 0 && nCol <= MAXCOL &&
nRow >= 0 && nRow <= MAXROW &&
nTab >= 0 && nTab <= MAXTAB;
}
inline bool ScSingleRefData::ValidExternal() const
{
return nCol >= 0 && nCol <= MAXCOL &&
nRow >= 0 && nRow <= MAXROW &&
nTab == -1;
}
/// Complex reference (a range) into the sheet /// Complex reference (a range) into the sheet
struct ScComplexRefData struct ScComplexRefData
{ {
...@@ -134,13 +120,13 @@ struct ScComplexRefData ...@@ -134,13 +120,13 @@ struct ScComplexRefData
Ref1.InitAddress( nCol1, nRow1, nTab1 ); Ref1.InitAddress( nCol1, nRow1, nTab1 );
Ref2.InitAddress( nCol2, nRow2, nTab2 ); Ref2.InitAddress( nCol2, nRow2, nTab2 );
} }
inline bool IsDeleted() const
{ return Ref1.IsDeleted() || Ref2.IsDeleted(); } bool IsDeleted() const;
inline bool Valid() const bool Valid() const;
{ return Ref1.Valid() && Ref2.Valid(); }
/** In external references nTab is -1 for the start tab and -1 for the end /** In external references nTab is -1 for the start tab and -1 for the end
tab if one sheet, or >=0 if more than one sheets. */ tab if one sheet, or >=0 if more than one sheets. */
inline bool ValidExternal() const; bool ValidExternal() const;
SC_DLLPUBLIC ScRange toAbs( const ScAddress& rPos ) const; SC_DLLPUBLIC ScRange toAbs( const ScAddress& rPos ) const;
void SetRange( const ScRange& rRange, const ScAddress& rPos ); void SetRange( const ScRange& rRange, const ScAddress& rPos );
...@@ -160,14 +146,6 @@ struct ScComplexRefData ...@@ -160,14 +146,6 @@ struct ScComplexRefData
#endif #endif
}; };
inline bool ScComplexRefData::ValidExternal() const
{
return Ref1.ValidExternal() &&
Ref2.nCol >= 0 && Ref2.nCol <= MAXCOL &&
Ref2.nRow >= 0 && Ref2.nRow <= MAXROW &&
Ref2.nTab >= Ref1.nTab;
}
#endif #endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -75,6 +75,20 @@ bool ScSingleRefData::IsDeleted() const ...@@ -75,6 +75,20 @@ bool ScSingleRefData::IsDeleted() const
return IsColDeleted() || IsRowDeleted() || IsTabDeleted(); return IsColDeleted() || IsRowDeleted() || IsTabDeleted();
} }
bool ScSingleRefData::Valid() const
{
return nCol >= 0 && nCol <= MAXCOL &&
nRow >= 0 && nRow <= MAXROW &&
nTab >= 0 && nTab <= MAXTAB;
}
bool ScSingleRefData::ValidExternal() const
{
return nCol >= 0 && nCol <= MAXCOL &&
nRow >= 0 && nRow <= MAXROW &&
nTab == -1;
}
ScAddress ScSingleRefData::toAbs( const ScAddress& rPos ) const ScAddress ScSingleRefData::toAbs( const ScAddress& rPos ) const
{ {
SCCOL nRetCol = Flags.bColRel ? nRelCol + rPos.Col() : nCol; SCCOL nRetCol = Flags.bColRel ? nRelCol + rPos.Col() : nCol;
...@@ -292,6 +306,24 @@ ScComplexRefData& ScComplexRefData::Extend( const ScComplexRefData & rRef, const ...@@ -292,6 +306,24 @@ ScComplexRefData& ScComplexRefData::Extend( const ScComplexRefData & rRef, const
return Extend( rRef.Ref1, rPos).Extend( rRef.Ref2, rPos); return Extend( rRef.Ref1, rPos).Extend( rRef.Ref2, rPos);
} }
bool ScComplexRefData::IsDeleted() const
{
return Ref1.IsDeleted() || Ref2.IsDeleted();
}
bool ScComplexRefData::Valid() const
{
return Ref1.Valid() && Ref2.Valid();
}
bool ScComplexRefData::ValidExternal() const
{
return Ref1.ValidExternal() &&
Ref2.nCol >= 0 && Ref2.nCol <= MAXCOL &&
Ref2.nRow >= 0 && Ref2.nRow <= MAXROW &&
Ref2.nTab >= Ref1.nTab;
}
ScRange ScComplexRefData::toAbs( const ScAddress& rPos ) const ScRange ScComplexRefData::toAbs( const ScAddress& rPos ) const
{ {
return ScRange(Ref1.toAbs(rPos), Ref2.toAbs(rPos)); return ScRange(Ref1.toAbs(rPos), Ref2.toAbs(rPos));
......
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