tdf#152919: update UserFields

- fixes regression from 86d1109 - Unfortunately SwUserFieldType::SWClientNotify has sideeffects that we rely on Change-Id: Ic0cbac0c584e28dd5f49405d116d78eab0e3083e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171099 Reviewed-by: Bjoern Michaelsen <[email protected]> Tested-by: Jenkins Reviewed-by: Michael Stahl <[email protected]>
LibreOffice · Jul 30, 2024 · b4ddc6e · b4ddc6e
1 parent ccdf109
commit b4ddc6e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/sw/inc/usrfld.hxx b/sw/inc/usrfld.hxx
@@ -69,8 +69,9 @@ public:
     bool                    IsDeleted() const       { return m_bDeleted; }
     void                    SetDeleted( bool b )    { m_bDeleted = b; }
 
-    virtual void        QueryValue( css::uno::Any& rVal, sal_uInt16 nMId ) const override;
-    virtual void        PutValue( const css::uno::Any& rVal, sal_uInt16 nMId ) override;
+    virtual void QueryValue( css::uno::Any& rVal, sal_uInt16 nMId ) const override;
+    virtual void PutValue( const css::uno::Any& rVal, sal_uInt16 nMId ) override;
+    virtual void UpdateFields() override;
     void EnsureValid();
     void dumpAsXml(xmlTextWriterPtr pWriter) const override;
 

diff --git a/sw/source/core/fields/usrfld.cxx b/sw/source/core/fields/usrfld.cxx
@@ -26,6 +26,7 @@
 #include <svl/numformat.hxx>
 #include <unotools/charclass.hxx>
 
+#include <calbck.hxx>
 #include <calc.hxx>
 #include <usrfld.hxx>
 #include <doc.hxx>
@@ -233,6 +234,18 @@ void SwUserFieldType::SwClientNotify(const SwModify&, const SfxHint& rHint)
     }
 }
 
+void SwUserFieldType::UpdateFields()
+{
+    m_bValidValue = false;
+    CallSwClientNotify(sw::LegacyModifyHint(nullptr, nullptr));
+    if (!IsModifyLocked())
+    {
+        LockModify();
+        GetDoc()->getIDocumentFieldsAccess().GetSysFieldType(SwFieldIds::Input)->UpdateFields();
+        UnlockModify();
+    }
+}
+
 double SwUserFieldType::GetValue( SwCalc& rCalc )
 {
     if(m_bValidValue)