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/ww8par.hxx | |
| 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/ww8par.hxx')
| -rw-r--r-- | sw/source/filter/ww8/ww8par.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx index dd7e397796c1..7a986b677b05 100644 --- a/sw/source/filter/ww8/ww8par.hxx +++ b/sw/source/filter/ww8/ww8par.hxx @@ -1468,7 +1468,7 @@ private: //Apo == Absolutely Positioned Object, MSWord's old-style frames WW8FlyPara *ConstructApo(const ApoTestResults &rApo, const WW8_TablePos *pTabPos); - bool StartApo(const ApoTestResults &rApo, const WW8_TablePos *pTabPos, SvxULSpaceItem* pULSpaceItem); + bool StartApo(const ApoTestResults &rApo, const WW8_TablePos *pTabPos); void StopApo(); bool TestSameApo(const ApoTestResults &rApo, const WW8_TablePos *pTabPos); ApoTestResults TestApo(int nCellLevel, bool bTableRowEnd, @@ -1519,7 +1519,7 @@ private: void ReadDocVars(); - bool StartTable(WW8_CP nStartCp, SvxULSpaceItem* pULSpaceItem); + bool StartTable(WW8_CP nStartCp); bool InEqualApo(int nLvl) const; bool InLocalApo() const { return InEqualApo(m_nInTable); } bool InEqualOrHigherApo(int nLvl) const; |