diff options
Diffstat (limited to 'sfx2/source/control')
-rw-r--r-- | sfx2/source/control/dispatch.cxx | 8 | ||||
-rw-r--r-- | sfx2/source/control/shell.cxx | 8 |
2 files changed, 10 insertions, 6 deletions
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx index efe847cd4a1d..edbb2d2f9387 100644 --- a/sfx2/source/control/dispatch.cxx +++ b/sfx2/source/control/dispatch.cxx @@ -879,7 +879,7 @@ void SfxDispatcher::Execute_(SfxShell& rShell, const SfxSlot& rSlot, /** Helper function to put from rItem below the Which-ID in the pool of the Item Sets rSet. */ -void MappedPut_Impl(SfxAllItemSet &rSet, const SfxPoolItem &rItem) +static void MappedPut_Impl(SfxAllItemSet &rSet, const SfxPoolItem &rItem) { // Put with mapped Which-Id if possible const SfxItemPool *pPool = rSet.GetPool(); @@ -1614,11 +1614,15 @@ void SfxDispatcher::SetSlotFilter(SfxSlotFilterState nEnable, GetBindings()->InvalidateAll(true); } -extern "C" int SfxCompareSIDs_Impl(const void* pSmaller, const void* pBigger) +extern "C" { + +static int SfxCompareSIDs_Impl(const void* pSmaller, const void* pBigger) { return static_cast<long>(*static_cast<sal_uInt16 const *>(pSmaller)) - static_cast<long>(*static_cast<sal_uInt16 const *>(pBigger)); } +} + /** Searches for 'nSID' in the Filter set by <SetSlotFilter()> and returns sal_True, if the SIDis allowed, or sal_False, if it is disabled by the Filter. diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx index 2d8b9b0a707d..c7a7731ba5c7 100644 --- a/sfx2/source/control/shell.cxx +++ b/sfx2/source/control/shell.cxx @@ -401,7 +401,7 @@ bool SfxShell::IsConditionalFastCall( const SfxRequest &rReq ) } -void ShellCall_Impl( void* pObj, void* pArg ) +static void ShellCall_Impl( void* pObj, void* pArg ) { static_cast<SfxShell*>(pObj)->ExecuteSlot( *static_cast<SfxRequest*>(pArg) ); } @@ -514,8 +514,8 @@ const SfxPoolItem* SfxShell::GetSlotState return pTemp; } -SFX_EXEC_STUB(SfxShell, VerbExec) -void SfxStubSfxShellVerbState(SfxShell *, SfxItemSet& rSet) +static SFX_EXEC_STUB(SfxShell, VerbExec) +static void SfxStubSfxShellVerbState(SfxShell *, SfxItemSet& rSet) { SfxShell::VerbState( rSet ); } @@ -653,7 +653,7 @@ bool SfxShell::HasUIFeature(SfxShellFeature) const return false; } -void DispatcherUpdate_Impl( void*, void* pArg ) +static void DispatcherUpdate_Impl( void*, void* pArg ) { static_cast<SfxDispatcher*>(pArg)->Update_Impl( true ); static_cast<SfxDispatcher*>(pArg)->GetBindings()->InvalidateAll(false); |