From 4c8f7c0977c30258e6542d0ea070e060958abeb6 Mon Sep 17 00:00:00 2001 From: Kohei Yoshida Date: Tue, 23 Jul 2013 00:23:06 -0400 Subject: More on removing CalcRelFromAbs(). Change-Id: I6474926d9cd8f9273bae3d8179bd14ee19422357 --- sc/inc/refdata.hxx | 29 +++-------------------------- 1 file changed, 3 insertions(+), 26 deletions(-) (limited to 'sc/inc/refdata.hxx') diff --git a/sc/inc/refdata.hxx b/sc/inc/refdata.hxx index 848bbd608e07..07ea7ef382f6 100644 --- a/sc/inc/refdata.hxx +++ b/sc/inc/refdata.hxx @@ -54,10 +54,10 @@ struct SC_DLLPUBLIC ScSingleRefData /// No default ctor, because used in ScRawToken union, set InitFlags! inline void InitFlags() { mnFlagValue = 0; } ///< all FALSE /// InitAddress: InitFlags and set address - inline void InitAddress( const ScAddress& rAdr ); - inline void InitAddress( SCCOL nCol, SCROW nRow, SCTAB nTab ); + void InitAddress( const ScAddress& rAdr ); + void InitAddress( SCCOL nCol, SCROW nRow, SCTAB nTab ); /// InitAddressRel: InitFlags and set address, everything relative to rPos - inline void InitAddressRel( const ScAddress& rAdr, const ScAddress& rPos ); + void InitAddressRel( const ScAddress& rAdr, const ScAddress& rPos ); inline void SetColRel( bool bVal ) { Flags.bColRel = (bVal ? true : false ); } inline bool IsColRel() const{ return Flags.bColRel; } inline void SetRowRel( bool bVal ) { Flags.bRowRel = (bVal ? true : false ); } @@ -97,29 +97,6 @@ struct SC_DLLPUBLIC ScSingleRefData #endif }; -inline void ScSingleRefData::InitAddress( SCCOL nColP, SCROW nRowP, SCTAB nTabP ) -{ - InitFlags(); - nCol = nColP; - nRow = nRowP; - nTab = nTabP; -} - -inline void ScSingleRefData::InitAddress( const ScAddress& rAdr ) -{ - InitAddress( rAdr.Col(), rAdr.Row(), rAdr.Tab()); -} - -inline void ScSingleRefData::InitAddressRel( const ScAddress& rAdr, - const ScAddress& rPos ) -{ - InitAddress( rAdr.Col(), rAdr.Row(), rAdr.Tab()); - SetColRel( true ); - SetRowRel( true ); - SetTabRel( true ); - CalcRelFromAbs( rPos ); -} - inline bool ScSingleRefData::Valid() const { return nCol >= 0 && nCol <= MAXCOL && -- cgit