[Libreoffice-commits] core.git: sw/inc sw/source
Noel Grandin
noelgrandin at gmail.com
Wed Sep 23 06:04:32 PDT 2015
sw/inc/doc.hxx | 3 +--
sw/source/core/doc/docbasic.cxx | 2 +-
sw/source/uibase/inc/wrtsh.hxx | 3 +--
sw/source/uibase/wrtsh/wrtsh3.cxx | 5 ++---
4 files changed, 5 insertions(+), 8 deletions(-)
New commits:
commit f6924329e6d50edfa8d9c27292f5e402e7580a12
Author: Noel Grandin <noelgrandin at gmail.com>
Date: Tue Sep 22 21:40:58 2015 +0200
remove unused Link<> parameter
Change-Id: I9d8916b69e2e986ee1e30091cb046e7812a68ed1
Reviewed-on: https://gerrit.libreoffice.org/18795
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
Tested-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index e2966d2..2ddcc2d 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -1403,8 +1403,7 @@ public:
// Call into intransparent Basic / JavaScript.
sal_uInt16 CallEvent( sal_uInt16 nEvent, const SwCallMouseEvent& rCallEvent,
- bool bChkPtr = false, SbxArray* pArgs = 0,
- const Link<>* pCallBack = 0 );
+ bool bChkPtr = false, SbxArray* pArgs = 0 );
/** Adjust left margin via object bar (similar to adjustment of numerations).
One can either change the margin "by" adding or subtracting a given
diff --git a/sw/source/core/doc/docbasic.cxx b/sw/source/core/doc/docbasic.cxx
index f6daa8e..056ea75 100644
--- a/sw/source/core/doc/docbasic.cxx
+++ b/sw/source/core/doc/docbasic.cxx
@@ -131,7 +131,7 @@ bool SwDoc::ExecMacro( const SvxMacro& rMacro, OUString* pRet, SbxArray* pArgs )
}
sal_uInt16 SwDoc::CallEvent( sal_uInt16 nEvent, const SwCallMouseEvent& rCallEvent,
- bool bCheckPtr, SbxArray* pArgs, const Link<>* )
+ bool bCheckPtr, SbxArray* pArgs )
{
if( !mpDocShell ) // we can't do that without a DocShell!
return 0;
diff --git a/sw/source/uibase/inc/wrtsh.hxx b/sw/source/uibase/inc/wrtsh.hxx
index db852bc..ed3b34b 100644
--- a/sw/source/uibase/inc/wrtsh.hxx
+++ b/sw/source/uibase/inc/wrtsh.hxx
@@ -419,8 +419,7 @@ typedef bool (SwWrtShell:: *FNSimpleMove)();
void ExecMacro( const SvxMacro& rMacro, OUString* pRet = 0, SbxArray* pArgs = 0 );
// call into the dark Basic/JavaScript
sal_uInt16 CallEvent( sal_uInt16 nEvent, const SwCallMouseEvent& rCallEvent,
- bool bCheckPtr = false, SbxArray* pArgs = 0,
- const Link<>* pCallBack = 0 );
+ bool bCheckPtr = false, SbxArray* pArgs = 0 );
// a click at the given field. the cursor is on it.
// execute the predefined actions.
diff --git a/sw/source/uibase/wrtsh/wrtsh3.cxx b/sw/source/uibase/wrtsh/wrtsh3.cxx
index a3ef19e..c361896 100644
--- a/sw/source/uibase/wrtsh/wrtsh3.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh3.cxx
@@ -159,10 +159,9 @@ void SwWrtShell::ExecMacro( const SvxMacro& rMacro, OUString* pRet, SbxArray* pA
}
sal_uInt16 SwWrtShell::CallEvent( sal_uInt16 nEvent, const SwCallMouseEvent& rCallEvent,
- bool bChkPtr, SbxArray* pArgs,
- const Link<>* pCallBack )
+ bool bChkPtr, SbxArray* pArgs)
{
- return GetDoc()->CallEvent( nEvent, rCallEvent, bChkPtr, pArgs, pCallBack );
+ return GetDoc()->CallEvent( nEvent, rCallEvent, bChkPtr, pArgs );
}
// If a util::URL-Button is selected, return its util::URL
More information about the Libreoffice-commits
mailing list