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/text/txttab.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/text/txttab.cxx')
| -rw-r--r-- | sw/source/core/text/txttab.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sw/source/core/text/txttab.cxx b/sw/source/core/text/txttab.cxx index e2dd2a7c4a0d..908ef295314f 100644 --- a/sw/source/core/text/txttab.cxx +++ b/sw/source/core/text/txttab.cxx @@ -78,9 +78,9 @@ SwTabPortion *SwTextFormatter::NewTabPortion( SwTextFormatInfo &rInf, bool bAuto const bool bTabsRelativeToIndent = m_pFrame->GetTextNode()->getIDocumentSettingAccess()->get(DocumentSettingId::TABS_RELATIVE_TO_INDENT); const SwTwips nTabLeft = bRTL - ? m_pFrame->getSwFrame().Right() - + ? m_pFrame->getFrameArea().Right() - ( bTabsRelativeToIndent ? GetTabLeft() : 0 ) - : m_pFrame->getSwFrame().Left() + + : m_pFrame->getFrameArea().Left() + ( bTabsRelativeToIndent ? GetTabLeft() : 0 ); // The absolute position, where we started the line formatting @@ -112,7 +112,7 @@ SwTabPortion *SwTextFormatter::NewTabPortion( SwTextFormatInfo &rInf, bool bAuto if ( m_pFrame->IsVertical() ) { - Point aRightTop( nMyRight, m_pFrame->getSwFrame().Top() ); + Point aRightTop( nMyRight, m_pFrame->getFrameArea().Top() ); m_pFrame->SwitchHorizontalToVertical( aRightTop ); nMyRight = aRightTop.Y(); } @@ -195,11 +195,11 @@ SwTabPortion *SwTextFormatter::NewTabPortion( SwTextFormatInfo &rInf, bool bAuto { Point aPoint( Left(), 0 ); m_pFrame->SwitchLTRtoRTL( aPoint ); - nLeftMarginTabPos = m_pFrame->getSwFrame().Right() - aPoint.X(); + nLeftMarginTabPos = m_pFrame->getFrameArea().Right() - aPoint.X(); } else { - nLeftMarginTabPos = Left() - m_pFrame->getSwFrame().Left(); + nLeftMarginTabPos = Left() - m_pFrame->getFrameArea().Left(); } } if( m_pCurr->HasForcedLeftMargin() ) @@ -393,7 +393,7 @@ bool SwTabPortion::PreFormat( SwTextFormatInfo &rInf ) bool bAtParaEnd = rInf.GetIdx() + GetLen() == rInf.GetText().getLength(); if ( bFull && bTabCompat && ( ( bTabOverflow && ( rInf.IsTabOverflow() || !bAutoTabStop ) ) || bAtParaEnd ) && - GetTabPos() >= rInf.GetTextFrame()->getSwFrame().Width() ) + GetTabPos() >= rInf.GetTextFrame()->getFrameArea().Width() ) { bFull = false; if ( bTabOverflow && !bAutoTabStop ) |