diff options
| author | Justin Luth <justin_luth@sil.org> | 2017-01-19 16:27:41 +0300 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-01-23 09:16:24 +0000 |
| commit | 895f4bc27d518ecaa054d812fa6c24fd4301d327 (patch) | |
| tree | 57eab5088a6d1a565740122f1970ceb5609ca5f1 /sw/source/filter/ww8/ww8par2.cxx | |
| parent | 9bd6f00dfe8f71bc9de693bdcd65377ee1e891d0 (diff) | |
tdf#96277 revert ww8 import: fix upper margin of floating table
commit 3755c87d0426a499d4755e82d8fbc77caa240764
mis-positions non-textframed floating tables.
The patch only worked under very ideal circumstances
that cannot be identified during import time. Lots of bug
reports indicate real world problems with it.
This is a pretty safe revert because the code only
processes a document one time, so old documents don't
depend on this to work.
Change-Id: I3b94d27901a20e46c2f5fd4305041d1d28acf33a
Reviewed-on: https://gerrit.libreoffice.org/33322
Reviewed-by: Justin Luth <justin_luth@sil.org>
Tested-by: Justin Luth <justin_luth@sil.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'sw/source/filter/ww8/ww8par2.cxx')
| -rw-r--r-- | sw/source/filter/ww8/ww8par2.cxx | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx index bc1c24e38785..4d20e6781628 100644 --- a/sw/source/filter/ww8/ww8par2.cxx +++ b/sw/source/filter/ww8/ww8par2.cxx @@ -191,7 +191,7 @@ public: WW8TabDesc( SwWW8ImplReader* pIoClass, WW8_CP nStartCp ); bool Ok() const { return m_bOk; } - void CreateSwTable(SvxULSpaceItem* pULSpaceItem); + void CreateSwTable(); void UseSwTable(); void SetSizePosition(SwFrameFormat* pFrameFormat); void TableCellEnd(); @@ -2340,7 +2340,7 @@ void wwSectionManager::PrependedInlineNode(const SwPosition &rPos, maSegments.back().maStart.Assign(rNode); } -void WW8TabDesc::CreateSwTable(SvxULSpaceItem* pULSpaceItem) +void WW8TabDesc::CreateSwTable() { ::SetProgressState(m_pIo->m_nProgress, m_pIo->m_pDocShell); // Update @@ -2396,9 +2396,6 @@ void WW8TabDesc::CreateSwTable(SvxULSpaceItem* pULSpaceItem) if (!m_pTable || !m_pTable->GetFrameFormat()) return; - if (pULSpaceItem && pULSpaceItem->GetUpper() != 0) - m_aItemSet.Put(*pULSpaceItem); - SwTableNode* pTableNode = m_pTable->GetTableNode(); OSL_ENSURE(pTableNode, "no table node!"); if (pTableNode) @@ -3345,7 +3342,7 @@ void WW8TabDesc::SetNumRuleName( const OUString& rName ) m_aNumRuleNames[nCol] = rName; } -bool SwWW8ImplReader::StartTable(WW8_CP nStartCp, SvxULSpaceItem* pULSpaceItem) +bool SwWW8ImplReader::StartTable(WW8_CP nStartCp) { // Entering a table so make sure the FirstPara flag gets set m_bFirstPara = true; @@ -3428,7 +3425,7 @@ bool SwWW8ImplReader::StartTable(WW8_CP nStartCp, SvxULSpaceItem* pULSpaceItem) "Not the anchor type requested!" ); MoveInsideFly(m_pTableDesc->m_pFlyFormat); } - m_pTableDesc->CreateSwTable(pULSpaceItem); + m_pTableDesc->CreateSwTable(); if (m_pTableDesc->m_pFlyFormat) { m_pTableDesc->SetSizePosition(m_pTableDesc->m_pFlyFormat); |