svn commit: r1612778 - in /openoffice/branches/AOO410: ./ main/ main/sw/ main/sw/source/core/txtnode/atrfld.cxx

[orw]

Author: orw
Date: Wed Jul 23 07:12:02 2014
New Revision: 1612778

URL: http://svn.apache.org/r1612778
Log:
125296: correction of fix for issue 125044

        cherry-picked from trunk


Modified:
    openoffice/branches/AOO410/   (props changed)
    openoffice/branches/AOO410/main/   (props changed)
    openoffice/branches/AOO410/main/sw/   (props changed)
    openoffice/branches/AOO410/main/sw/source/core/txtnode/atrfld.cxx

Propchange: openoffice/branches/AOO410/
------------------------------------------------------------------------------
  Merged /openoffice/trunk:r1612539

Propchange: openoffice/branches/AOO410/main/
------------------------------------------------------------------------------
  Merged /openoffice/trunk/main:r1612539

Propchange: openoffice/branches/AOO410/main/sw/
------------------------------------------------------------------------------
  Merged /openoffice/trunk/main/sw:r1612539

Modified: openoffice/branches/AOO410/main/sw/source/core/txtnode/atrfld.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/sw/source/core/txtnode/atrfld.cxx?rev=1612778&r1=1612777&r2=1612778&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/sw/source/core/txtnode/atrfld.cxx (original)
+++ openoffice/branches/AOO410/main/sw/source/core/txtnode/atrfld.cxx Wed Jul 
23 07:12:02 2014
@@ -355,8 +355,7 @@ void SwTxtFld::ExpandTxtFld( const bool 
     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 
             {
                 m_pTxtNode->ModifyNotification( 0, 0 );
             }
-            return;
+            if ( !bForceNotify )
+            {
+                // done, if no further notification forced.
+                return;
+            }
         }
     }