[Libreoffice-commits] core.git: Branch 'feature/item_refactor2' - include/sfx2 sfx2/source

[Armin Le Grand (via logerrit)]

 include/sfx2/unoctitm.hxx        |    2 +-
 sfx2/source/control/statcach.cxx |    4 ++--
 sfx2/source/control/unoctitm.cxx |    4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 792c0ba7b5c8be39c4a1023037d7977dd30615e3
Author:     Armin Le Grand <Armin.Le.Grand at me.com>
AuthorDate: Tue May 7 12:59:25 2019 +0200
Commit:     Armin Le Grand <Armin.Le.Grand at me.com>
CommitDate: Tue May 7 12:59:25 2019 +0200

    WIP: Small error in SfxStateCache fixed
    
    Change-Id: I3f753e202294c886580b6b0c48bf6c7bb8ec6361

diff --git a/include/sfx2/unoctitm.hxx b/include/sfx2/unoctitm.hxx
index 2b6608735017..fe7f7634b605 100644
--- a/include/sfx2/unoctitm.hxx
+++ b/include/sfx2/unoctitm.hxx
@@ -129,7 +129,7 @@ public:
 
     static OUString getSlaveCommand( const css::util::URL& rURL );
 
-    void                StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState, SfxSlotServer const * pServ );
+    void                StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState, const Item::ItemBase* pSlotItem, SfxSlotServer const * pServ );
     virtual void        StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState, const Item::ItemBase* pSlotItem ) override;
     void                setMasterSlaveCommand( bool bSet );
     /// @throws css::uno::RuntimeException
diff --git a/sfx2/source/control/statcach.cxx b/sfx2/source/control/statcach.cxx
index 59750ae7df01..4ac06a340215 100644
--- a/sfx2/source/control/statcach.cxx
+++ b/sfx2/source/control/statcach.cxx
@@ -432,7 +432,7 @@ void SfxStateCache::SetState_Impl
         }
 
         if ( pInternalController )
-            static_cast<SfxDispatchController_Impl *>(pInternalController)->StateChanged( nId, eState, pState, &aSlotServ );
+            static_cast<SfxDispatchController_Impl *>(pInternalController)->StateChanged( nId, eState, pState, nullptr, &aSlotServ );
 
         // Remember new value
         if ( !IsInvalidItem(pLastItem) )
@@ -471,7 +471,7 @@ void SfxStateCache::SetCachedState( bool bAlways )
     }
 
     if ( pInternalController )
-        static_cast<SfxDispatchController_Impl *>(pInternalController)->StateChanged( nId, eLastState, pLastItem, &aSlotServ );
+        static_cast<SfxDispatchController_Impl *>(pInternalController)->StateChanged( nId, eLastState, pLastItem, nullptr, &aSlotServ );
 
     // Controller is now ok
     bCtrlDirty = true;
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 72acacf472cd..116801148526 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -882,7 +882,7 @@ void SfxDispatchController_Impl::sendStatusChanged(const OUString& rURL, const c
     }
 }
 
-void SfxDispatchController_Impl::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState, SfxSlotServer const * pSlotServ )
+void SfxDispatchController_Impl::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState, const Item::ItemBase* pSlotItem, SfxSlotServer const * pSlotServ )
 {
     if ( !pDispatch )
         return;
@@ -969,7 +969,7 @@ void SfxDispatchController_Impl::StateChanged( sal_uInt16 nSID, SfxItemState eSt
 
 void SfxDispatchController_Impl::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState, const Item::ItemBase* pSlotItem)
 {
-    StateChanged( nSID, eState, pState, pSlotItem );
+    StateChanged( nSID, eState, pState, pSlotItem, nullptr );
 }
 
 static void InterceptLOKStateChangeEvent(const SfxViewFrame* pViewFrame, const css::frame::FeatureStateEvent& aEvent, const SfxPoolItem* pState)