diff options
| author | Justin Luth <justin_luth@sil.org> | 2019-08-21 19:41:17 +0300 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2019-09-05 12:32:33 +0200 |
| commit | 4984dbdef324ebe709f03144ef2808dbef09ba83 (patch) | |
| tree | 27e0fbf8b7a32673ba022c77f9c877094c909922 /sw/inc | |
| parent | 8999bfde3ce7bbf5d3c1ff12ef7d938b3de8eba1 (diff) | |
tdf#126784 sw: only distribute across selected columns
partial revert of LO6.2 commit ab18c17d70e1dcf5cf9db38256d35e6af479373e
because MERGED cells had a very unexpected effect on the
columns that were altered. Unselected columns are INCLUDED
in the calculation IF they extend over the selected columns
when SwTableSearchType::Col uses the entire table column.
The last table in the unit test demonstrates why the regressive behaviour
was included. A user can make an ugly layout if they don't choose a
good set of columns.
However, the merged cell really changes the way the calculation
works, and since giving power to the user is ultimately the best,
just revert the portion that tries to save the user from themself.
I struggled then and now to get a good enough understanding
to improve the documentation - which really is needed
since reading it didn't help me a lot.
However, since my understanding was and is obviously flawed,
I'll just revert back to the original wording.
Change-Id: Icf8f01f095652e2a023e0398852f43aa6b90332f
Reviewed-on: https://gerrit.libreoffice.org/77985
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'sw/inc')
| -rw-r--r-- | sw/inc/doc.hxx | 3 | ||||
| -rw-r--r-- | sw/inc/fesh.hxx | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index db3220f26f18..ce2311c59c09 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -1492,8 +1492,7 @@ public: /// Adjusts selected cell widths in such a way, that their content does not need to be wrapped (if possible). /// bBalance evenly re-distributes the available space regardless of content or wrapping. /// bNoShrink keeps table size the same by distributing excess space proportionately. - /// bColumnWidth tests the entire column for content width, not just selected cells. - void AdjustCellWidth( const SwCursor& rCursor, const bool bBalance, const bool bNoShrink, const bool bColumnWidth ); + void AdjustCellWidth( const SwCursor& rCursor, const bool bBalance, const bool bNoShrink ); SwChainRet Chainable( const SwFrameFormat &rSource, const SwFrameFormat &rDest ); SwChainRet Chain( SwFrameFormat &rSource, const SwFrameFormat &rDest ); diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx index e5e3275bcbec..d4f2f0732983 100644 --- a/sw/inc/fesh.hxx +++ b/sw/inc/fesh.hxx @@ -706,7 +706,7 @@ public: bool IsInRepeatedHeadline() const { return CheckHeadline( true ); } bool IsInHeadline() const { return CheckHeadline( false ); } - void AdjustCellWidth( bool bBalance, const bool bNoShrink, const bool bColumnWidth ); + void AdjustCellWidth( const bool bBalance, const bool bNoShrink ); /// Not allowed if only empty cells are selected. bool IsAdjustCellWidthAllowed( bool bBalance = false ) const; |