[Libreoffice-commits] core.git: sw/source

[Oliver Specht]

 sw/source/core/doc/DocumentFieldsManager.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit d7144b71eeb132b00bd555495d9547c3b859ceaa
Author: Oliver Specht <oliver.specht at cib.de>
Date:   Thu Nov 5 15:14:13 2015 +0100

    tdf#76995: updated cached value on Evaluate() of db name field
    
    Conversion of fields to text while creating mail merge documents
    returns a cached value. This needs to be set before also for db name fields.
    
    Change-Id: I5796adc82e11005ea045fb220b81201db5ff0b28
    Reviewed-on: https://gerrit.libreoffice.org/19806
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Oliver Specht <oliver.specht at cib.de>

diff --git a/sw/source/core/doc/DocumentFieldsManager.cxx b/sw/source/core/doc/DocumentFieldsManager.cxx
index 6953c53..90ae677 100644
--- a/sw/source/core/doc/DocumentFieldsManager.cxx
+++ b/sw/source/core/doc/DocumentFieldsManager.cxx
@@ -988,6 +988,7 @@ void DocumentFieldsManager::UpdateExpFields( SwTextField* pUpdateField, bool bUp
         {
             const_cast<SwDBSetNumberField*>(static_cast<const SwDBSetNumberField*>(pField))->Evaluate(&m_rDoc);
             aCalc.VarChange( sDBNumNm, static_cast<const SwDBSetNumberField*>(pField)->GetSetNumber());
+            pField->ExpandField(m_rDoc.IsClipBoard());
         }
 #endif
         break;