summaryrefslogtreecommitdiff
path: root/sw/source/core/text/txttab.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/core/text/txttab.cxx')
-rw-r--r--sw/source/core/text/txttab.cxx44
1 files changed, 22 insertions, 22 deletions
diff --git a/sw/source/core/text/txttab.cxx b/sw/source/core/text/txttab.cxx
index ba9e12742804..d4aace514393 100644
--- a/sw/source/core/text/txttab.cxx
+++ b/sw/source/core/text/txttab.cxx
@@ -70,17 +70,17 @@ SwTabPortion *SwTextFormatter::NewTabPortion( SwTextFormatInfo &rInf, bool bAuto
sal_uInt16 nNewTabPos;
bool bAutoTabStop = true;
{
- const bool bRTL = m_pFrm->IsRightToLeft();
+ const bool bRTL = m_pFrame->IsRightToLeft();
// #i24363# tab stops relative to indent
// nTabLeft: The absolute value, the tab stops are relative to: Tabs origin.
// #i91133#
const bool bTabsRelativeToIndent =
- m_pFrm->GetTextNode()->getIDocumentSettingAccess()->get(DocumentSettingId::TABS_RELATIVE_TO_INDENT);
+ m_pFrame->GetTextNode()->getIDocumentSettingAccess()->get(DocumentSettingId::TABS_RELATIVE_TO_INDENT);
const SwTwips nTabLeft = bRTL
- ? m_pFrm->Frm().Right() -
+ ? m_pFrame->Frame().Right() -
( bTabsRelativeToIndent ? GetTabLeft() : 0 )
- : m_pFrm->Frm().Left() +
+ : m_pFrame->Frame().Left() +
( bTabsRelativeToIndent ? GetTabLeft() : 0 );
// The absolute position, where we started the line formatting
@@ -88,7 +88,7 @@ SwTabPortion *SwTextFormatter::NewTabPortion( SwTextFormatInfo &rInf, bool bAuto
if ( bRTL )
{
Point aPoint( nLinePos, 0 );
- m_pFrm->SwitchLTRtoRTL( aPoint );
+ m_pFrame->SwitchLTRtoRTL( aPoint );
nLinePos = aPoint.X();
}
@@ -105,15 +105,15 @@ SwTabPortion *SwTextFormatter::NewTabPortion( SwTextFormatInfo &rInf, bool bAuto
nLinePos + nTabPos;
SwTwips nMyRight;
- if ( m_pFrm->IsVertLR() )
+ if ( m_pFrame->IsVertLR() )
nMyRight = Left();
else
nMyRight = Right();
- if ( m_pFrm->IsVertical() )
+ if ( m_pFrame->IsVertical() )
{
- Point aRightTop( nMyRight, m_pFrm->Frm().Top() );
- m_pFrm->SwitchHorizontalToVertical( aRightTop );
+ Point aRightTop( nMyRight, m_pFrame->Frame().Top() );
+ m_pFrame->SwitchHorizontalToVertical( aRightTop );
nMyRight = aRightTop.Y();
}
@@ -149,7 +149,7 @@ SwTabPortion *SwTextFormatter::NewTabPortion( SwTextFormatInfo &rInf, bool bAuto
if( USHRT_MAX == nDefTabDist )
{
const SvxTabStopItem& rTab =
- static_cast<const SvxTabStopItem &>(m_pFrm->GetAttrSet()->
+ static_cast<const SvxTabStopItem &>(m_pFrame->GetAttrSet()->
GetPool()->GetDefaultItem( RES_PARATR_TABSTOP ));
if( rTab.Count() )
nDefTabDist = (sal_uInt16)rTab[0].GetTabPos();
@@ -169,7 +169,7 @@ SwTabPortion *SwTextFormatter::NewTabPortion( SwTextFormatInfo &rInf, bool bAuto
: ( ( nCount + 1 ) * nDefTabDist );
// --> FME 2004-09-21 #117919 Minimum tab stop width is 1 or 51 twips:
- const SwTwips nMinimumTabWidth = m_pFrm->GetTextNode()->getIDocumentSettingAccess()->get(DocumentSettingId::TAB_COMPAT) ? 0 : 50;
+ const SwTwips nMinimumTabWidth = m_pFrame->GetTextNode()->getIDocumentSettingAccess()->get(DocumentSettingId::TAB_COMPAT) ? 0 : 50;
if( ( bRTL && nTabLeft - nNextPos >= nCurrentAbsPos - nMinimumTabWidth ) ||
( !bRTL && nNextPos + nTabLeft <= nCurrentAbsPos + nMinimumTabWidth ) )
{
@@ -194,12 +194,12 @@ SwTabPortion *SwTextFormatter::NewTabPortion( SwTextFormatInfo &rInf, bool bAuto
if ( bRTL )
{
Point aPoint( Left(), 0 );
- m_pFrm->SwitchLTRtoRTL( aPoint );
- nLeftMarginTabPos = m_pFrm->Frm().Right() - aPoint.X();
+ m_pFrame->SwitchLTRtoRTL( aPoint );
+ nLeftMarginTabPos = m_pFrame->Frame().Right() - aPoint.X();
}
else
{
- nLeftMarginTabPos = Left() - m_pFrm->Frm().Left();
+ nLeftMarginTabPos = Left() - m_pFrame->Frame().Left();
}
}
if( m_pCurr->HasForcedLeftMargin() )
@@ -230,7 +230,7 @@ SwTabPortion *SwTextFormatter::NewTabPortion( SwTextFormatInfo &rInf, bool bAuto
!pTabStop ||
nNextPos != m_aLineInf.GetListTabStopPosition() ) ||
// compatibility option TAB_AT_LEFT_INDENT_FOR_PARA_IN_LIST:
- m_pFrm->GetTextNode()->getIDocumentSettingAccess()->
+ m_pFrame->GetTextNode()->getIDocumentSettingAccess()->
get(DocumentSettingId::TAB_AT_LEFT_INDENT_FOR_PARA_IN_LIST);
if ( bTabAtLeftMarginAllowed )
{
@@ -323,8 +323,8 @@ bool SwTabPortion::PreFormat( SwTextFormatInfo &rInf )
// Here we settle down ...
Fix( static_cast<sal_uInt16>(rInf.X()) );
- const bool bTabCompat = rInf.GetTextFrm()->GetTextNode()->getIDocumentSettingAccess()->get(DocumentSettingId::TAB_COMPAT);
- const bool bTabOverflow = rInf.GetTextFrm()->GetTextNode()->getIDocumentSettingAccess()->get(DocumentSettingId::TAB_OVERFLOW);
+ const bool bTabCompat = rInf.GetTextFrame()->GetTextNode()->getIDocumentSettingAccess()->get(DocumentSettingId::TAB_COMPAT);
+ const bool bTabOverflow = rInf.GetTextFrame()->GetTextNode()->getIDocumentSettingAccess()->get(DocumentSettingId::TAB_OVERFLOW);
// The minimal width of a tab is one blank at least.
// #i37686# In compatibility mode, the minimum width
@@ -357,7 +357,7 @@ bool SwTabPortion::PreFormat( SwTextFormatInfo &rInf )
( rInf.Width() <= rInf.X() + PrtWidth() && rInf.X() <= rInf.Width() ) ;
// #95477# Rotated tab stops get the width of one blank
- const sal_uInt16 nDir = rInf.GetFont()->GetOrientation( rInf.GetTextFrm()->IsVertical() );
+ const sal_uInt16 nDir = rInf.GetFont()->GetOrientation( rInf.GetTextFrame()->IsVertical() );
if( ! bFull && 0 == nDir )
{
@@ -385,7 +385,7 @@ bool SwTabPortion::PreFormat( SwTextFormatInfo &rInf )
bool bAtParaEnd = rInf.GetIdx() + GetLen() == rInf.GetText().getLength();
if ( bFull && bTabCompat &&
( ( bTabOverflow && ( rInf.IsTabOverflow() || !IsAutoTabStop() ) ) || bAtParaEnd ) &&
- GetTabPos() >= rInf.GetTextFrm()->Frm().Width() )
+ GetTabPos() >= rInf.GetTextFrame()->Frame().Width() )
{
bFull = false;
if ( bTabOverflow && !IsAutoTabStop() )
@@ -422,7 +422,7 @@ bool SwTabPortion::PreFormat( SwTextFormatInfo &rInf )
else
{
// A trick with impact: The new Tabportions now behave like
- // FlyFrms, located in the line - including adjustment !
+ // FlyFrames, located in the line - including adjustment !
SetFixWidth( PrtWidth() );
return false;
}
@@ -430,7 +430,7 @@ bool SwTabPortion::PreFormat( SwTextFormatInfo &rInf )
bool SwTabPortion::PostFormat( SwTextFormatInfo &rInf )
{
- const bool bTabOverMargin = rInf.GetTextFrm()->GetTextNode()->getIDocumentSettingAccess()->get(DocumentSettingId::TAB_OVER_MARGIN);
+ const bool bTabOverMargin = rInf.GetTextFrame()->GetTextNode()->getIDocumentSettingAccess()->get(DocumentSettingId::TAB_OVER_MARGIN);
// If the tab position is larger than the right margin, it gets scaled down by default.
// However, if compat mode enabled, we allow tabs to go over the margin: the rest of the paragraph is not broken into lines.
const sal_uInt16 nRight = bTabOverMargin ? GetTabPos() : std::min(GetTabPos(), rInf.Width());
@@ -445,7 +445,7 @@ bool SwTabPortion::PostFormat( SwTextFormatInfo &rInf )
const sal_uInt16 nWhich = GetWhichPor();
OSL_ENSURE( POR_TABLEFT != nWhich, "SwTabPortion::PostFormat: already formatted" );
- const bool bTabCompat = rInf.GetTextFrm()->GetTextNode()->getIDocumentSettingAccess()->get(DocumentSettingId::TAB_COMPAT);
+ const bool bTabCompat = rInf.GetTextFrame()->GetTextNode()->getIDocumentSettingAccess()->get(DocumentSettingId::TAB_COMPAT);
// #127428# Abandon dec. tab position if line is full
if ( bTabCompat && POR_TABDECIMAL == nWhich )
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-19 18:16:28 +0000