From 036e635678aedc414e2d55217e4f7f8359ed1b9a Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 27 Aug 2019 17:45:06 +0200 Subject: Fix signature of basicide_macro_organizer see the function definition in basctl/source/basicide/basobj2.cxx Change-Id: If19f0a82d5498795ceef26342e0152fb12ef983d Reviewed-on: https://gerrit.libreoffice.org/78204 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- include/sfx2/app.hxx | 2 +- sfx2/source/appl/app.cxx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx index 1dbd14eaac99..e3517d3d64db 100644 --- a/include/sfx2/app.hxx +++ b/include/sfx2/app.hxx @@ -146,7 +146,7 @@ public: // Basic/Scripting static bool IsXScriptURL( const OUString& rScriptURL ); static OUString ChooseScript(weld::Window *pParent); - static void MacroOrganizer(const weld::Window* pParent, sal_Int16 nTabId); + static void MacroOrganizer(weld::Window* pParent, sal_Int16 nTabId); static ErrCode CallBasic( const OUString&, BasicManager*, SbxArray *pArgs, SbxValue *pRet ); static ErrCode CallAppBasic( const OUString& i_macroName ) { return CallBasic( i_macroName, SfxApplication::GetBasicManager(), nullptr, nullptr ); } diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx index 3b6a8af8ef23..1bbb425c58b7 100644 --- a/sfx2/source/appl/app.cxx +++ b/sfx2/source/appl/app.cxx @@ -414,7 +414,7 @@ void SfxApplication::Invalidate( sal_uInt16 nId ) #ifndef DISABLE_DYNLOADING typedef long (*basicide_handle_basic_error)(void const *); -typedef void (*basicide_macro_organizer)(void const *, sal_Int16); +typedef void (*basicide_macro_organizer)(void *, sal_Int16); extern "C" { static void thisModule() {} } @@ -520,7 +520,7 @@ SfxApplication::ChooseScript(weld::Window *pParent) return aScriptURL; } -void SfxApplication::MacroOrganizer(const weld::Window* pParent, sal_Int16 nTabId) +void SfxApplication::MacroOrganizer(weld::Window* pParent, sal_Int16 nTabId) { #if !HAVE_FEATURE_SCRIPTING (void) pParent; -- cgit