diff options
| author | Noel Grandin <noel@peralex.com> | 2014-10-11 16:01:26 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2014-10-11 15:14:52 +0000 |
| commit | 8044acf2db9d125d5ed58ed25df5df4a90f37ac6 (patch) | |
| tree | 67af1fff3f9bc0d144b80d5ecbe5a078cd08dbd3 /include/sfx2/request.hxx | |
| parent | cb7ede2d9970a4d162dc71922f578922c0d6235a (diff) | |
convert SFX_CALLMODE constants to SfxCallMode enum class
and fix a couple of bugs in SC and SW where the call mode was
being passed to the hints parameter by accident
Change-Id: Ief805410b3f7035e012e229e77f92d5832430f58
Reviewed-on: https://gerrit.libreoffice.org/11916
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'include/sfx2/request.hxx')
| -rw-r--r-- | include/sfx2/request.hxx | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/include/sfx2/request.hxx b/include/sfx2/request.hxx index a47f96292624..f862cb0f279a 100644 --- a/include/sfx2/request.hxx +++ b/include/sfx2/request.hxx @@ -37,6 +37,7 @@ class SfxShell; class SfxSlot; class SfxViewFrame; struct SfxRequest_Impl; +enum class SfxCallMode : sal_uInt16; @@ -44,7 +45,7 @@ class SFX2_DLLPUBLIC SfxRequest: public SfxHint { friend struct SfxRequest_Impl; - sal_uInt16 nSlot; + sal_uInt16 nSlot; SfxAllItemSet* pArgs; SfxRequest_Impl* pImp; @@ -60,10 +61,10 @@ private: public: SfxRequest( SfxViewFrame*, sal_uInt16 nSlotId ); - SfxRequest( sal_uInt16 nSlot, sal_uInt16 nCallMode, SfxItemPool &rPool ); + SfxRequest( sal_uInt16 nSlot, SfxCallMode nCallMode, SfxItemPool &rPool ); SfxRequest( const SfxSlot* pSlot, const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >& rArgs, - sal_uInt16 nCallMode, SfxItemPool &rPool ); - SfxRequest( sal_uInt16 nSlot, sal_uInt16 nCallMode, const SfxAllItemSet& rSfxArgs ); + SfxCallMode nCallMode, SfxItemPool &rPool ); + SfxRequest( sal_uInt16 nSlot, SfxCallMode nCallMode, const SfxAllItemSet& rSfxArgs ); SfxRequest( const SfxRequest& rOrig ); virtual ~SfxRequest(); @@ -89,7 +90,7 @@ public: static com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder > GetMacroRecorder( SfxViewFrame* pFrame=NULL ); static bool HasMacroRecorder( SfxViewFrame* pFrame=NULL ); - sal_uInt16 GetCallMode() const; + SfxCallMode GetCallMode() const; void AllowRecording( bool ); bool AllowsRecording() const; bool IsAPI() const; |