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

[Bjoern Michaelsen (via logerrit)]

 sw/source/core/attr/format.cxx |   44 +++++++++++++++++++++--------------------
 1 file changed, 23 insertions(+), 21 deletions(-)

New commits:
commit 71c36484f4916dec673831bf14afbf6b2b1e756b
Author:     Bjoern Michaelsen <bjoern.michaelsen at libreoffice.org>
AuthorDate: Sat Sep 19 21:24:39 2020 +0200
Commit:     Bjoern Michaelsen <bjoern.michaelsen at libreoffice.org>
CommitDate: Sun Sep 20 10:44:07 2020 +0200

    Refactor SwFormat::Modify ...
    
    - unify NotifyClient call at the end of function
    - avoid copy and Differentiate on old set, if not needed
    
    Change-Id: I7265b3985a2a44f80f7508cd41505601f92b19db
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103042
    Tested-by: Jenkins
    Reviewed-by: Bjoern Michaelsen <bjoern.michaelsen at libreoffice.org>

diff --git a/sw/source/core/attr/format.cxx b/sw/source/core/attr/format.cxx
index e7bfedb0a0f5..7959a3cd69ef 100644
--- a/sw/source/core/attr/format.cxx
+++ b/sw/source/core/attr/format.cxx
@@ -243,15 +243,18 @@ SwFormat::~SwFormat()
 
 void SwFormat::Modify( const SfxPoolItem* pOldValue, const SfxPoolItem* pNewValue )
 {
-    bool bContinue = true; // true = pass on to dependent ones
-
-    sal_uInt16 nWhich = pOldValue ? pOldValue->Which() :
-                    pNewValue ? pNewValue->Which() : 0 ;
+    std::unique_ptr<SwAttrSetChg> pOldClientChg, pNewClientChg;
+    auto aDependArgs = std::pair<const SfxPoolItem*, const SfxPoolItem*>(pOldValue, pNewValue);
+    bool bPassToDepends = true;
+    const sal_uInt16 nWhich = pOldValue ? pOldValue->Which()
+            : pNewValue ? pNewValue->Which()
+            : 0;
     switch( nWhich )
     {
     case 0:     break;          // Which-Id of 0?
 
     case RES_OBJECTDYING:
+        // NB: this still notifies depends even if pNewValue is nullptr, which seems non-obvious
         if (pNewValue)
         {
             // If the dying object is the parent format of this format so
@@ -277,18 +280,20 @@ void SwFormat::Modify( const SfxPoolItem* pOldValue, const SfxPoolItem* pNewValu
         }
         break;
     case RES_ATTRSET_CHG:
+        // NB: this still notifies depends even if this condition is not met, whoch seems non-obvious
         if (pOldValue && pNewValue && static_cast<const SwAttrSetChg*>(pOldValue)->GetTheChgdSet() != &m_aSet)
         {
-            // pass only those that are not set
-            SwAttrSetChg aOld( *static_cast<const SwAttrSetChg*>(pOldValue) );
-            SwAttrSetChg aNew( *static_cast<const SwAttrSetChg*>(pNewValue) );
-
-            aOld.GetChgSet()->Differentiate( m_aSet );
-            aNew.GetChgSet()->Differentiate( m_aSet );
-
-            if( aNew.Count() )
-                NotifyClients( &aOld, &aNew );
-            bContinue = false;
+            // pass only those that are not set ...
+            pNewClientChg.reset( new SwAttrSetChg(*static_cast<const SwAttrSetChg*>(pNewValue)) );
+            pNewClientChg->GetChgSet()->Differentiate( m_aSet );
+            if(pNewClientChg->Count()) // ... if any
+            {
+                pOldClientChg.reset( new SwAttrSetChg(*static_cast<const SwAttrSetChg*>(pOldValue)) );
+                pOldClientChg->GetChgSet()->Differentiate( m_aSet );
+                aDependArgs = std::pair<const SfxPoolItem*, const SfxPoolItem*>(pOldClientChg.get(), pNewClientChg.get());
+            }
+            else
+                bPassToDepends = false;
         }
         break;
     case RES_FMT_CHG:
@@ -296,6 +301,7 @@ void SwFormat::Modify( const SfxPoolItem* pOldValue, const SfxPoolItem* pNewValu
         // the new one
 
         // skip my own Modify
+        // NB: this still notifies depends even if this condition is not met, whoch seems non-obvious
         if ( pOldValue && pNewValue &&
             static_cast<const SwFormatChg*>(pOldValue)->pChangedFormat != this &&
             static_cast<const SwFormatChg*>(pNewValue)->pChangedFormat == GetRegisteredIn() )
@@ -311,16 +317,12 @@ void SwFormat::Modify( const SfxPoolItem* pOldValue, const SfxPoolItem* pNewValu
             {
                 // DropCaps might come into this block
                 OSL_ENSURE( RES_PARATR_DROP == nWhich, "Modify was sent without sender" );
-                bContinue = false;
+                bPassToDepends = false;
             }
         }
     }
-
-    if( bContinue )
-    {
-        // walk over all dependent formats
-        NotifyClients( pOldValue, pNewValue );
-    }
+    if(bPassToDepends)
+        NotifyClients(aDependArgs.first, aDependArgs.second);
 }
 
 bool SwFormat::SetDerivedFrom(SwFormat *pDerFrom)