sw/source/filter/ww8/docxattributeoutput.cxx | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
New commits:
commit fd14dd0e4c6a7ea0866a686f653db90301d664b6
Author: Justin Luth <justin.l...@collabora.com>
AuthorDate: Fri Dec 2 14:59:08 2022 -0500
Commit: Justin Luth <jl...@mail.com>
CommitDate: Mon Dec 5 18:36:29 2022 +0000
NFC cleanup docxattributeoutput: use existing function to clear
The function already clears these things,
so use it - which should also prevent bugs
where a clear is put in one place and not the other.
A dead giveaway was that m_bHasId = false
is also done in the function.
Change-Id: Ibb97b8da246404841afa5a03d11514dbcc7157b0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143604
Tested-by: Jenkins
Reviewed-by: Justin Luth <jl...@mail.com>
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 6a01be448df8..5eb1c0ba306f 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -679,11 +679,7 @@ void SdtBlockHelper::WriteSdtBlock(const
::sax_fastparser::FSHelperPtr& pSeriali
// clear sdt status
m_nSdtPrToken = 0;
- m_pTokenChildren.clear();
- m_pDataBindingAttrs.clear();
- m_pTextAttrs.clear();
- m_aAlias.clear();
- m_bHasId = false;
+ DeleteAndResetTheLists();
}
void SdtBlockHelper::WriteExtraParams(const ::sax_fastparser::FSHelperPtr&
pSerializer)
@@ -1085,7 +1081,6 @@ void DocxAttributeOutput::EndParagraph(
ww8::WW8TableNodeInfoInner::Pointer_t pT
//These should be written out to the actual Node and not to the anchor.
//Clear them as they will be repopulated when the node is processed.
m_aParagraphSdt.m_nSdtPrToken = 0;
- m_aParagraphSdt.m_bHasId = false;
m_aParagraphSdt.DeleteAndResetTheLists();
}
