diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-01-18 17:33:00 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-01-19 08:20:01 +0100 |
| commit | f867ead158730727e5eff0917a037ca0051d9df9 (patch) | |
| tree | 5cb759a9039b9e232d29aa3a5aa0e81016979a8d /basctl | |
| parent | 697f01e052ae73e88d7e1a37386f2648d57e12e2 (diff) | |
Fix callback function type
...that got broken with c394363c84064c041391627602665ea1fa74db60
"loplugin:constparams in basctl", causing -fsanitize=function to complain:
> sfx2/source/appl/app.cxx:452:28: runtime error: call to function basicide_handle_basic_error through pointer to incorrect function type 'long (*)(void *)'
> basctl/source/basicide/basobj3.cxx:48: note: basicide_handle_basic_error defined here
> #0 0x7ff6340234aa in SfxApplication::GlobalBasicErrorHdl_Impl(SfxApplication*, StarBASIC*) sfx2/source/appl/app.cxx:452:28
> #1 0x7ff63401cbef in SfxApplication::LinkStubGlobalBasicErrorHdl_Impl(void*, StarBASIC*) sfx2/source/appl/app.cxx:434:1
> #2 0x7ff639142148 in Link<StarBASIC*, bool>::Call(StarBASIC*) const include/tools/link.hxx:84:45
> #3 0x7ff63911f350 in StarBASIC::RTError(ErrCode, rtl::OUString const&, int, int, int) basic/source/classes/sb.cxx:1681:37
> #4 0x7ff63965aafe in SbiInstance::Abort() basic/source/runtime/runtime.cxx:518:16
> #5 0x7ff639664363 in SbiRuntime::Step() basic/source/runtime/runtime.cxx:865:28
> #6 0x7ff6392ec321 in SbModule::Run(SbMethod*) basic/source/classes/sbxmod.cxx:1141:25
[...]
Change-Id: I66bd1ca720cebca4fb5fd52d86920de3fc7a604e
Reviewed-on: https://gerrit.libreoffice.org/48142
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'basctl')
| -rw-r--r-- | basctl/source/basicide/basobj3.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/basctl/source/basicide/basobj3.cxx b/basctl/source/basicide/basobj3.cxx index 7043bba6110a..246486331538 100644 --- a/basctl/source/basicide/basobj3.cxx +++ b/basctl/source/basicide/basobj3.cxx @@ -44,7 +44,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::container; extern "C" { - SAL_DLLPUBLIC_EXPORT long basicide_handle_basic_error( void const * pPtr ) + SAL_DLLPUBLIC_EXPORT long basicide_handle_basic_error( void * pPtr ) { return HandleBasicError( static_cast<StarBASIC const *>(pPtr) ); } |