diff options
| -rw-r--r-- | sfx2/inc/sfx2/request.hxx | 1 | ||||
| -rw-r--r-- | sfx2/source/control/request.cxx | 18 | ||||
| -rw-r--r-- | sw/source/ui/shells/basesh.cxx | 4 |
3 files changed, 2 insertions, 21 deletions
diff --git a/sfx2/inc/sfx2/request.hxx b/sfx2/inc/sfx2/request.hxx index 7bebb731071b..e78fceba26a1 100644 --- a/sfx2/inc/sfx2/request.hxx +++ b/sfx2/inc/sfx2/request.hxx @@ -101,7 +101,6 @@ public: static com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder > GetMacroRecorder( SfxViewFrame* pFrame=NULL ); static sal_Bool HasMacroRecorder( SfxViewFrame* pFrame=NULL ); sal_uInt16 GetCallMode() const; - bool IsRecording() const; void AllowRecording( sal_Bool ); sal_Bool AllowsRecording() const; sal_Bool IsAPI() const; diff --git a/sfx2/source/control/request.cxx b/sfx2/source/control/request.cxx index d55afa823993..5a9b3411ce4d 100644 --- a/sfx2/source/control/request.cxx +++ b/sfx2/source/control/request.cxx @@ -870,24 +870,6 @@ sal_Bool SfxRequest::IsAPI() const } //-------------------------------------------------------------------- - - -bool SfxRequest::IsRecording() const - -/* [Description] - - Returns sal_True if this SfxRequest is to be recorded ie - 1. Currently a macro is beeing recorded - 2. This request is even recorded - 3. the request did not originate from a pure API (for example BASIC), - otherwise sal_False. -*/ - -{ - return ( AllowsRecording() && GetMacroRecorder().is() ); -} - -//-------------------------------------------------------------------- void SfxRequest::SetModifier( sal_uInt16 nModi ) { pImp->nModifier = nModi; diff --git a/sw/source/ui/shells/basesh.cxx b/sw/source/ui/shells/basesh.cxx index b2e23d880517..d793595fc79d 100644 --- a/sw/source/ui/shells/basesh.cxx +++ b/sw/source/ui/shells/basesh.cxx @@ -344,7 +344,7 @@ void SwBaseShell::ExecClpbrd(SfxRequest &rReq) rReq.Ignore(); bIgnore = sal_True; int nRet = SwTransferable::PasteUnformatted( rSh, aDataHelper ); - if(nRet)// && rReq.IsRecording() ) + if(nRet) { SfxViewFrame* pViewFrame = pView->GetViewFrame(); uno::Reference< frame::XDispatchRecorder > xRecorder = @@ -380,7 +380,7 @@ void SwBaseShell::ExecClpbrd(SfxRequest &rReq) rReq.Ignore(); bIgnore = sal_True; int nRet = SwTransferable::PasteSpecial( rSh, aDataHelper, nFormatId ); - if(nRet)// && rReq.IsRecording() ) + if(nRet) { SfxViewFrame* pViewFrame = pView->GetViewFrame(); uno::Reference< frame::XDispatchRecorder > xRecorder = |