sw/source/core/fields/expfld.cxx | 1 +
1 file changed, 1 insertion(+)
New commits:
commit 143823fc511bf86b5f4d7f39c498929597abb68f
Author: Michael Stahl <michael.st...@cib.de>
AuthorDate: Wed Mar 6 17:11:25 2019 +0100
Commit: Thorsten Behrens <thorsten.behr...@cib.de>
CommitDate: Thu Mar 7 17:45:22 2019 +0100
sw_redlinehide: fix SwGetExpField ODF import
After import, SwGetExpField are empty if ShowRedlineChanges=false
because the content from the document is lost in SwGetExpField::Copy().
Example is ooo26330-3.sxw, which then asserts once fields are updated,
but that is a different problem.
(regression from 57f358f1ac4f3e05fcdf54326388ba8a19f0f2b3)
Change-Id: I1bf939d69e599919c3a5c5631091ca0a0074d139
Reviewed-on: https://gerrit.libreoffice.org/68820
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.st...@cib.de>
(cherry picked from commit ac7de9a54d67e4e4f3bacedb68a4cff6cc6e9af0)
Reviewed-on: https://gerrit.libreoffice.org/68844
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx
index d3787483c85b..43bd86c8b78b 100644
--- a/sw/source/core/fields/expfld.cxx
+++ b/sw/source/core/fields/expfld.cxx
@@ -331,6 +331,7 @@ std::unique_ptr<SwField> SwGetExpField::Copy() const
pTmp->m_fValueRLHidden = m_fValueRLHidden;
pTmp->SwValueField::SetValue(GetValue());
pTmp->m_sExpand = m_sExpand;
+ pTmp->m_sExpandRLHidden = m_sExpandRLHidden;
pTmp->m_bIsInBodyText = m_bIsInBodyText;
pTmp->SetAutomaticLanguage(IsAutomaticLanguage());
if( m_bLateInitialization )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
