[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sw/source

[Oliver-Rainer Wittmann]

 sw/source/core/txtnode/atrfld.cxx |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 2f2e914703ad45598ae51dcaed82c6c6ec49fb83
Author: Oliver-Rainer Wittmann <orw at apache.org>
Date:   Tue Jul 22 10:39:40 2014 +0000

    125296: correction of fix for issue 125044

diff --git a/sw/source/core/txtnode/atrfld.cxx b/sw/source/core/txtnode/atrfld.cxx
index a6cad4c..97a93ca 100644
--- a/sw/source/core/txtnode/atrfld.cxx
+++ b/sw/source/core/txtnode/atrfld.cxx
@@ -355,8 +355,7 @@ void SwTxtFld::ExpandTxtFld( const bool bForceNotify ) const
     const SwField* pFld = GetFmtFld().GetField();
     const XubString aNewExpand( pFld->ExpandField(m_pTxtNode->GetDoc()->IsClipBoard()) );
 
-    if ( !bForceNotify &&
-         aNewExpand == m_aExpand )
+    if ( aNewExpand == m_aExpand )
     {
         // Bei Seitennummernfeldern
         const sal_uInt16 nWhich = pFld->GetTyp()->Which();
@@ -372,7 +371,11 @@ void SwTxtFld::ExpandTxtFld( const bool bForceNotify ) const
             {
                 m_pTxtNode->ModifyNotification( 0, 0 );
             }
-            return;
+            if ( !bForceNotify )
+            {
+                // done, if no further notification forced.
+                return;
+            }
         }
     }