diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-02-15 10:48:53 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-02-15 13:18:26 +0100 |
| commit | 08b82fa3ee915666ef8b60aeb670c38f64553630 (patch) | |
| tree | ef240ccf4deca36f8e8afdbaaca29eb8e7c63a53 /include/editeng | |
| parent | a5513cb45d90e0a1bfa0dfe39c0f090f1cda45de (diff) | |
Revert "ofz#29461 flatten SetAttrSet recursion"
Compress deletes nodes so the flat list becomes invalid
This reverts commit d1b3571fba171279d70ccaa0dfec1871f04439af.
Change-Id: I70e52ac3988493a283ca83121bd2e4a67db6f5ed
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110901
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include/editeng')
| -rw-r--r-- | include/editeng/svxrtf.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/editeng/svxrtf.hxx b/include/editeng/svxrtf.hxx index 70e996068459..faff107c1496 100644 --- a/include/editeng/svxrtf.hxx +++ b/include/editeng/svxrtf.hxx @@ -197,7 +197,7 @@ class EDITENG_DLLPUBLIC SvxRTFParser : public SvRTFParser void ClearStyleAttr_( SvxRTFItemStackType& rStkType ); // Sets all the attributes that are different from the current - void SetAttrSet(SvxRTFItemStackType &rSet, bool bRecurse = true); + void SetAttrSet( SvxRTFItemStackType &rSet ); void SetDefault( int nToken, int nValue ); // Execute pard / plain @@ -309,7 +309,7 @@ class SvxRTFItemStackType void Add(std::unique_ptr<SvxRTFItemStackType>); void Compress( const SvxRTFParser& ); - std::vector<SvxRTFItemStackType*> GetBreadthFirstList(); + void DropChildList(); public: SvxRTFItemStackType(const SvxRTFItemStackType&, const EditPosition&, |