Skip to content

C
core
Kaydet (Commit) 2f2e9147 authored tarafından Oliver-Rainer Wittmann's avatar Oliver-Rainer Wittmann
Dosyalara gözat
Seçenekler

125296: correction of fix for issue 125044

üst 9e29944a
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 2 deletions
sw/source/core/txtnode/atrfld.cxx
Dosyayı görüntüle @ 2f2e9147
...@@ -355,8 +355,7 @@ void SwTxtFld::ExpandTxtFld( const bool bForceNotify ) const ...@@ -355,8 +355,7 @@ void SwTxtFld::ExpandTxtFld( const bool bForceNotify ) const
const SwField* pFld = GetFmtFld().GetField(); const SwField* pFld = GetFmtFld().GetField();
const XubString aNewExpand( pFld->ExpandField(m_pTxtNode->GetDoc()->IsClipBoard()) ); const XubString aNewExpand( pFld->ExpandField(m_pTxtNode->GetDoc()->IsClipBoard()) );
if ( !bForceNotify && if ( aNewExpand == m_aExpand )
aNewExpand == m_aExpand )
{ {
// Bei Seitennummernfeldern // Bei Seitennummernfeldern
const sal_uInt16 nWhich = pFld->GetTyp()->Which(); const sal_uInt16 nWhich = pFld->GetTyp()->Which();
...@@ -372,9 +371,13 @@ void SwTxtFld::ExpandTxtFld( const bool bForceNotify ) const ...@@ -372,9 +371,13 @@ void SwTxtFld::ExpandTxtFld( const bool bForceNotify ) const
{ {
m_pTxtNode->ModifyNotification( 0, 0 ); m_pTxtNode->ModifyNotification( 0, 0 );
} }
if ( !bForceNotify )
{
// done, if no further notification forced.
return; return;
} }
} }
}
m_aExpand = aNewExpand; m_aExpand = aNewExpand;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment