strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

reduce duplicate code to one template

Browse source
This commit is contained in:
Takeshi Abe 2011-09-20 03:17:10 +09:00
parent 2defcfa33e
commit 0aa547c18d
2 changed files with 42 additions and 93 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
sw/inc/pam.hxx
View file

@ -94,14 +94,51 @@ enum SwComparePosition {
POS_COLLIDE_START, // Pos1 start touches at Pos2 end.
POS_COLLIDE_END // Pos1 end touches at Pos2 start.
};
SwComparePosition ComparePosition(
const SwPosition& rStt1, const SwPosition& rEnd1,
const SwPosition& rStt2, const SwPosition& rEnd2 );
template<typename T>
SwComparePosition ComparePosition(
const unsigned long nStt1, const unsigned long nEnd1,
const unsigned long nStt2, const unsigned long nEnd2 );
const T& rStt1, const T& rEnd1,
const T& rStt2, const T& rEnd2 )
{
SwComparePosition nRet;
if( rStt1 < rStt2 )
{
if( rEnd1 > rStt2 )
{
if( rEnd1 >= rEnd2 )
nRet = POS_OUTSIDE;
else
nRet = POS_OVERLAP_BEFORE;
}
else if( rEnd1 == rStt2 )
nRet = POS_COLLIDE_END;
else
nRet = POS_BEFORE;
}
else if( rEnd2 > rStt1 )
{
if( rEnd2 >= rEnd1 )
{
if( rEnd2 == rEnd1 && rStt2 == rStt1 )
nRet = POS_EQUAL;
else
nRet = POS_INSIDE;
}
else
{
if (rStt1 == rStt2)
nRet = POS_OUTSIDE;
else
nRet = POS_OVERLAP_BEHIND;
}
}
else if( rEnd2 == rStt1 )
nRet = POS_COLLIDE_START;
else
nRet = POS_BEHIND;
return nRet;
}
// SwPointAndMark / SwPaM
struct SwMoveFnCollection;

88
sw/source/core/crsr/pam.cxx
View file

@ -165,94 +165,6 @@ SwDoc * SwPosition::GetDoc() const
return nNode.GetNode().GetDoc();
}
SwComparePosition ComparePosition(
const SwPosition& rStt1, const SwPosition& rEnd1,
const SwPosition& rStt2, const SwPosition& rEnd2 )
{
SwComparePosition nRet;
if( rStt1 < rStt2 )
{
if( rEnd1 > rStt2 )
{
if( rEnd1 >= rEnd2 )
nRet = POS_OUTSIDE;
else
nRet = POS_OVERLAP_BEFORE;
}
else if( rEnd1 == rStt2 )
nRet = POS_COLLIDE_END;
else
nRet = POS_BEFORE;
}
else if( rEnd2 > rStt1 )
{
if( rEnd2 >= rEnd1 )
{
if( rEnd2 == rEnd1 && rStt2 == rStt1 )
nRet = POS_EQUAL;
else
nRet = POS_INSIDE;
}
else
{
if (rStt1 == rStt2)
nRet = POS_OUTSIDE;
else
nRet = POS_OVERLAP_BEHIND;
}
}
else if( rEnd2 == rStt1 )
nRet = POS_COLLIDE_START;
else
nRet = POS_BEHIND;
return nRet;
}
SwComparePosition ComparePosition(
const unsigned long nStt1, const unsigned long nEnd1,
const unsigned long nStt2, const unsigned long nEnd2 )
{
SwComparePosition nRet;
if( nStt1 < nStt2 )
{
if( nEnd1 > nStt2 )
{
if( nEnd1 >= nEnd2 )
nRet = POS_OUTSIDE;
else
nRet = POS_OVERLAP_BEFORE;
}
else if( nEnd1 == nStt2 )
nRet = POS_COLLIDE_END;
else
nRet = POS_BEFORE;
}
else if( nEnd2 > nStt1 )
{
if( nEnd2 >= nEnd1 )
{
if( nEnd2 == nEnd1 && nStt2 == nStt1 )
nRet = POS_EQUAL;
else
nRet = POS_INSIDE;
}
else
{
if (nStt1 == nStt2)
nRet = POS_OUTSIDE;
else
nRet = POS_OVERLAP_BEHIND;
}
}
else if( nEnd2 == nStt1 )
nRet = POS_COLLIDE_START;
else
nRet = POS_BEHIND;
return nRet;
}
enum CHKSECTION { Chk_Both, Chk_One, Chk_None };