tdf#121962 Update fields after layout has been calculated

Change-Id: Ic4a49494652dab416ddb1545da02eb8a7f533828
Reviewed-on: https://gerrit.libreoffice.org/65126
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>

sw/source/uibase/uno/unotxdoc.cxx

@@ -2663,8 +2663,6 @@ sal_Int32 SAL_CALL SwXTextDocument::getRendererCount(
                 bStateChanged = true;
             }
 
-            // #122919# Force field update before PDF export
-            pViewShell->SwViewShell::UpdateFields(true);
             if( bStateChanged )
                 pRenderDocShell->EnableSetModified();
 
@@ -2674,6 +2672,9 @@ sal_Int32 SAL_CALL SwXTextDocument::getRendererCount(
             pViewShell->CalcLayout();
             pViewShell->CalcPagesForPrint( pViewShell->GetPageCount() );
 
+            // #122919# Force field update before PDF export, but after layout init (tdf#121962)
+            pViewShell->SwViewShell::UpdateFields(true);
+
             pViewShell->SetPDFExportOption( false );
 
             // enable view again