diff options
author | Miklos Vajna <vmiklos@collabora.com> | 2020-03-09 22:11:35 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.com> | 2020-03-10 09:28:24 +0100 |
commit | 74f0105a2c140d078932576b457a327f3d2490a6 (patch) | |
tree | 14e56268421c93e160189b28a438d00f29211338 /sw/source | |
parent | edf13fe1247e7ef411a9ff5435385573fad01f56 (diff) |
tdf#128880 sw btlr: fix SwFrame::GetPaintArea() for the row span case
To be specific, this focuses on the case where a single cell has btlr
direction, but the containing row does not, and there is a row span.
The old code that took the logical right of the cell frame served two
purposes, it seems to me:
- in the rare case where the 1st row is wider then a subsequent row, we
make sure that as the cell frame is expanded downwards, we're still
inside the table polygon
- in the tb-rl ("Japanese") case, the logical right maps to physical
bottom, and this way the cell frame is OK to render not only into its
own row frame, but can expand also downwards.
Given that btlr maps left to bottom, this mechanism is broken there. Be
consistent with the working tbrl case, so just expand towards the
logical left in the btlr case.
The rest of the changes just make sure that SwAttrHandler::FontChg()
calls SwFont::SetVertical() with the correct bVertLayoutLRBT parameter,
which instantly fixes the actual position of the text.
Change-Id: I9032e7c6de72cec704843f3aae3c7848e139ebfa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90241
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'sw/source')
-rw-r--r-- | sw/source/core/layout/ssfrm.cxx | 14 | ||||
-rw-r--r-- | sw/source/core/text/atrhndl.hxx | 3 | ||||
-rw-r--r-- | sw/source/core/text/atrstck.cxx | 6 | ||||
-rw-r--r-- | sw/source/core/text/redlnitr.cxx | 9 |
4 files changed, 24 insertions, 8 deletions
diff --git a/sw/source/core/layout/ssfrm.cxx b/sw/source/core/layout/ssfrm.cxx index 1de1f32aa394..1a92144a5583 100644 --- a/sw/source/core/layout/ssfrm.cxx +++ b/sw/source/core/layout/ssfrm.cxx @@ -607,7 +607,19 @@ SwRect SwFrame::GetPaintArea() const if( pTmp->IsVertical() ) nTmpLeft = (pNxt->getFrameArea().*fnRect->fnGetLeft)(); else - nTmpRight = (pNxt->getFrameArea().*fnRect->fnGetRight)(); + { + // pTmp is a row frame, but it's not vertical. + if (IsVertLRBT()) + { + // This frame cell is OK to expand towards the physical down direction. + // Physical down is left. + nTmpLeft = (pNxt->getFrameArea().*fnRect->fnGetLeft)(); + } + else + { + nTmpRight = (pNxt->getFrameArea().*fnRect->fnGetRight)(); + } + } } OSL_ENSURE( pTmp, "GetPaintArea lost in time and space" ); if( pTmp->IsPageFrame() || pTmp->IsFlyFrame() || diff --git a/sw/source/core/text/atrhndl.hxx b/sw/source/core/text/atrhndl.hxx index 8abb678ea9fd..e391b0825886 100644 --- a/sw/source/core/text/atrhndl.hxx +++ b/sw/source/core/text/atrhndl.hxx @@ -50,6 +50,7 @@ private: std::unique_ptr<SwFont> m_pFnt; bool m_bVertLayout; + bool m_bVertLayoutLRBT; const SwTextAttr* GetTop(sal_uInt16 nStack); void RemoveFromStack(sal_uInt16 nWhich, const SwTextAttr& rAttr); @@ -76,7 +77,7 @@ public: void Init( const SfxPoolItem** pPoolItem, const SwAttrSet* pAttrSet, const IDocumentSettingAccess& rIDocumentSettingAccess, const SwViewShell* pShell, SwFont& rFnt, - bool bVertLayout ); + bool bVertLayout, bool bVertLayoutLRBT ); bool IsVertLayout() const { return m_bVertLayout; } diff --git a/sw/source/core/text/atrstck.cxx b/sw/source/core/text/atrstck.cxx index 79740aa73c42..2169657f8ed5 100644 --- a/sw/source/core/text/atrstck.cxx +++ b/sw/source/core/text/atrstck.cxx @@ -266,6 +266,7 @@ SwAttrHandler::SwAttrHandler() : m_pIDocumentSettingAccess(nullptr) , m_pShell(nullptr) , m_bVertLayout(false) + , m_bVertLayoutLRBT(false) { memset( m_pDefaultArray, 0, NUM_DEFAULT_VALUES * sizeof(SfxPoolItem*) ); } @@ -287,7 +288,7 @@ void SwAttrHandler::Init( const SwAttrSet& rAttrSet, void SwAttrHandler::Init( const SfxPoolItem** pPoolItem, const SwAttrSet* pAS, const IDocumentSettingAccess& rIDocumentSettingAcces, const SwViewShell* pSh, - SwFont& rFnt, bool bVL ) + SwFont& rFnt, bool bVL, bool bVertLayoutLRBT ) { // initialize default array memcpy( m_pDefaultArray, pPoolItem, @@ -298,6 +299,7 @@ void SwAttrHandler::Init( const SfxPoolItem** pPoolItem, const SwAttrSet* pAS, // do we have to apply additional paragraph attributes? m_bVertLayout = bVL; + m_bVertLayoutLRBT = bVertLayoutLRBT; if ( pAS && pAS->Count() ) { @@ -760,7 +762,7 @@ void SwAttrHandler::FontChg(const SfxPoolItem& rItem, SwFont& rFnt, bool bPush ) if ( !bTwoLineAct ) rFnt.SetVertical( static_cast<const SvxCharRotateItem&>(rItem).GetValue(), - m_bVertLayout ); + m_bVertLayout, m_bVertLayoutLRBT ); break; } diff --git a/sw/source/core/text/redlnitr.cxx b/sw/source/core/text/redlnitr.cxx index 6d3881533ac0..53f614d84b68 100644 --- a/sw/source/core/text/redlnitr.cxx +++ b/sw/source/core/text/redlnitr.cxx @@ -327,11 +327,11 @@ void SwAttrIter::InitFontAndAttrHandler( // set font to vertical if frame layout is vertical // if it's a re-init, the vert flag never changes + bool bVertLayoutLRBT = false; + if (pbVertLayoutLRBT) + bVertLayoutLRBT = *pbVertLayoutLRBT; if (pbVertLayout ? *pbVertLayout : m_aAttrHandler.IsVertLayout()) { - bool bVertLayoutLRBT = false; - if (pbVertLayoutLRBT) - bVertLayoutLRBT = *pbVertLayoutLRBT; m_pFont->SetVertical(m_pFont->GetOrientation(), true, bVertLayoutLRBT); } @@ -342,7 +342,8 @@ void SwAttrIter::InitFontAndAttrHandler( // them to the font m_aAttrHandler.Init(aFontAccess.Get()->GetDefault(), rTextNode.GetpSwAttrSet(), *rTextNode.getIDocumentSettingAccess(), m_pViewShell, *m_pFont, - pbVertLayout ? *pbVertLayout : m_aAttrHandler.IsVertLayout() ); + pbVertLayout ? *pbVertLayout : m_aAttrHandler.IsVertLayout(), + bVertLayoutLRBT ); m_aFontCacheIds[SwFontScript::Latin] = m_aFontCacheIds[SwFontScript::CJK] = m_aFontCacheIds[SwFontScript::CTL] = nullptr; |