diff options
| author | Armin Le Grand <Armin.Le.Grand@cib.de> | 2017-10-30 21:30:32 +0100 |
|---|---|---|
| committer | Armin Le Grand <Armin.Le.Grand@cib.de> | 2017-10-31 10:41:43 +0100 |
| commit | f55a9b77b8bfe6fc5e0fbceb0c89aed66660e107 (patch) | |
| tree | 4ab09c0b426c702fccbded3eb58848d2e0622015 /sw/source/core/fields/reffld.cxx | |
| parent | 420452e56c2f18b85e6a59dbba80c06d96e28abd (diff) | |
RotateFlyFrame2: Unified FrameAreaDefinition
Isolated all Frame AreaDefinition and it's layout flags to
SwFrameAreaDefinition class which is now base for SwFrame.
Adapted calls to get/set and WriteAccess hekper classes accordingly.
This allows much deeper understanding what Writer is doing when
layouting it's frames and needed when reaction on such changes
is necessary
Change-Id: I96220a1d140e69c76cc63023aae26e4ed17f3504
Diffstat (limited to 'sw/source/core/fields/reffld.cxx')
| -rw-r--r-- | sw/source/core/fields/reffld.cxx | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx index 182a7097fca4..efb7c0fe9c3d 100644 --- a/sw/source/core/fields/reffld.cxx +++ b/sw/source/core/fields/reffld.cxx @@ -146,22 +146,22 @@ bool IsFrameBehind( const SwTextNode& rMyNd, sal_Int32 nMySttPos, if( bVert ) { if( bR2L ) - bRefIsLower = pRefFrame->getSwFrame().Top() < pFieldFrame->getSwFrame().Top() || - ( pRefFrame->getSwFrame().Top() == pFieldFrame->getSwFrame().Top() && - pRefFrame->getSwFrame().Left() < pFieldFrame->getSwFrame().Left() ); + bRefIsLower = pRefFrame->getFrameArea().Top() < pFieldFrame->getFrameArea().Top() || + ( pRefFrame->getFrameArea().Top() == pFieldFrame->getFrameArea().Top() && + pRefFrame->getFrameArea().Left() < pFieldFrame->getFrameArea().Left() ); else - bRefIsLower = pRefFrame->getSwFrame().Top() < pFieldFrame->getSwFrame().Top() || - ( pRefFrame->getSwFrame().Top() == pFieldFrame->getSwFrame().Top() && - pRefFrame->getSwFrame().Left() > pFieldFrame->getSwFrame().Left() ); + bRefIsLower = pRefFrame->getFrameArea().Top() < pFieldFrame->getFrameArea().Top() || + ( pRefFrame->getFrameArea().Top() == pFieldFrame->getFrameArea().Top() && + pRefFrame->getFrameArea().Left() > pFieldFrame->getFrameArea().Left() ); } else if( bR2L ) - bRefIsLower = pRefFrame->getSwFrame().Left() > pFieldFrame->getSwFrame().Left() || - ( pRefFrame->getSwFrame().Left() == pFieldFrame->getSwFrame().Left() && - pRefFrame->getSwFrame().Top() < pFieldFrame->getSwFrame().Top() ); + bRefIsLower = pRefFrame->getFrameArea().Left() > pFieldFrame->getFrameArea().Left() || + ( pRefFrame->getFrameArea().Left() == pFieldFrame->getFrameArea().Left() && + pRefFrame->getFrameArea().Top() < pFieldFrame->getFrameArea().Top() ); else - bRefIsLower = pRefFrame->getSwFrame().Left() < pFieldFrame->getSwFrame().Left() || - ( pRefFrame->getSwFrame().Left() == pFieldFrame->getSwFrame().Left() && - pRefFrame->getSwFrame().Top() < pFieldFrame->getSwFrame().Top() ); + bRefIsLower = pRefFrame->getFrameArea().Left() < pFieldFrame->getFrameArea().Left() || + ( pRefFrame->getFrameArea().Left() == pFieldFrame->getFrameArea().Left() && + pRefFrame->getFrameArea().Top() < pFieldFrame->getFrameArea().Top() ); pRefFrame = nullptr; } else if( ( SwFrameType::Column | SwFrameType::Cell ) & pFieldFrame->GetType() ) @@ -175,22 +175,22 @@ bool IsFrameBehind( const SwTextNode& rMyNd, sal_Int32 nMySttPos, if( bVert ) { if( bR2L ) - bRefIsLower = pRefFrame->getSwFrame().Left() < pFieldFrame->getSwFrame().Left() || - ( pRefFrame->getSwFrame().Left() == pFieldFrame->getSwFrame().Left() && - pRefFrame->getSwFrame().Top() < pFieldFrame->getSwFrame().Top() ); + bRefIsLower = pRefFrame->getFrameArea().Left() < pFieldFrame->getFrameArea().Left() || + ( pRefFrame->getFrameArea().Left() == pFieldFrame->getFrameArea().Left() && + pRefFrame->getFrameArea().Top() < pFieldFrame->getFrameArea().Top() ); else - bRefIsLower = pRefFrame->getSwFrame().Left() > pFieldFrame->getSwFrame().Left() || - ( pRefFrame->getSwFrame().Left() == pFieldFrame->getSwFrame().Left() && - pRefFrame->getSwFrame().Top() < pFieldFrame->getSwFrame().Top() ); + bRefIsLower = pRefFrame->getFrameArea().Left() > pFieldFrame->getFrameArea().Left() || + ( pRefFrame->getFrameArea().Left() == pFieldFrame->getFrameArea().Left() && + pRefFrame->getFrameArea().Top() < pFieldFrame->getFrameArea().Top() ); } else if( bR2L ) - bRefIsLower = pRefFrame->getSwFrame().Top() < pFieldFrame->getSwFrame().Top() || - ( pRefFrame->getSwFrame().Top() == pFieldFrame->getSwFrame().Top() && - pRefFrame->getSwFrame().Left() > pFieldFrame->getSwFrame().Left() ); + bRefIsLower = pRefFrame->getFrameArea().Top() < pFieldFrame->getFrameArea().Top() || + ( pRefFrame->getFrameArea().Top() == pFieldFrame->getFrameArea().Top() && + pRefFrame->getFrameArea().Left() > pFieldFrame->getFrameArea().Left() ); else - bRefIsLower = pRefFrame->getSwFrame().Top() < pFieldFrame->getSwFrame().Top() || - ( pRefFrame->getSwFrame().Top() == pFieldFrame->getSwFrame().Top() && - pRefFrame->getSwFrame().Left() < pFieldFrame->getSwFrame().Left() ); + bRefIsLower = pRefFrame->getFrameArea().Top() < pFieldFrame->getFrameArea().Top() || + ( pRefFrame->getFrameArea().Top() == pFieldFrame->getFrameArea().Top() && + pRefFrame->getFrameArea().Left() < pFieldFrame->getFrameArea().Left() ); } return bRefIsLower; } |