diff options
| author | Justin Luth <justin.luth@collabora.com> | 2021-03-11 08:41:53 +0200 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@allotropia.de> | 2021-06-14 10:57:47 +0200 |
| commit | 343d4d32f00053bd72cfe240125835fe25ce264f (patch) | |
| tree | 1a97ba687c5715a49b958352c80e4559c5cf56d9 /sw/inc | |
| parent | 859978445daeb848d033f64736709503ec44a7bb (diff) | |
tdf#108518 revert OOo hack: Fix issue #i119405: Numbering text style
...changed after importing the *.doc
2012 commit 1c22545edf9085b9f2656ca92781158b6b123db3
This hack has been made irrelevant by layout support for
copying paragraph CR formatting to the numbering.
It can be improved even more for DOC by supporting
RES_PARATR_LIST_AUTOFMT.
The OOo guys who made this knew it was a hack.
They document in https://bz.apache.org/ooo/show_bug.cgi?id=119405#c11
> Negative Impact:
> Although most common user scenarios can be met by the solution,
> there are still negative impacts. Because the attributes of
> paragraph end mark(0x0D) will be set to the character style
> binding to the given level of a number rule,
> it will have the global impact.
> Other paragraphs that are applied with the same number rule's
> level will also be changed.
> Generally, MS Word users will have their numbering/bullets
> the same attributes/style when using the same level's
> of number rule, correspondingly,the impacted scenarios are rarely.
So, the bad thing that was happening was that any paragraph's
CR formatting could change every instance of the numbering level's
formatting - not just that one paragraph's number.
The first instance of the defined formatting won.
tdf#133410: Also, it spammed a new char style
for every numbering level.
This patch depends on an earlier commit. The unit test ensures
that this earlier commit exists. It was the only example I found
where reverting the hack failed.
Change-Id: I43b88b8219c9dbc882f57d1a282749d7c0ab2a19
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112320
Tested-by: Jenkins
Reviewed-by: Justin Luth <justin_luth@sil.org>
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
Diffstat (limited to 'sw/inc')
| -rw-r--r-- | sw/inc/IDocumentContentOperations.hxx | 1 | ||||
| -rw-r--r-- | sw/inc/ndtxt.hxx | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/sw/inc/IDocumentContentOperations.hxx b/sw/inc/IDocumentContentOperations.hxx index 7b6960e1c074..1598c827cfcf 100644 --- a/sw/inc/IDocumentContentOperations.hxx +++ b/sw/inc/IDocumentContentOperations.hxx @@ -230,7 +230,6 @@ public: virtual bool InsertPoolItem(const SwPaM &rRg, const SfxPoolItem&, const SetAttrMode nFlags = SetAttrMode::DEFAULT, SwRootFrame const* pLayout = nullptr, - bool bExpandCharToPara = false, SwTextAttr **ppNewTextAttr = nullptr) = 0; virtual void InsertItemSet (const SwPaM &rRg, const SfxItemSet&, diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx index 9b7de4e89cb7..ad6a3c4ac27e 100644 --- a/sw/inc/ndtxt.hxx +++ b/sw/inc/ndtxt.hxx @@ -203,7 +203,6 @@ public: std::unique_ptr<SwWrongList> ReleaseSmartTags(); SwWrongList* GetSmartTags(); SwWrongList const* GetSmartTags() const; - void TryCharSetExpandToNum(const SfxItemSet& pCharSet); /// End: Data collected during idle time |