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

[Oliver-Rainer Wittmann]

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

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

    Resolves: #i125296# correction of fix for issue #i125044#
    
    (cherry picked from commit 2f2e914703ad45598ae51dcaed82c6c6ec49fb83)
    
    Conflicts:
    	sw/source/core/txtnode/atrfld.cxx
    
    Change-Id: I7519a2b985da603618a345d5549f73c9abd17101

diff --git a/sw/source/core/txtnode/atrfld.cxx b/sw/source/core/txtnode/atrfld.cxx
index 76330ce..7329b87 100644
--- a/sw/source/core/txtnode/atrfld.cxx
+++ b/sw/source/core/txtnode/atrfld.cxx
@@ -336,8 +336,7 @@ void SwTxtFld::ExpandTxtFld(const bool bForceNotify) const
     const SwField* pFld = GetFmtFld().GetField();
     const OUString 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();
@@ -353,7 +352,11 @@ void SwTxtFld::ExpandTxtFld(const bool bForceNotify) const
             {
                 m_pTxtNode->ModifyNotification( 0, 0 );
             }
-            return;
+            if ( !bForceNotify )
+            {
+                // done, if no further notification forced.
+                return;
+            }
         }
     }