Avoid reserved identifiers

Change-Id: I18ebddef41955948fd4528ae74f4fe9c7439d53b

include/sfx2/dispatch.hxx

@@ -91,7 +91,7 @@ friend class SfxViewFrame;
     DECL_DLLPRIVATE_LINK_TYPED( PostMsgHandler, SfxRequest *, void );
 
     SAL_DLLPRIVATE void Call_Impl( SfxShell& rShell, const SfxSlot &rSlot, SfxRequest &rReq, bool bRecord );
-    SAL_DLLPRIVATE void _Update_Impl( bool,bool,bool,SfxWorkWindow*);
+    SAL_DLLPRIVATE void Update_Impl_( bool,bool,bool,SfxWorkWindow*);
 
 protected:
 friend class SfxBindings;
@@ -99,10 +99,10 @@ friend class SfxStateCache;
 friend class SfxPopupMenuManager;
 friend class SfxHelp;
 
-    bool                _FindServer( sal_uInt16 nId, SfxSlotServer &rServer, bool bModal );
-    bool                _FillState( const SfxSlotServer &rServer,
+    bool                FindServer_( sal_uInt16 nId, SfxSlotServer &rServer, bool bModal );
+    bool                FillState_( const SfxSlotServer &rServer,
                                     SfxItemSet &rState, const SfxSlot *pRealSlot );
-    void                _Execute( SfxShell &rShell, const SfxSlot &rSlot,
+    void                Execute_( SfxShell &rShell, const SfxSlot &rSlot,
                                   SfxRequest &rReq,
                                   SfxCallMode eCall = SfxCallMode::RECORD);
 

sfx2/source/control/bindings.cxx

@@ -410,7 +410,7 @@ void SfxBindings::Update_Impl
     if ( pSet )
     {
         // Query Status
-        if ( rDispat._FillState( *pMsgServer, *pSet, pRealSlot ) )
+        if ( rDispat.FillState_( *pMsgServer, *pSet, pRealSlot ) )
         {
             // Post Status
             const SfxInterface *pInterface =
@@ -1169,7 +1169,7 @@ void SfxBindings::Execute_Impl( SfxRequest& aReq, const SfxSlot* pSlot, SfxShell
         const sal_uInt16 nSlotId = pRealSlot->GetSlotId();
         aReq.SetSlot( nSlotId );
         aReq.AppendItem( SfxAllEnumItem( rPool.GetWhich(nSlotId), pSlot->GetValue() ) );
-        pDispatcher->_Execute( *pShell, *pRealSlot, aReq, aReq.GetCallMode() | SfxCallMode::RECORD );
+        pDispatcher->Execute_( *pShell, *pRealSlot, aReq, aReq.GetCallMode() | SfxCallMode::RECORD );
     }
     else if ( SfxSlotKind::Attribute == pSlot->GetKind() )
     {
@@ -1249,10 +1249,10 @@ void SfxBindings::Execute_Impl( SfxRequest& aReq, const SfxSlot* pSlot, SfxShell
             }
         }
 
-        pDispatcher->_Execute( *pShell, *pSlot, aReq, aReq.GetCallMode() | SfxCallMode::RECORD );
+        pDispatcher->Execute_( *pShell, *pSlot, aReq, aReq.GetCallMode() | SfxCallMode::RECORD );
     }
     else
-        pDispatcher->_Execute( *pShell, *pSlot, aReq, aReq.GetCallMode() | SfxCallMode::RECORD );
+        pDispatcher->Execute_( *pShell, *pSlot, aReq, aReq.GetCallMode() | SfxCallMode::RECORD );
 }
 
 

sfx2/source/control/dispatch.cxx

@@ -787,7 +787,7 @@ bool SfxDispatcher::GetShellAndSlot_Impl(sal_uInt16 nSlot, SfxShell** ppShell,
 
     Flush();
     SfxSlotServer aSvr;
-    if ( _FindServer(nSlot, aSvr, bModal) )
+    if ( FindServer_(nSlot, aSvr, bModal) )
     {
         if ( bOwnShellsOnly && aSvr.GetShellLevel() >= xImp->aStack.size() )
             return false;
@@ -813,7 +813,7 @@ bool SfxDispatcher::GetShellAndSlot_Impl(sal_uInt16 nSlot, SfxShell** ppShell,
     @param rReq function to be performed (Id and optional parameters)
     @param eCallMode Synchronously, asynchronously or as shown in the slot
 */
-void SfxDispatcher::_Execute(SfxShell& rShell, const SfxSlot& rSlot,
+void SfxDispatcher::Execute_(SfxShell& rShell, const SfxSlot& rSlot,
         SfxRequest& rReq, SfxCallMode eCallMode)
 {
     DBG_ASSERT( !xImp->bFlushing, "recursive call to dispatcher" );
@@ -914,7 +914,7 @@ const SfxPoolItem* SfxDispatcher::Execute(sal_uInt16 nSlot, SfxCallMode nCall,
             aReq.SetInternalArgs_Impl( *pInternalArgs );
         aReq.SetModifier( nModi );
 
-        _Execute( *pShell, *pSlot, aReq, nCall );
+        Execute_( *pShell, *pSlot, aReq, nCall );
         return aReq.GetReturnValue();
     }
     return nullptr;
@@ -963,7 +963,7 @@ const SfxPoolItem* SfxDispatcher::Execute(sal_uInt16 nSlot, SfxCallMode eCall,
                 aSet.Put( **pArg );
             pReq->SetInternalArgs_Impl( aSet );
         }
-        _Execute( *pShell, *pSlot, *pReq, eCall );
+        Execute_( *pShell, *pSlot, *pReq, eCall );
         const SfxPoolItem* pRet = pReq->GetReturnValue();
         delete pReq; return pRet;
     }
@@ -1002,7 +1002,7 @@ const SfxPoolItem* SfxDispatcher::Execute(sal_uInt16 nSlot, SfxCallMode eCall,
             MappedPut_Impl( aSet, *pArg );
         SfxRequest aReq( nSlot, eCall, aSet );
         aReq.SetModifier( 0 );
-        _Execute( *pShell, *pSlot, aReq, eCall );
+        Execute_( *pShell, *pSlot, aReq, eCall );
         return aReq.GetReturnValue();
     }
     return nullptr;
@@ -1054,7 +1054,7 @@ const SfxPoolItem* SfxDispatcher::ExecuteList(sal_uInt16 nSlot, SfxCallMode eCal
        }
 
        SfxRequest aReq( nSlot, eCall, aSet );
-       _Execute( *pShell, *pSlot, aReq, eCall );
+       Execute_( *pShell, *pSlot, aReq, eCall );
        return aReq.GetReturnValue();
     }
     return nullptr;
@@ -1074,7 +1074,7 @@ IMPL_LINK_TYPED(SfxDispatcher, PostMsgHandler, SfxRequest*, pReq, void)
         {
             Flush();
             SfxSlotServer aSvr;
-            if ( _FindServer(pReq->GetSlot(), aSvr, true ) ) // HACK(x), whatever that was supposed to mean
+            if ( FindServer_(pReq->GetSlot(), aSvr, true ) ) // HACK(x), whatever that was supposed to mean
             {
                 const SfxSlot *pSlot = aSvr.GetSlot();
                 SfxShell *pSh = GetShell(aSvr.GetShellLevel());
@@ -1222,7 +1222,7 @@ void SfxDispatcher::Update_Impl( bool bForce )
         pActDispat = pActDispat->xImp->pParent;
     }
 
-    _Update_Impl( bUIActive, !bIsIPActive, bIsIPActive, pTaskWin );
+    Update_Impl_( bUIActive, !bIsIPActive, bIsIPActive, pTaskWin );
     if ( (bUIActive || bIsActive) && !comphelper::LibreOfficeKit::isActive() )
         pWorkWin->UpdateObjectBars_Impl();
 
@@ -1235,7 +1235,7 @@ void SfxDispatcher::Update_Impl( bool bForce )
     return;
 }
 
-void SfxDispatcher::_Update_Impl( bool bUIActive, bool bIsMDIApp, bool bIsIPOwner, SfxWorkWindow *pTaskWin )
+void SfxDispatcher::Update_Impl_( bool bUIActive, bool bIsMDIApp, bool bIsIPOwner, SfxWorkWindow *pTaskWin )
 {
     SfxGetpApp();
     SfxWorkWindow *pWorkWin = xImp->pFrame->GetFrame().GetWorkWindow_Impl();
@@ -1250,7 +1250,7 @@ void SfxDispatcher::_Update_Impl( bool bUIActive, bool bIsMDIApp, bool bIsIPOwne
     }
 
     if ( xImp->pParent && !xImp->bQuiet /* && bUIActive */ )
-        xImp->pParent->_Update_Impl( bUIActive, bIsMDIApp, bIsIPOwner, pTaskWin );
+        xImp->pParent->Update_Impl_( bUIActive, bIsMDIApp, bIsIPOwner, pTaskWin );
 
     for (sal_uInt16 n=0; n<SFX_OBJECTBAR_MAX; n++)
         xImp->aObjBars[n].nResId = 0;
@@ -1642,7 +1642,7 @@ SfxSlotFilterState SfxDispatcher::IsSlotEnabledByFilter_Impl( sal_uInt16 nSID )
                     false
                     The Slot is currently not served, rServer is invalid.
 */
-bool SfxDispatcher::_FindServer(sal_uInt16 nSlot, SfxSlotServer& rServer, bool bModal)
+bool SfxDispatcher::FindServer_(sal_uInt16 nSlot, SfxSlotServer& rServer, bool bModal)
 {
     SFX_STACK(SfxDispatcher::_FindServer);
 
@@ -1701,7 +1701,7 @@ bool SfxDispatcher::_FindServer(sal_uInt16 nSlot, SfxSlotServer& rServer, bool b
     {
         if ( xImp->pParent )
         {
-            bool bRet = xImp->pParent->_FindServer( nSlot, rServer, bModal );
+            bool bRet = xImp->pParent->FindServer_( nSlot, rServer, bModal );
             rServer.SetShellLevel
                 ( rServer.GetShellLevel() + xImp->aStack.size() );
             return bRet;
@@ -1775,7 +1775,7 @@ bool SfxDispatcher::_FindServer(sal_uInt16 nSlot, SfxSlotServer& rServer, bool b
     @param rState SfxItemSet to be filled
     @param pRealSlot The actual Slot if possible
 */
-bool SfxDispatcher::_FillState(const SfxSlotServer& rSvr, SfxItemSet& rState,
+bool SfxDispatcher::FillState_(const SfxSlotServer& rSvr, SfxItemSet& rState,
         const SfxSlot* pRealSlot)
 {
     SFX_STACK(SfxDispatcher::_FillState);

sfx2/source/control/statcach.cxx

@@ -233,7 +233,7 @@ const SfxSlotServer* SfxStateCache::GetSlotServer( SfxDispatcher &rDispat , cons
     if ( bSlotDirty )
     {
         // get the SlotServer; we need it for internal controllers anyway, but also in most cases
-        rDispat._FindServer( nId, aSlotServ, false );
+        rDispat.FindServer_( nId, aSlotServ, false );
 
         DBG_ASSERT( !pDispatch, "Old Dispatch not removed!" );