summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-04-27 18:29:03 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-04-28 10:21:13 +0200
commita32478a49277b9dd466d41773c641023792f4ece (patch)
tree97889f7df28a61ff5782a750ea529865c1bf7b21
parentb9bcc9ff9fc6b639e2cf1760bb408c837418be4c (diff)
SfxDispatcher::Call_Impl return value is unused
Change-Id: Iecaff2b1b5449751a9787a3b27c70495d82cc623
-rw-r--r--include/sfx2/dispatch.hxx2
-rw-r--r--sfx2/source/control/dispatch.cxx8
2 files changed, 3 insertions, 7 deletions
diff --git a/include/sfx2/dispatch.hxx b/include/sfx2/dispatch.hxx
index 9307b5e3bd96..971082db02ee 100644
--- a/include/sfx2/dispatch.hxx
+++ b/include/sfx2/dispatch.hxx
@@ -90,7 +90,7 @@ friend class SfxViewFrame;
DECL_DLLPRIVATE_LINK( EventHdl_Impl, void * );
DECL_DLLPRIVATE_LINK( PostMsgHandler, SfxRequest * );
- SAL_DLLPRIVATE int Call_Impl( SfxShell& rShell, const SfxSlot &rSlot, SfxRequest &rReq, bool bRecord );
+ 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 CollectTools_Impl(SfxWorkWindow*);
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index 0aa5dc5bfbfb..f04c968d4dc2 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -212,7 +212,7 @@ bool SfxDispatcher::IsAppDispatcher() const
/** Helper function to check whether a slot can be executed and
check the execution itself
*/
-int SfxDispatcher::Call_Impl(SfxShell& rShell, const SfxSlot &rSlot, SfxRequest &rReq, bool bRecord)
+void SfxDispatcher::Call_Impl(SfxShell& rShell, const SfxSlot &rSlot, SfxRequest &rReq, bool bRecord)
{
SFX_STACK(SfxDispatcher::Call_Impl);
@@ -269,7 +269,7 @@ int SfxDispatcher::Call_Impl(SfxShell& rShell, const SfxSlot &rSlot, SfxRequest
}
// do nothing after this object is dead
- return rReq.IsDone() ? 1 : 0;
+ return;
}
}
@@ -296,12 +296,8 @@ int SfxDispatcher::Call_Impl(SfxShell& rShell, const SfxSlot &rSlot, SfxRequest
pBindings->Update(rSlot.GetSlotId());
}
}
-
- return sal_True;
}
}
-
- return sal_False;
}
void SfxDispatcher::Construct_Impl( SfxDispatcher* pParent )