writerfilter/source/dmapper/DomainMapper.cxx | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
New commits:
commit 1435c5b12646269e2b5b58ec7d51626dce6505db
Author: Justin Luth <jl...@mail.com>
AuthorDate: Fri Nov 18 12:57:35 2022 -0500
Commit: Justin Luth <jl...@mail.com>
CommitDate: Wed Nov 23 01:08:02 2022 +0100
cleanup SdtControlType::plainText - same as the other controls.
For a while, plainText needed special handling
added in commit 9700c1b2170ad04453a361ed5647937833ac3c18
Date: Mon Jul 25 09:13:03 2022 +0200
sw content controls, plain text: add DOCX import
But now it is treated the same as all the others
and so can be lumped together with the other case statements
since commit de90c192cb8f1f03a4028493d8bfe9a127a76b2a
Date: Mon Sep 19 10:01:36 2022 +0200
sw content controls, plain text: enable DOCX filter with data binding
Change-Id: Ie1ebe3873e8f49ae9747f1a77d08bfc0dec2d9f2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142953
Tested-by: Jenkins
Reviewed-by: Justin Luth <jl...@mail.com>
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index 94422d8a6a98..781cdfeac764 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1109,6 +1109,7 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
switch (m_pImpl->m_pSdtHelper->getControlType())
{
case SdtControlType::richText:
+ case SdtControlType::plainText:
case SdtControlType::checkBox:
case SdtControlType::dropDown:
case SdtControlType::comboBox:
@@ -1119,11 +1120,6 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
default:
break;
}
-
- if (m_pImpl->m_pSdtHelper->getControlType() ==
SdtControlType::plainText)
- {
- m_pImpl->PopSdt();
- }
}
m_pImpl->SetSdt(false);
