summaryrefslogtreecommitdiffstats
path: root/sw/source/core/fields
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/core/fields')
-rw-r--r--sw/source/core/fields/expfld.cxx4
-rw-r--r--sw/source/core/fields/postithelper.cxx8
-rw-r--r--sw/source/core/fields/reffld.cxx48
3 files changed, 30 insertions, 30 deletions
diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx
index 8a777c49b9ba..658bfb18e542 100644
--- a/sw/source/core/fields/expfld.cxx
+++ b/sw/source/core/fields/expfld.cxx
@@ -206,7 +206,7 @@ const SwTextNode* GetBodyTextNode( const SwDoc& rDoc, SwPosition& rPos,
else
{
pLayout->FindPageFrame()->GetContentPosition(
- pLayout->Frame().Pos(), rPos );
+ pLayout->getSwFrame().Pos(), rPos );
pTextNode = rPos.nNode.GetNode().GetTextNode();
}
}
@@ -246,7 +246,7 @@ const SwTextNode* GetBodyTextNode( const SwDoc& rDoc, SwPosition& rPos,
}
else
{
- Point aPt( pLayout->Frame().Pos() );
+ Point aPt( pLayout->getSwFrame().Pos() );
aPt.Y()++; // get out of the header
pContentFrame = pPgFrame->GetContentPos( aPt, false, true );
pTextNode = GetFirstTextNode( rDoc, rPos, pContentFrame, aPt );
diff --git a/sw/source/core/fields/postithelper.cxx b/sw/source/core/fields/postithelper.cxx
index 8da466867d28..333cb740cf9a 100644
--- a/sw/source/core/fields/postithelper.cxx
+++ b/sw/source/core/fields/postithelper.cxx
@@ -74,8 +74,8 @@ SwPostItHelper::SwLayoutStatus SwPostItHelper::getLayoutInfos(
o_rInfo.mnStartNodeIdx = 0;
o_rInfo.mnStartContent = -1;
}
- o_rInfo.mPageFrame = pPage->Frame();
- o_rInfo.mPagePrtArea = pPage->Prt();
+ o_rInfo.mPageFrame = pPage->getSwFrame();
+ o_rInfo.mPagePrtArea = pPage->getSwPrint();
o_rInfo.mPagePrtArea.Pos() += o_rInfo.mPageFrame.Pos();
o_rInfo.mnPageNumber = pPage->GetPhyPageNum();
o_rInfo.meSidebarPosition = pPage->SidebarPosition();
@@ -105,7 +105,7 @@ SwPostItHelper::SwLayoutStatus SwPostItHelper::getLayoutInfos(
long SwPostItHelper::getLayoutHeight( const SwRootFrame* pRoot )
{
- long nRet = pRoot ? pRoot->Frame().Height() : 0;
+ long nRet = pRoot ? pRoot->getSwFrame().Height() : 0;
return nRet;
}
@@ -126,7 +126,7 @@ unsigned long SwPostItHelper::getPageInfo( SwRect& rPageFrame, const SwRootFrame
if( pPage )
{
nRet = pPage->GetPhyPageNum();
- rPageFrame = pPage->Frame();
+ rPageFrame = pPage->getSwFrame();
}
return nRet;
}
diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx
index 7302396fe067..182a7097fca4 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->Frame().Top() < pFieldFrame->Frame().Top() ||
- ( pRefFrame->Frame().Top() == pFieldFrame->Frame().Top() &&
- pRefFrame->Frame().Left() < pFieldFrame->Frame().Left() );
+ bRefIsLower = pRefFrame->getSwFrame().Top() < pFieldFrame->getSwFrame().Top() ||
+ ( pRefFrame->getSwFrame().Top() == pFieldFrame->getSwFrame().Top() &&
+ pRefFrame->getSwFrame().Left() < pFieldFrame->getSwFrame().Left() );
else
- bRefIsLower = pRefFrame->Frame().Top() < pFieldFrame->Frame().Top() ||
- ( pRefFrame->Frame().Top() == pFieldFrame->Frame().Top() &&
- pRefFrame->Frame().Left() > pFieldFrame->Frame().Left() );
+ bRefIsLower = pRefFrame->getSwFrame().Top() < pFieldFrame->getSwFrame().Top() ||
+ ( pRefFrame->getSwFrame().Top() == pFieldFrame->getSwFrame().Top() &&
+ pRefFrame->getSwFrame().Left() > pFieldFrame->getSwFrame().Left() );
}
else if( bR2L )
- bRefIsLower = pRefFrame->Frame().Left() > pFieldFrame->Frame().Left() ||
- ( pRefFrame->Frame().Left() == pFieldFrame->Frame().Left() &&
- pRefFrame->Frame().Top() < pFieldFrame->Frame().Top() );
+ bRefIsLower = pRefFrame->getSwFrame().Left() > pFieldFrame->getSwFrame().Left() ||
+ ( pRefFrame->getSwFrame().Left() == pFieldFrame->getSwFrame().Left() &&
+ pRefFrame->getSwFrame().Top() < pFieldFrame->getSwFrame().Top() );
else
- bRefIsLower = pRefFrame->Frame().Left() < pFieldFrame->Frame().Left() ||
- ( pRefFrame->Frame().Left() == pFieldFrame->Frame().Left() &&
- pRefFrame->Frame().Top() < pFieldFrame->Frame().Top() );
+ bRefIsLower = pRefFrame->getSwFrame().Left() < pFieldFrame->getSwFrame().Left() ||
+ ( pRefFrame->getSwFrame().Left() == pFieldFrame->getSwFrame().Left() &&
+ pRefFrame->getSwFrame().Top() < pFieldFrame->getSwFrame().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->Frame().Left() < pFieldFrame->Frame().Left() ||
- ( pRefFrame->Frame().Left() == pFieldFrame->Frame().Left() &&
- pRefFrame->Frame().Top() < pFieldFrame->Frame().Top() );
+ bRefIsLower = pRefFrame->getSwFrame().Left() < pFieldFrame->getSwFrame().Left() ||
+ ( pRefFrame->getSwFrame().Left() == pFieldFrame->getSwFrame().Left() &&
+ pRefFrame->getSwFrame().Top() < pFieldFrame->getSwFrame().Top() );
else
- bRefIsLower = pRefFrame->Frame().Left() > pFieldFrame->Frame().Left() ||
- ( pRefFrame->Frame().Left() == pFieldFrame->Frame().Left() &&
- pRefFrame->Frame().Top() < pFieldFrame->Frame().Top() );
+ bRefIsLower = pRefFrame->getSwFrame().Left() > pFieldFrame->getSwFrame().Left() ||
+ ( pRefFrame->getSwFrame().Left() == pFieldFrame->getSwFrame().Left() &&
+ pRefFrame->getSwFrame().Top() < pFieldFrame->getSwFrame().Top() );
}
else if( bR2L )
- bRefIsLower = pRefFrame->Frame().Top() < pFieldFrame->Frame().Top() ||
- ( pRefFrame->Frame().Top() == pFieldFrame->Frame().Top() &&
- pRefFrame->Frame().Left() > pFieldFrame->Frame().Left() );
+ bRefIsLower = pRefFrame->getSwFrame().Top() < pFieldFrame->getSwFrame().Top() ||
+ ( pRefFrame->getSwFrame().Top() == pFieldFrame->getSwFrame().Top() &&
+ pRefFrame->getSwFrame().Left() > pFieldFrame->getSwFrame().Left() );
else
- bRefIsLower = pRefFrame->Frame().Top() < pFieldFrame->Frame().Top() ||
- ( pRefFrame->Frame().Top() == pFieldFrame->Frame().Top() &&
- pRefFrame->Frame().Left() < pFieldFrame->Frame().Left() );
+ bRefIsLower = pRefFrame->getSwFrame().Top() < pFieldFrame->getSwFrame().Top() ||
+ ( pRefFrame->getSwFrame().Top() == pFieldFrame->getSwFrame().Top() &&
+ pRefFrame->getSwFrame().Left() < pFieldFrame->getSwFrame().Left() );
}
return bRefIsLower;
}
generated by cgit (git 2.34.1) at 2024-06-07 09:59:58 +0000