diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2016-04-05 23:12:46 +0200 |
---|---|---|
committer | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2016-07-20 01:26:02 -0400 |
commit | 4d259dc0cd685da7a85ce32dde04bfcf7a8b3000 (patch) | |
tree | db14bd94cbefd0baed24b3c5b624865fe53396f5 | |
parent | 6cb09c3400c04ab9dc003d89a5ed5c8df452a830 (diff) |
Avoid reserved identifiers
(cherry picked from commit 9351353b63886f494782f28f5400f5d71d22bcbd)
Change-Id: I18ebddef41955948fd4528ae74f4fe9c7439d53b
-rw-r--r-- | include/sfx2/dispatch.hxx | 8 | ||||
-rw-r--r-- | sfx2/source/control/bindings.cxx | 8 | ||||
-rw-r--r-- | sfx2/source/control/dispatch.cxx | 26 | ||||
-rw-r--r-- | sfx2/source/control/statcach.cxx | 2 |
4 files changed, 22 insertions, 22 deletions
diff --git a/include/sfx2/dispatch.hxx b/include/sfx2/dispatch.hxx index c6bc45870736..cf9c2cdaa62c 100644 --- a/include/sfx2/dispatch.hxx +++ b/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); diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx index b74875595de8..4f5d0de4df3c 100644 --- a/sfx2/source/control/bindings.cxx +++ b/sfx2/source/control/bindings.cxx @@ -412,7 +412,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 = @@ -1177,7 +1177,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 ( SFX_KIND_ATTR == pSlot->GetKind() ) { @@ -1257,10 +1257,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 ); } diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx index 7caf153cd6ef..0295b2b7b778 100644 --- a/sfx2/source/control/dispatch.cxx +++ b/sfx2/source/control/dispatch.cxx @@ -892,7 +892,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; @@ -918,7 +918,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" ); @@ -1019,7 +1019,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; @@ -1068,7 +1068,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; } @@ -1113,7 +1113,7 @@ const SfxPoolItem* SfxDispatcher::Execute(sal_uInt16 nSlot, SfxCallMode eCall, MappedPut_Impl( aSet, *pArg ); SfxRequest aReq( nSlot, eCall, aSet ); aReq.SetModifier( nModi ); - _Execute( *pShell, *pSlot, aReq, eCall ); + Execute_( *pShell, *pSlot, aReq, eCall ); return aReq.GetReturnValue(); } return nullptr; @@ -1168,7 +1168,7 @@ const SfxPoolItem* SfxDispatcher::Execute(sal_uInt16 nSlot, SfxCallMode eCall, va_end(pVarArgs); SfxRequest aReq( nSlot, eCall, aSet ); - _Execute( *pShell, *pSlot, aReq, eCall ); + Execute_( *pShell, *pSlot, aReq, eCall ); return aReq.GetReturnValue(); } return nullptr; @@ -1188,7 +1188,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()); @@ -1336,7 +1336,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(); @@ -1349,7 +1349,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(); @@ -1364,7 +1364,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; @@ -1756,7 +1756,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); @@ -1815,7 +1815,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; @@ -1889,7 +1889,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); diff --git a/sfx2/source/control/statcach.cxx b/sfx2/source/control/statcach.cxx index e549cd0ccc5b..4721b05c1b4d 100644 --- a/sfx2/source/control/statcach.cxx +++ b/sfx2/source/control/statcach.cxx @@ -240,7 +240,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!" ); |