tdf#147861 ww8import: use GetFieldResult, not current DocProperty

In all the testing I could think of on DOCX and DOC examples
(and only a very few exist in the unit tests)
the actual value of the DocProperty was irrelevant to
what Word shows as the document loads.
It always takes the in-document, as-last-seen static text.

As a way to hack a fix using existing capabilities,
I marked as FIXEDFLD the unknown custom fields
that weren't handled separately.
That fixes what is displayed as the import value,
(which of course means that F9 will no longer
return a modification back to the DocProperty value).

It also means the (fixed) field is lost on export,
but a follow-up patch handles that for DOC/RTF/DOCX.

There were NO DI_CUSTOM examples in existing ww8 tests, but:
-ooxmlexport8:  fdo74745.docx, fdo81486.docx
-ooxmlexport10: tdf92157.docx
and in these cases the plain text matched the variable anyway,
but a manual manipulation showed that LO is importing DOCX wrong
as well, so a similar import fix needs to happen for RTF/DOCX.

My fear is that there are some special-magic-associations
that worked properly the old way by accident that I will
break by marking them as fixed. No backporting please
since obviously very few people report bugs about fields.

Change-Id: I3f167eb3bd570b66ee829241bf9d31d557fc8749
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131237
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Reviewed-by: Justin Luth <jluth@mail.com>

1 files changed, 11 insertions, 2 deletions

diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index a7075b66e949..66b08888416b 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -1645,8 +1645,17 @@ eF_ResT SwWW8ImplReader::Read_F_DocInfo( WW8FieldDesc* pF, OUString& rStr )
 
         if( !bFieldFound )
         {
-            SwDocInfoField aField( static_cast<SwDocInfoFieldType*>(
-                m_rDoc.getIDocumentFieldsAccess().GetSysFieldType( SwFieldIds::DocInfo )), DI_CUSTOM|nReg, aDocProperty, GetFieldResult( pF ) );
+            // LO always automatically updates a DocInfo field from the File-Properties-Custom Prop
+            // while MS Word requires the user to manually refresh the field (with F9).
+            // In other words, Word lets the field to be out of sync with the controlling variable.
+            // Marking as FIXEDFLD solves the automatic replacement problem, but of course prevents
+            // Writer from making any changes, even on an F9 refresh.
+            // TODO: If the field already matches the DocProperty, no need to mark as fixed.
+            // TODO: Extend LO to allow a linked field that doesn't automatically update.
+            const auto pType(static_cast<SwDocInfoFieldType*>(
+                m_rDoc.getIDocumentFieldsAccess().GetSysFieldType(SwFieldIds::DocInfo)));
+            const OUString sDisplayed = GetFieldResult(pF);
+            SwDocInfoField aField(pType, DI_CUSTOM | DI_SUB_FIXED | nReg, aDocProperty, sDisplayed);
             m_rDoc.getIDocumentContentOperations().InsertPoolItem(*m_pPaM, SwFormatField(aField));
 
             return eF_ResT::OK;