diff options
| author | Justin Luth <justin_luth@sil.org> | 2020-09-10 18:32:49 +0200 |
|---|---|---|
| committer | Justin Luth <justin_luth@sil.org> | 2020-09-10 21:30:53 +0200 |
| commit | 23126db6e0ca3eb51748b6f579d066f20536d27b (patch) | |
| tree | ed32ee875603c5a66ee047ac81412b1f4593b011 /sw/source | |
| parent | efbfdd935e319817b0680a7115a5061604262d1c (diff) | |
Revert "tdf#59674 Word export: set a tabstop at numbering IndentAt"
This reverts commit 5ad17c85dc93973c0cbb1d633b9eed144f0677de
for the benefit of all mankind, and specifically tdf#136644.
Reason for revert: LO's UI for this is totally messed up,
so I want to completely get out of anything to do with
numbering/bullets.
It is inconsistent with how it handles default tab stops
(delete all when none are shown and things act different),
it doesn't always increment levels properly,
and does all kinds of weird things.
Change-Id: Ifaf8c3a7c9ac30b7103b82dd119cb4629f0b2578
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102415
Tested-by: Justin Luth <justin_luth@sil.org>
Reviewed-by: Justin Luth <justin_luth@sil.org>
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/filter/ww8/wrtw8num.cxx | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/sw/source/filter/ww8/wrtw8num.cxx b/sw/source/filter/ww8/wrtw8num.cxx index 78722c9c7cfe..a7f4276fbdc6 100644 --- a/sw/source/filter/ww8/wrtw8num.cxx +++ b/sw/source/filter/ww8/wrtw8num.cxx @@ -581,18 +581,8 @@ void MSWordExportBase::NumberingLevel( { nIndentAt = static_cast<sal_Int16>(rFormat.GetIndentAt()); nFirstLineIndex = static_cast<sal_Int16>(rFormat.GetFirstLineIndent()); - nListTabPos = 0; - if ( rFormat.GetLabelFollowedBy() == SvxNumberFormat::LISTTAB ) - { - nListTabPos = static_cast<sal_Int16>( rFormat.GetListtabPos() ); - - // Writer usually treats nIndentAt as a tabstop, but Word doesn't (at least for .doc and .rtf). - // NOTE: There will still be problems if the tabstop is only SLIGHTLY larger than the align-at position, - // i.e. if the tab position is not behind the numbering character. Oh well. Better design your document better. - const sal_Int32 nStart = nIndentAt + nFirstLineIndex; // nFirstLineIndex is a negative offset - if ( nListTabPos <= nStart ) - nListTabPos = nIndentAt; - } + nListTabPos = rFormat.GetLabelFollowedBy() == SvxNumberFormat::LISTTAB? + static_cast<sal_Int16>( rFormat.GetListtabPos() ) : 0; } AttrOutput().NumberingLevel( nLvl, |